Skip to content

fix: use expiresIn option for refreshToken #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tleguijt wants to merge 1 commit into from
Closed

fix: use expiresIn option for refreshToken #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/rude-beds-tease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@labdigital/federated-token": minor
---

Use expiresIn option on the refreshToken
56 changes: 33 additions & 23 deletions packages/core/src/tokensource/cookies-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ export interface CookieAdapter<TRequest, TResponse> {
response: TResponse,
name: string,
value: string,
options: CookieOptions,
options: CookieOptions
): void;
clearCookie(
request: TRequest,
response: TResponse,
name: string,
options?: CookieOptions,
options?: CookieOptions
): void;
getPublicDomain(request: TRequest): string | undefined;
getPrivateDomain(request: TRequest): string | undefined;
Expand Down Expand Up @@ -104,12 +104,12 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.guestRefreshTokenExists,
this.cookieNames.guestRefreshTokenExists
);
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.userRefreshTokenExists,
this.cookieNames.userRefreshTokenExists
);
}

Expand All @@ -124,7 +124,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
deleteAccessTokenByName(
request: TRequest,
response: TResponse,
name: string,
name: string
): void {
if (this.adapter.getCookie(request, name)) {
this.adapter.clearCookie(request, response, name, {
Expand All @@ -137,7 +137,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
deleteRefreshTokenExistsByName(
request: TRequest,
response: TResponse,
name: string,
name: string
): void {
if (this.adapter.getCookie(request, name)) {
this.adapter.clearCookie(request, response, name, {
Expand Down Expand Up @@ -166,7 +166,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
request: TRequest,
response: TResponse,
token: string,
isAuthenticated = false,
isAuthenticated = false
) {
const opts = (isAuthenticated
? this.options.userToken
Expand All @@ -192,25 +192,25 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
response,
this.cookieNames.userData,
token,
cookieOptions,
cookieOptions
);
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.guestData,
this.cookieNames.guestData
);
} else {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestData,
token,
cookieOptions,
cookieOptions
);
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.userData,
this.cookieNames.userData
);
}
}
Expand All @@ -230,7 +230,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
request: TRequest,
response: TResponse,
token: string,
isAuthenticated = false,
isAuthenticated = false
) {
const opts = (isAuthenticated
? this.options.userToken
Expand All @@ -256,25 +256,25 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
response,
this.cookieNames.userToken,
token,
cookieOptions,
cookieOptions
);
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.guestToken,
this.cookieNames.guestToken
);
} else {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestToken,
token,
cookieOptions,
cookieOptions
);
this.deleteAccessTokenByName(
request,
response,
this.cookieNames.userToken,
this.cookieNames.userToken
);
}
}
Expand All @@ -283,9 +283,19 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
request: TRequest,
response: TResponse,
token: string,
isAuthenticated = false,
isAuthenticated = false
) {
const expiresAt = new Date(Date.now() + 1000 * 60 * 60 * 24 * 365);
const expiresIn = this.options.refreshToken?.expiresIn;
let expiresAt: Date | undefined = new Date(
Date.now() + 1000 * 60 * 60 * 24 * 365
);

if (expiresIn) {
expiresAt =
expiresIn === "session"
? undefined
: new Date(Date.now() + expiresIn * 1000);
}
const cookieOptions = {
httpOnly: false,
secure: this.options.secure,
Expand All @@ -303,7 +313,7 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
...cookieOptions,
httpOnly: true,
path: this._getRefreshTokenPath(request),
},
}
);

if (isAuthenticated) {
Expand All @@ -312,25 +322,25 @@ export abstract class BaseCookieTokenSource<TRequest, TResponse>
response,
this.cookieNames.userRefreshTokenExists,
"1",
cookieOptions,
cookieOptions
);
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.guestRefreshTokenExists,
this.cookieNames.guestRefreshTokenExists
);
} else {
this.adapter.setCookie(
request,
response,
this.cookieNames.guestRefreshTokenExists,
"1",
cookieOptions,
cookieOptions
);
this.deleteRefreshTokenExistsByName(
request,
response,
this.cookieNames.userRefreshTokenExists,
this.cookieNames.userRefreshTokenExists
);
}
}
Expand Down