DT-5972 ensure logout completed before delete session

HSLdevcom · Nov 8, 2023 · 8f7da40 · 8f7da40
1 parent 928c436
commit 8f7da40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/server/auth/Strategy.js b/server/auth/Strategy.js
@@ -145,12 +145,10 @@ OICStrategy.prototype.refresh = function (req) {
     })
     .catch(err => {
       console.error('Error refreshing tokens', err);
-      if (req.session) {
-        req.logout(function (err) {
-          if (err) { return next(err); }
-        });
+      req.logout(function (err) {
+        if (err) { return next(err); }
         req.session.destroy();
-      }
+      });
       this.fail(err);
     });
 };

diff --git a/server/auth/openidConnect.js b/server/auth/openidConnect.js
@@ -157,9 +157,8 @@ function setUpOIDC(app, port, indexPath, hostnames, paths, localPort) {
     if (
       req.isAuthenticated() &&
       req.session &&
-      token &&
-      token.refresh_token &&
-      dayjs().unix() >= token.expires_at
+      token?.refresh_token &&
+      dayjs().unix() >= token?.expires_at
     ) {
       const userData = JSON.stringify(req?.user?.data);
       let oidcStrategyName = '';
@@ -172,7 +171,7 @@ function setUpOIDC(app, port, indexPath, hostnames, paths, localPort) {
       return passport.authenticate(oidcStrategyName, {
         refresh: true,
         successReturnToOrRedirect: `/${req.path}`,
-        failureRedirect: `/${req.path}`,
+        failureRedirect: '/',
       })(req, res, next);
     }
     return next();