Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/quiet-clubs-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@labdigital/federated-token": minor
---

Allow passing `null` for the `guest*` cookie names to disable them
111 changes: 63 additions & 48 deletions packages/core/src/tokensource/cookies-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import type { TokenSource } from "./base";

export type CookieNames = {
// Anonymous cookies
guestData: string;
guestToken: string; // HTTP ONLY
guestData: string | null;
guestToken: string | null; // HTTP ONLY

// Authenticated cookies
userData: string;
userToken: string; // HTTP_ONLY

// Refresh token cookies
refreshToken: string; // HTTP_ONLY
guestRefreshTokenExists: string;
guestRefreshTokenExists: string | null;
userRefreshTokenExists: string;
};

Expand Down Expand Up @@ -88,24 +88,27 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
}

deleteAccessToken(request: TRequest, response: TResponse): void {
const names = [this.cookieNames.userToken, this.cookieNames.guestToken];
const names = [this.cookieNames.userToken, this.cookieNames.guestToken].filter((v) => v !== null);

for (const name of names) {
this.deleteAccessTokenByName(request, response, name);
}
}

// Delete both the user and guest refresh token exists cookies
deleteRefreshToken(request: TRequest, response: TResponse): void {
this.adapter.clearCookie(request, response, this.cookieNames.refreshToken, {
path: this._getRefreshTokenPath(request),
domain: this.adapter.getPrivateDomain(request),
});

this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.guestRefreshTokenExists,
);
if (this.cookieNames.guestRefreshTokenExists) {
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.guestRefreshTokenExists,
);
}
this.deleteRefreshTokenExistsByName(
request,
response,
Expand All @@ -114,7 +117,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
}

deleteDataToken(request: TRequest, response: TResponse): void {
const names = [this.cookieNames.userData, this.cookieNames.guestData];
const names = [this.cookieNames.userData, this.cookieNames.guestData].filter((v) => v !== null);

for (const name of names) {
this.deleteAccessTokenByName(request, response, name);
Expand Down Expand Up @@ -148,7 +151,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
}

getAccessToken(request: TRequest): string | undefined {
const names = [this.cookieNames.userToken, this.cookieNames.guestToken];
const names = [this.cookieNames.userToken, this.cookieNames.guestToken].filter((v) => v !== null);
for (const name of names) {
const value = this.adapter.getCookie(request, name);
if (value) {
Expand Down Expand Up @@ -194,19 +197,23 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
token,
cookieOptions,
);
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.guestData,
);
if (this.cookieNames.guestData) {
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.guestData,
);
}
} else {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestData,
token,
cookieOptions,
);
if (this.cookieNames.guestData) {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestData,
token,
cookieOptions,
);
}
this.deleteAccessTokenByName(
request,
response,
Expand All @@ -216,7 +223,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
}

getDataToken(request: TRequest): string | undefined {
const names = [this.cookieNames.userData, this.cookieNames.guestData];
const names = [this.cookieNames.userData, this.cookieNames.guestData].filter((v) => v !== null);
for (const name of names) {
const value = this.adapter.getCookie(request, name);
if (value) {
Expand Down Expand Up @@ -258,19 +265,23 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
token,
cookieOptions,
);
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.guestToken,
);
if (this.cookieNames.guestToken) {
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.guestToken,
);
}
} else {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestToken,
token,
cookieOptions,
);
if( this.cookieNames.guestToken) {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestToken,
token,
cookieOptions,
);
}
this.deleteAccessTokenByName(
request,
response,
Expand Down Expand Up @@ -314,19 +325,23 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
"1",
cookieOptions,
);
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.guestRefreshTokenExists,
);
if (this.cookieNames.guestRefreshTokenExists) {
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.guestRefreshTokenExists,
);
}
} else {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestRefreshTokenExists,
"1",
cookieOptions,
);
if (this.cookieNames.guestRefreshTokenExists) {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestRefreshTokenExists,
"1",
cookieOptions,
);
}
this.deleteRefreshTokenExistsByName(
request,
response,
Expand Down
Loading