centrifugal · FZambia · Mar 16, 2025 · Mar 16, 2025 · Mar 16, 2025
diff --git a/src/centrifuge.test.ts b/src/centrifuge.test.ts
@@ -1,4 +1,4 @@
-import { Centrifuge } from './centrifuge'
+import { Centrifuge, UnauthorizedError } from './centrifuge'
 import {
   DisconnectedContext,
   Error as CentrifugeError,
@@ -859,3 +859,85 @@ test.each(transportCases)("%s: retries subscription getData error", async (trans
   expect(numGetDataCalls).toBe(2); // Ensure getToken was retried.
   await disconnectClient(c);
 });
+
+test.each(transportCases)("%s: disconnected with unauthorized", async (transport, endpoint) => {
+  const c = new Centrifuge([{
+    transport: transport as TransportName,
+    endpoint: endpoint,
+  }], {
+    getToken: async function (): Promise<string> {
+      throw new UnauthorizedError('');
+    },
+    websocket: WebSocket,
+    fetch: fetch,
+    eventsource: EventSource,
+    readableStream: ReadableStream,
+    emulationEndpoint: 'http://localhost:8000/emulation',
+  });
+
+  let disconnectCalled: any;
+  const p = new Promise<DisconnectedContext>((resolve, _) => {
+    disconnectCalled = resolve;
+  })
+
+  c.on('disconnected', (ctx) => {
+    disconnectCalled(ctx);
+  })
+
+  c.connect();
+
+  const ctx = await p;
+  expect(c.state).toBe(State.Disconnected);
+  expect(ctx.code).toBe(disconnectedCodes.unauthorized);
+});
+
+test.each(transportCases)("%s: unsubscribed with unauthorized", async (transport, endpoint) => {
+  const c = new Centrifuge([{
+    transport: transport as TransportName,
+    endpoint: endpoint,
+  }], {
+    websocket: WebSocket,
+    fetch: fetch,
+    eventsource: EventSource,
+    readableStream: ReadableStream,
+    emulationEndpoint: 'http://localhost:8000/emulation',
+  });
+
+  let unsubscribeCalled: any;
+  const up = new Promise<UnsubscribedContext>((resolve, _) => {
+    unsubscribeCalled = resolve;
+  })
+
+  let disconnectCalled: any;
+  const dp = new Promise<DisconnectedContext>((resolve, _) => {
+    disconnectCalled = resolve;
+  })
+
+  c.on('disconnected', (ctx) => {
+    disconnectCalled(ctx);
+  })
+
+  const sub = c.newSubscription('test', {
+    getToken: async function (): Promise<string> {
+      throw new UnauthorizedError('');
+    },
+  });
+  sub.on('unsubscribed', (ctx: UnsubscribedContext) => {
+    unsubscribeCalled(ctx);
+  });
+
+  c.connect();
+  sub.subscribe()
+  await c.ready(5000);
+  expect(c.state).toBe(State.Connected);
+
+  const unsubCtx = await up;
+
+  expect(sub.state).toBe(SubscriptionState.Unsubscribed);
+  expect(unsubCtx.code).toBe(unsubscribedCodes.unauthorized)
+
+  c.disconnect();
+  const ctx = await dp;
+  expect(c.state).toBe(State.Disconnected);
+  expect(ctx.code).toBe(disconnectedCodes.disconnectCalled);
+});
diff --git a/src/centrifuge.ts b/src/centrifuge.ts
@@ -1308,7 +1308,7 @@ export class Centrifuge extends (EventEmitter as new () => TypedEventEmitter<Cli
           message: 'token expired but no getToken function set in the configuration'
         }
       });
-      throw new UnauthorizedError('');
+      return Promise.reject(new UnauthorizedError(''));
     }
     return this._config.getToken({});
   }

diff --git a/src/subscription.ts b/src/subscription.ts
@@ -693,7 +693,7 @@ export class Subscription extends (EventEmitter as new () => TypedEventEmitter<S
           message: 'provide a function to get channel subscription token'
         }
       });
-      throw new UnauthorizedError('');
+      return Promise.reject(new UnauthorizedError(''));
     }
     return getToken(ctx);
   }