Merge pull request #2595 from bcgov/session-idle-remaining

feat: idle based on longer of refresh and access token
bcgov · Oct 31, 2023 · 470050f · 470050f
2 parents 8ccda0e + fa17a5f
commit 470050f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/backend/lib/sso-express/helpers.ts b/app/backend/lib/sso-express/helpers.ts
@@ -23,5 +23,9 @@ export const getSessionRemainingTime = (req: Request) => {
     return 0;
   }
   const refreshToken = decodeJwt(req.session.tokenSet.refresh_token);
+  const accessToken = decodeJwt(req.session.tokenSet.access_token);
+  if (accessToken.payload.exp > refreshToken.payload.exp) {
+    return Math.round(accessToken.payload.exp - Date.now() / 1000);
+  }
   return Math.round(refreshToken.payload.exp - Date.now() / 1000);
 };