Merge branch '2362-okta' into staging

CruGlobal · Dec 21, 2023 · 47552f1 · 47552f1
2 parents 7be662c + abaa29c
commit 47552f1
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/common/services/session/session.service.js b/src/common/services/session/session.service.js
@@ -294,6 +294,7 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
       await clearCheckoutSavedData()
       await authClient.revokeAccessToken()
       await authClient.revokeRefreshToken()
+      await authClient.closeSession()
       // Add session data so on return to page we can show an explaination to the user about what happened.
       if (!redirectHome) {
         $window.sessionStorage.setItem('forcedUserToLogout', true)
@@ -302,7 +303,17 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
         postLogoutRedirectUri: redirectHome ? null : $window.location.href
       })
     } catch {
-      $window.location = `https://signon.okta.com/login/signout?fromURI=${envService.read('oktaReferrer')}`
+      // closeSession errors out due to CORS. to fix this temporarily, I've added the logout in a catch just in case.
+      try {
+        if (!redirectHome) {
+          $window.sessionStorage.setItem('forcedUserToLogout', true)
+        }
+        return authClient.signOut({
+          postLogoutRedirectUri: redirectHome ? null : $window.location.href
+        })
+      } catch {
+        $window.location = `https://signon.okta.com/login/signout?fromURI=${envService.read('oktaReferrer')}`
+      }
     }
   }