fix: bump gotrue-js/next version (#485)

* fix: bump gotrue-js/next version

* bump gotrue/next version

* fix: remove multitab stuff

* remove redundant tests

package.json

@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@supabase/functions-js": "^1.3.3",
-    "@supabase/gotrue-js": "^1.23.0-next.6",
+    "@supabase/gotrue-js": "^1.23.0-next.8",
     "@supabase/postgrest-js": "^1.0.0-next.2",
     "@supabase/realtime-js": "^1.7.3",
     "@supabase/storage-js": "^1.8.0-next.1",

src/SupabaseClient.ts

@@ -9,7 +9,7 @@ import { RealtimeChannel, RealtimeClient, RealtimeClientOptions } from '@supabas
 import { SupabaseStorageClient } from '@supabase/storage-js'
 import { DEFAULT_HEADERS } from './lib/constants'
 import { fetchWithAuth } from './lib/fetch'
-import { isBrowser, stripTrailingSlash } from './lib/helpers'
+import { stripTrailingSlash } from './lib/helpers'
 import { SupabaseAuthClient } from './lib/SupabaseAuthClient'
 import { SupabaseRealtimeClient } from './lib/SupabaseRealtimeClient'
 import { Fetch, GenericSchema, SupabaseClientOptions, SupabaseAuthClientOptions } from './lib/types'
@@ -48,7 +48,6 @@ export default class SupabaseClient<
   protected functionsUrl: string
   protected realtime: RealtimeClient
   protected rest: PostgrestClient<Database, SchemaName>
-  protected multiTab: boolean
   protected storageKey: string
   protected fetch?: Fetch
   protected changedAccessToken: string | undefined
@@ -68,7 +67,6 @@ export default class SupabaseClient<
    * @param options.detectSessionInUrl Set to "true" if you want to automatically detects OAuth grants in the URL and signs in the user.
    * @param options.headers Any additional headers to send with each network request.
    * @param options.realtime Options passed along to realtime-js constructor.
-   * @param options.multiTab Set to "false" if you want to disable multi-tab/window events.
    * @param options.fetch A custom fetch implementation.
    */
   constructor(
@@ -98,7 +96,6 @@ export default class SupabaseClient<
 
     const settings = { ...DEFAULT_OPTIONS, ...options, storageKey: this.storageKey }
 
-    this.multiTab = settings.auth?.multiTab ?? false
     this.headers = { ...DEFAULT_HEADERS, ...options?.headers }
     this.shouldThrowOnError = settings.shouldThrowOnError || false
 
@@ -114,7 +111,6 @@ export default class SupabaseClient<
     })
 
     this._listenForAuthEvents()
-    this._listenForMultiTabEvents()
 
     // In the future we might allow the user to pass in a logger to receive these events.
     // this.realtime.onOpen(() => console.log('OPEN'))
@@ -271,7 +267,6 @@ export default class SupabaseClient<
       detectSessionInUrl,
       localStorage,
       cookieOptions,
-      multiTab,
       storageKey,
     }: SupabaseAuthClientOptions,
     headers?: Record<string, string>,
@@ -291,7 +286,6 @@ export default class SupabaseClient<
       localStorage,
       fetch,
       cookieOptions,
-      multiTab,
     })
   }
 
@@ -302,33 +296,6 @@ export default class SupabaseClient<
     })
   }
 
-  private _listenForMultiTabEvents() {
-    if (!this.multiTab || !isBrowser() || !window?.addEventListener) {
-      return null
-    }
-
-    try {
-      return window?.addEventListener('storage', (e: StorageEvent) => {
-        if (e.key === this.storageKey) {
-          const newSession = JSON.parse(String(e.newValue))
-          const accessToken: string | undefined =
-            newSession?.currentSession?.access_token ?? undefined
-          const previousAccessToken = this.auth.session()?.access_token
-          if (!accessToken) {
-            this._handleTokenChanged('SIGNED_OUT', accessToken, 'STORAGE')
-          } else if (!previousAccessToken && accessToken) {
-            this._handleTokenChanged('SIGNED_IN', accessToken, 'STORAGE')
-          } else if (previousAccessToken !== accessToken) {
-            this._handleTokenChanged('TOKEN_REFRESHED', accessToken, 'STORAGE')
-          }
-        }
-      })
-    } catch (error) {
-      console.error('_listenForMultiTabEvents', error)
-      return null
-    }
-  }
-
   private _listenForAuthEvents() {
     let data = this.auth.onAuthStateChange((event, session) => {
       this._handleTokenChanged(event, session?.access_token, 'CLIENT')
@@ -347,9 +314,6 @@ export default class SupabaseClient<
     ) {
       // Token has changed
       this.realtime.setAuth(token!)
-      // Ideally we should call this.auth.recoverSession() - need to make public
-      // to trigger a "SIGNED_IN" event on this client.
-      if (source == 'STORAGE') this.auth.setAuth(token!)
 
       this.changedAccessToken = token
     } else if (event === 'SIGNED_OUT' || event === 'USER_DELETED') {

test/client.test.ts

@@ -15,16 +15,6 @@ test('it should throw an error if no valid params are provided', async () => {
   expect(() => createClient(URL, '')).toThrowError('supabaseKey is required.')
 })
 
-test('it should not cache Authorization header', async () => {
-  supabase.auth.setAuth('token1')
-  supabase.rpc('')
-  expect(supabase.auth.session()?.access_token).toBe('token1')
-
-  supabase.auth.setAuth('token2')
-  supabase.rpc('')
-  expect(supabase.auth.session()?.access_token).toBe('token2')
-})
-
 describe('Custom Headers', () => {
   test('should have custom header set', () => {
     const customHeader = { 'X-Test-Header': 'value' }
@@ -36,18 +26,6 @@ describe('Custom Headers', () => {
 
     expect(getHeaders).toHaveProperty('X-Test-Header', 'value')
   })
-
-  test('should allow custom Authorization header', () => {
-    const customHeader = { Authorization: 'Bearer custom_token' }
-    supabase.auth.setAuth('override_me')
-
-    const request = createClient(URL, KEY, { headers: customHeader }).rpc('')
-
-    // @ts-ignore
-    const getHeaders = request.headers
-
-    expect(getHeaders).toHaveProperty('Authorization', 'Bearer custom_token')
-  })
 })
 
 // Socket should close when there are no open connections