Skip to content

feat: improve session renewal #2096

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

Merged
merged 5 commits into from
Aug 6, 2025
+7 −2
Merged

feat: improve session renewal #2096

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
066a195
feat: improve session renewal
wilsonrivera Aug 1, 2025
f2841af
chore: linting
wilsonrivera Aug 1, 2025
8a1b133
chore: increment token window skew to 5 minutes instead of 15 seconds
wilsonrivera Aug 6, 2025
c07c54e
Merge branch 'main' into wilson/eng-7131-handle-expired-sessions-grac…
wilsonrivera Aug 6, 2025
6d6ec54
Merge branch 'main' into wilson/eng-7131-handle-expired-sessions-grac…
wilsonrivera Aug 6, 2025
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
9 changes: 7 additions & 2 deletions controlplane/src/core/auth-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export type AuthUtilsOptions = {
};
};

const tokenExpirationWindowSkew = 60 * 5;
const pkceMaxAgeSec = 60 * 15; // 15 minutes
const pkceCodeAlgorithm = 'S256';
const scope = 'openid profile email';
Expand Down Expand Up @@ -305,10 +306,13 @@ export default class AuthUtils {

// Check if the access token is expired
const parsedAccessToken = decodeJWT(userSession.accessToken);
if (parsedAccessToken.exp && parsedAccessToken.exp < Date.now() / 1000) {
const parsedRefreshToken = decodeJWT(userSession.accessToken);
if (parsedAccessToken.exp && parsedAccessToken.exp < Date.now() / 1000 + tokenExpirationWindowSkew) {
if (!userSession.refreshToken) {
throw new AuthenticationError(EnumStatusCode.ERROR_NOT_AUTHENTICATED, 'No refresh token');
}

// Check if the refresh token is valid to issue a new access token
const parsedRefreshToken = decodeJWT(userSession.refreshToken);
if (parsedRefreshToken.exp && parsedRefreshToken.exp < Date.now() / 1000) {
throw new AuthenticationError(EnumStatusCode.ERROR_NOT_AUTHENTICATED, 'Refresh token expired');
}
Expand Down Expand Up @@ -343,6 +347,7 @@ export default class AuthUtils {
const jwt = await encrypt<UserSession>({
maxAgeInSeconds: sessionExpiresIn,
token: {
iss: userSession.userId,
sessionId: newUserSession.id,
},
secret: this.opts.jwtSecret,
Expand Down