Skip to content
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

OIDC session expires with ID token expiry and refresh token is never used. #1924

Closed
wants to merge 10 commits into from
Closed

OIDC session expires with ID token expiry and refresh token is never used. #1924

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d17c115
Bug fix
Alankarsharma Apr 30, 2024
7774f82
Update cookie expiry as well
Alankarsharma Apr 30, 2024
9fe50db
Lint issue fix
Alankarsharma May 7, 2024
aa97b1a
Merge branch 'main' into main
Alankarsharma May 7, 2024
1440b4f
fixed test case
Alankarsharma May 8, 2024
7305cfc
Merge branch 'main' of https://github.com/Alankarsharma/security-dash…
Alankarsharma May 8, 2024
00b9784
Merge branch 'main' into main
Alankarsharma May 10, 2024
1c4ba56
Merge branch 'main' into main
DarshitChanpura May 14, 2024
0aa44fb
Merge branch 'main' into main
DarshitChanpura May 15, 2024
d6c989f
Merge branch 'main' into main
cwperks Jun 10, 2024
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: 3 additions & 2 deletions server/auth/types/openid/openid_auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export class OpenIdAuthentication extends AuthenticationType {
return false;
}

if (cookie.expiryTime > Date.now()) {
if (cookie.credentials.expiryTime > Date.now()) {
return true;
}

Expand All @@ -296,8 +296,9 @@ export class OpenIdAuthentication extends AuthenticationType {
cookie.credentials = {
authHeaderValueExtra: true,
refresh_token: refreshTokenResponse.refreshToken,
expiryTime: getExpirationDate(refreshTokenResponse),
};
cookie.expiryTime = getExpirationDate(refreshTokenResponse);
cookie.expiryTime = Date.now() + this.config.session.ttl;

setExtraAuthStorage(
request,
Expand Down
3 changes: 2 additions & 1 deletion server/auth/types/openid/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,10 @@
username: user.username,
credentials: {
authHeaderValueExtra: true,
expiryTime: getExpirationDate(tokenResponse),

Check failure on line 198 in server/auth/types/openid/routes.ts

View workflow job for this annotation

GitHub Actions / Run unit tests (macos-latest) 

Delete `··············`

Check failure on line 198 in server/auth/types/openid/routes.ts

View workflow job for this annotation

GitHub Actions / Run unit tests (ubuntu-latest) 

Delete `··············`

Check failure on line 198 in server/auth/types/openid/routes.ts

View workflow job for this annotation

GitHub Actions / Run unit tests (windows-latest) 

Delete `··············`
},
authType: AuthType.OPEN_ID,
expiryTime: getExpirationDate(tokenResponse),
expiryTime: Date.now() + this.config.session.ttl,
};
if (this.config.openid?.refresh_tokens && tokenResponse.refreshToken) {
Object.assign(sessionStorage.credentials, {
Expand Down
Loading