diff --git a/.changeset/witty-cougars-build.md b/.changeset/witty-cougars-build.md new file mode 100644 index 000000000..bfd72014c --- /dev/null +++ b/.changeset/witty-cougars-build.md @@ -0,0 +1,6 @@ +--- +'@powersync/service-core': patch +'@powersync/service-image': patch +--- + +Fix websocket auth errors not correctly propagating the details, previously resulting in generic "[PSYNC_S2106] Authentication required" messages. diff --git a/packages/service-core/src/routes/configure-rsocket.ts b/packages/service-core/src/routes/configure-rsocket.ts index c40f161d8..b7c14b67c 100644 --- a/packages/service-core/src/routes/configure-rsocket.ts +++ b/packages/service-core/src/routes/configure-rsocket.ts @@ -38,7 +38,9 @@ export function configureRSocket(router: ReactiveSocketRouter, options: const extracted_token = getTokenFromHeader(token); if (extracted_token != null) { const { context, tokenError } = await generateContext(options.service_context, extracted_token); - if (context?.token_payload == null) { + if (tokenError != null) { + throw tokenError; + } else if (context?.token_payload == null) { throw new errors.AuthorizationError(ErrorCode.PSYNC_S2106, 'Authentication required'); } @@ -46,7 +48,6 @@ export function configureRSocket(router: ReactiveSocketRouter, options: token, user_agent, ...context, - token_error: tokenError, service_context: service_context as RouterServiceContext, logger: connectionLogger }; diff --git a/packages/service-core/src/routes/router.ts b/packages/service-core/src/routes/router.ts index cd4d58ab6..3298c6e6b 100644 --- a/packages/service-core/src/routes/router.ts +++ b/packages/service-core/src/routes/router.ts @@ -17,7 +17,6 @@ export type Context = { service_context: RouterServiceContext; token_payload?: JwtPayload; - token_error?: ServiceError; /** * Only on websocket endpoints. */