Skip to content

Commit aa33734

Browse files
fix(server): empty primary cookie no longer blocks bearer auth (#27848)
Co-authored-by: maria-rcks <[email protected]>
1 parent 6dddccb commit aa33734

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

‎apps/server/src/auth/EnvironmentAuth.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,20 @@ it.layer(NodeServices.layer)("EnvironmentAuth.layer", (it) => {
308308
}).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
309309
);
310310

311+
it.effect("prefers a bearer token over an empty primary cookie", () =>
312+
Effect.gen(function* () {
313+
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
314+
const sessions = yield* SessionStore.SessionStore;
315+
const bearer = yield* serverAuth.issueSession();
316+
const verified = yield* serverAuth.authenticateHttpRequest({
317+
cookies: { [sessions.cookieName]: "" },
318+
headers: { authorization: `Bearer ${bearer.token}` },
319+
} as never);
320+
321+
expect(verified.sessionId).toBe(bearer.sessionId);
322+
}).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
323+
);
324+
311325
it.effect("preserves pairing grants after rejecting scopes they do not grant", () =>
312326
Effect.gen(function* () {
313327
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;

‎apps/server/src/auth/EnvironmentAuth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ export function selectRequestCredential(
643643
legacyCookieName: string | undefined,
644644
) {
645645
const cookieToken = request.cookies[cookieName];
646-
if (cookieToken !== undefined) {
646+
if (cookieToken) {
647647
return { token: cookieToken, source: "cookie" } as const;
648648
}
649649

0 commit comments

Comments
 (0)