Skip to content

fix(realtime): omit authorization header when no access token exists #1937

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

Open
7ttp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(realtime): omit authorization header when no access token exists #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 20 additions & 17 deletions packages/core/realtime-js/src/RealtimeChannel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,21 +554,22 @@ export default class RealtimeChannel {
payload: any,
opts: { timeout?: number } = {}
): Promise<{ success: true } | { success: false; status: number; error: string }> {
const authorization = this.socket.accessTokenValue
? `Bearer ${this.socket.accessTokenValue}`
: ''

if (payload === undefined || payload === null) {
return Promise.reject('Payload is required for httpSend()')
}

const headers: Record<string, string> = {
apikey: this.socket.apiKey ? this.socket.apiKey : '',
'Content-Type': 'application/json',
}

if (this.socket.accessTokenValue) {
headers['Authorization'] = `Bearer ${this.socket.accessTokenValue}`
}

const options = {
method: 'POST',
headers: {
Authorization: authorization,
apikey: this.socket.apiKey ? this.socket.apiKey : '',
'Content-Type': 'application/json',
},
headers,
body: JSON.stringify({
messages: [
{
Expand Down Expand Up @@ -626,16 +627,18 @@ export default class RealtimeChannel {
)

const { event, payload: endpoint_payload } = args
const authorization = this.socket.accessTokenValue
? `Bearer ${this.socket.accessTokenValue}`
: ''
const headers: Record<string, string> = {
apikey: this.socket.apiKey ? this.socket.apiKey : '',
'Content-Type': 'application/json',
}

if (this.socket.accessTokenValue) {
headers['Authorization'] = `Bearer ${this.socket.accessTokenValue}`
}

const options = {
method: 'POST',
headers: {
Authorization: authorization,
apikey: this.socket.apiKey ? this.socket.apiKey : '',
'Content-Type': 'application/json',
},
headers,
body: JSON.stringify({
messages: [
{
Expand Down
20 changes: 12 additions & 8 deletions packages/core/realtime-js/test/RealtimeChannel.messaging.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ describe('send', () => {
{
description: 'without access token',
accessToken: undefined,
expectedAuth: '',
expectedAuth: undefined,
},
{
description: 'with access token',
Expand Down Expand Up @@ -363,13 +363,17 @@ describe('send', () => {
config: { private: true },
})

const expectedHeaders: Record<string, string> = {
apikey: 'abc123',
'Content-Type': 'application/json',
}
if (expectedAuth) {
expectedHeaders['Authorization'] = expectedAuth
}

const expectedBody = {
method: 'POST',
headers: {
Authorization: expectedAuth,
apikey: 'abc123',
'Content-Type': 'application/json',
},
headers: expectedHeaders,
body: '{"messages":[{"topic":"topic","event":"test","private":true}]}',
signal: new AbortController().signal,
}
Expand Down Expand Up @@ -498,12 +502,12 @@ describe('httpSend', () => {
{
name: 'without access token',
hasToken: false,
expectedAuth: '',
expectedAuth: undefined as string | undefined,
},
{
name: 'with access token',
hasToken: true,
expectedAuth: 'Bearer token123',
expectedAuth: 'Bearer token123' as string | undefined,
},
]

Expand Down
Loading