Skip to content

feat: Implement token callback; fix CI testing #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 3, 2024
Merged

feat: Implement token callback; fix CI testing #439

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e5fab4
feat: Implement token callback; fix CI testing
filipecabaco Nov 28, 2024
8469784
fix: Use vi.spyOn method to correctly spy on getters
kamilogorek Nov 29, 2024
47d4713
change name of internal token
filipecabaco Dec 2, 2024
8d6ab76
change name of callback function
filipecabaco Dec 2, 2024
f978065
set auth uses callback
filipecabaco Dec 2, 2024
add70f2
import crypto for testing
filipecabaco Dec 2, 2024
504eeba
fix send tests
filipecabaco Dec 3, 2024
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
Prev Previous commit
Next Next commit
change name of callback function
  • Loading branch information
@filipecabaco
filipecabaco committed Dec 2, 2024
commit 8d6ab76f46bcda851c2cd1a8b70537ba94b3f05c
4 changes: 2 additions & 2 deletions src/RealtimeChannel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ export default class RealtimeChannel {

this.joinPush
.receive('ok', async ({ postgres_changes }: PostgresChangesFilters) => {
if (this.socket.accessTokenCallback) {
let token = await this.socket.accessTokenCallback()
if (this.socket.accessToken) {
let token = await this.socket.accessToken()
this.socket.setAuth(token)
} else {
this.socket.accessToken &&
Expand Down
10 changes: 5 additions & 5 deletions src/RealtimeClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export type RealtimeClientOptions = {
fetch?: Fetch
worker?: boolean
workerUrl?: string
accessTokenCallback?: () => Promise<string>
accessToken?: () => Promise<string>
}

export type RealtimeMessage = {
Expand Down Expand Up @@ -112,7 +112,7 @@ export default class RealtimeClient {
message: [],
}
fetch: Fetch
accessTokenCallback: (() => Promise<string>) | null = null
accessToken: (() => Promise<string>) | null = null
worker?: boolean
workerUrl?: string
workerRef?: Worker
Expand Down Expand Up @@ -182,7 +182,7 @@ export default class RealtimeClient {
this.workerUrl = options?.workerUrl
}

this.accessTokenCallback = options?.accessTokenCallback || null
this.accessToken = options?.accessToken || null
}

/**
Expand Down Expand Up @@ -394,8 +394,8 @@ export default class RealtimeClient {
ref: this.pendingHeartbeatRef,
})
// Utilizes callback if available
if (this.accessTokenCallback) {
let token = await this.accessTokenCallback()
if (this.accessToken) {
let token = await this.accessToken()
this.setAuth(token)
} else {
this.setAuth(this.accessTokenValue)
Expand Down