Fix for logout issue.

bcgov · Nov 27, 2024 · 3bb7775 · 3bb7775
1 parent 8d13d56
commit 3bb7775
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/backend/src/routes/auth.js b/backend/src/routes/auth.js
@@ -45,27 +45,28 @@ router.get('/login', passport.authenticate('oidc', {
 
 //removes tokens and destroys session
 router.get('/logout', async (req, res, next) => {
+  let primaryURL = config.get('logoutEndpoint') + '?post_logout_redirect_uri=' + config.get('server:frontend');
   let idToken = req?.session?.passport?.user?.idToken;
-  if (req?.session?.passport?.user) {
+  if (idToken) {
     req.logout(function(err) {
       if (err) {
         return next(err);
       }
       req.session.destroy();
       let retUrl;
       if (req.query && req.query.sessionExpired) {
-        retUrl = encodeURIComponent(config.get('logoutEndpoint') + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/session-expired' + '&client_id=' + config.get('oidc:clientId'));
+        retUrl = encodeURIComponent(primaryURL + '/session-expired' + '&id_token_hint=' + idToken);
       } else {
-        retUrl = encodeURIComponent(config.get('logoutEndpoint') + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/logout' + '&id_token_hint=' + idToken);
+        retUrl = encodeURIComponent(primaryURL + '/logout' + '&id_token_hint=' + idToken);
       }
       res.redirect(config.get('siteMinder_logout_endpoint') + retUrl);
     });
   }else {
     let retUrl;
     if (req.query && req.query.sessionExpired) {
-      retUrl = encodeURIComponent(config.get('logoutEndpoint') + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/session-expired' + '&client_id=' + config.get('oidc:clientId'));
+      retUrl = encodeURIComponent(primaryURL + '/session-expired' + '&client_id=' + config.get('oidc:clientId'));
     } else {
-      retUrl = encodeURIComponent(config.get('logoutEndpoint') + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/logout' + '&client_id=' + config.get('oidc:clientId'));
+      retUrl = encodeURIComponent(primaryURL + '/logout' + '&client_id=' + config.get('oidc:clientId'));
     }
     res.redirect(config.get('siteMinder_logout_endpoint') + retUrl);
   }

diff --git a/frontend/src/components/Logout.vue b/frontend/src/components/Logout.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import {Routes} from '../utils/constants';
+import {Routes} from '@/utils/constants';
 import {authStore} from '@/store/modules/auth';
 
 export default {
@@ -56,7 +56,7 @@ export default {
   },
   created() {
     const auStore = authStore();
-    auStore.setJwtToken();
+    auStore.logoutState();
   },
   methods: {
     clearStorage() {

diff --git a/frontend/src/components/ModalIdle.vue b/frontend/src/components/ModalIdle.vue
@@ -24,10 +24,8 @@ export default {
   },
   async mounted() {
     await this.checkAndLogoutUserOnSessionExpiry();
-
   },
   methods: {
-
     async checkAndLogoutUserOnSessionExpiry() {
       if (this.isAuthenticated) {
         try {