Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@supabase/functions-js": "2.4.5",
"@supabase/node-fetch": "2.6.15",
"@supabase/postgrest-js": "1.21.0",
"@supabase/realtime-js": "2.11.15",
"@supabase/realtime-js": "2.12.1",
"@supabase/storage-js": "2.7.1"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 20 additions & 12 deletions src/SupabaseClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default class SupabaseClient<
})

if (!settings.accessToken) {
this._listenForAuthEvents()
setTimeout(() => this._listenForAuthEvents(), 0)
}
}

Expand Down Expand Up @@ -278,7 +278,7 @@ export default class SupabaseClient<
return this.realtime.removeAllChannels()
}

private async _getAccessToken() {
protected async _getAccessToken() {
if (this.accessToken) {
return await this.accessToken()
}
Expand All @@ -288,7 +288,7 @@ export default class SupabaseClient<
return data.session?.access_token ?? null
}

private _initSupabaseAuthClient(
protected _initSupabaseAuthClient(
{
autoRefreshToken,
persistSession,
Expand Down Expand Up @@ -324,21 +324,23 @@ export default class SupabaseClient<
})
}

private _initRealtimeClient(options: RealtimeClientOptions) {
protected _initRealtimeClient(options: RealtimeClientOptions) {
return new RealtimeClient(this.realtimeUrl.href, {
...options,
params: { ...{ apikey: this.supabaseKey }, ...options?.params },
})
}

private _listenForAuthEvents() {
let data = this.auth.onAuthStateChange((event, session) => {
this._handleTokenChanged(event, 'CLIENT', session?.access_token)
protected async _listenForAuthEvents() {
return await this.auth.onAuthStateChange((event, session) => {
setTimeout(
async () => await this._handleTokenChanged(event, 'CLIENT', session?.access_token),
0
)
})
return data
}

private _handleTokenChanged(
protected async _handleTokenChanged(
event: AuthChangeEvent,
source: 'CLIENT' | 'STORAGE',
token?: string
Expand All @@ -348,10 +350,16 @@ export default class SupabaseClient<
this.changedAccessToken !== token
) {
this.changedAccessToken = token
this.realtime.setAuth(token)
} else if (event === 'SIGNED_OUT') {
this.realtime.setAuth()
if (source == 'STORAGE') this.auth.signOut()
this.changedAccessToken = undefined
try {
await this.realtime.setAuth()
if (source == 'STORAGE') this.auth.signOut()
} catch (error) {
console.log('Failed to set auth for realtime client:', error)
} finally {
this.changedAccessToken = undefined
}
}
}
}
Loading