fix: call setAuth on subscribe (#499)

Author: filipecabaco

src/RealtimeClient.ts

@@ -205,6 +205,12 @@ export default class RealtimeClient {
    * Connects the socket, unless already connected.
    */
   connect(): void {
+    // Set the token on connect
+    setTimeout(() => {
+      this.setAuth().catch((e) => {
+        this.log('error', 'error setting auth', e)
+      })
+    }, 0)
     if (this.conn) {
       return
     }
@@ -216,12 +222,6 @@ export default class RealtimeClient {
     }
     this.conn = new this.transport(this.endpointURL()) as WebSocketLike
     this.setupConnection()
-    // Set the token on connect
-    setTimeout(() => {
-      this.setAuth().catch((e) => {
-        this.log('error', 'error setting auth', e)
-      })
-    }, 0)
   }
 
   /**

test/RealtimeChannel.test.ts

@@ -1,6 +1,6 @@
 import assert from 'assert'
 import sinon from 'sinon'
-import crypto from 'crypto'
+import crypto, { randomUUID } from 'crypto'
 import { describe, beforeEach, afterEach, test, vi } from 'vitest'
 
 import RealtimeClient from '../src/RealtimeClient'
@@ -169,7 +169,7 @@ describe('constructor', () => {
 
 describe('subscribe', () => {
   beforeEach(() => {
-    channel = socket.channel('topic', { one: 'two' })
+    channel = socket.channel('topic')
   })
 
   afterEach(() => {
@@ -208,6 +208,7 @@ describe('subscribe', () => {
 
     assert.equal(channel.state, CHANNEL_STATES.joining)
   })
+
   test('updates join push payload access token', () => {
     socket.accessTokenValue = 'token123'
 
@@ -221,10 +222,30 @@ describe('subscribe', () => {
         postgres_changes: [],
         private: false,
       },
-      one: 'two',
     })
   })
 
+  test('triggers setAuth when socket is not connected', async () => {
+    clock.restore() // Use real timers for this test
+    let callCount = 0
+    const tokens = [randomUUID(), randomUUID()]
+    const accessToken = async () => tokens[callCount++]
+    const testSocket = new RealtimeClient(url, {
+      accessToken: accessToken,
+      transport: WebSocket,
+    })
+    const channel = testSocket.channel('topic')
+
+    channel.subscribe()
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    assert.equal(channel.socket.accessTokenValue, tokens[0])
+
+    testSocket.disconnect()
+    channel.subscribe()
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    assert.equal(channel.socket.accessTokenValue, tokens[1])
+  })
+
   test('triggers socket push with default channel params', () => {
     sinon.stub(socket, '_makeRef').callsFake(() => defaultRef)
     const spy = sinon.spy(socket, 'push')
@@ -247,7 +268,6 @@ describe('subscribe', () => {
             postgres_changes: [],
             private: false,
           },
-          one: 'two',
         },
         ref: defaultRef,
         join_ref: defaultRef,
@@ -325,7 +345,6 @@ describe('subscribe', () => {
             ],
             private: false,
           },
-          one: 'two',
         },
         ref: defaultRef,
         join_ref: defaultRef,