Cleaning up session service

CruGlobal · Mar 6, 2024 · c3484bf · c3484bf
1 parent 984efaa
commit c3484bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/common/services/session/session.service.js b/src/common/services/session/session.service.js
@@ -67,24 +67,24 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
     session: session,
     sessionSubject: sessionSubject,
     authClient: authClient, // Exposed for tests only
-    getRole: currentRole,
+    catchCreateAccountErrors: catchCreateAccountErrors,
+    clearCheckoutSavedData: clearCheckoutSavedData,
+    checkCreateAccountStatus: checkCreateAccountStatus,
     createAccount: createAccount,
-    handleOktaRedirect: handleOktaRedirect,
-    signIn: signIn,
-    signOut: signOut,
     downgradeToGuest: downgradeToGuest,
+    getRole: currentRole,
     getOktaUrl: getOktaUrl,
-    removeOktaRedirectIndicator: removeOktaRedirectIndicator,
+    handleOktaRedirect: handleOktaRedirect,
+    hasLocationOnLogin: hasLocationOnLogin,
     isOktaRedirecting: isOktaRedirecting,
-    updateCurrentProfile: updateCurrentProfile,
     oktaIsUserAuthenticated: oktaIsUserAuthenticated,
+    updateCurrentProfile: updateCurrentProfile,
     updateCheckoutSavedData: updateCheckoutSavedData,
-    clearCheckoutSavedData: clearCheckoutSavedData,
-    checkCreateAccountStatus: checkCreateAccountStatus,
+    removeOktaRedirectIndicator: removeOktaRedirectIndicator,
     removeLocationOnLogin: removeLocationOnLogin,
-    hasLocationOnLogin: hasLocationOnLogin,
-    signOutWithoutRedirectToOkta: signOutWithoutRedirectToOkta,
-    catchCreateAccountErrors: catchCreateAccountErrors
+    signIn: signIn,
+    signOut: signOut,
+    signOutWithoutRedirectToOkta: signOutWithoutRedirectToOkta
   }
 
   function handleOktaRedirect (lastPurchaseId) {
@@ -147,7 +147,7 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
       const email = isAuthenticated && (await authClient.getUser()).email
       return {
         status: 'error',
-        data: [`Already logged in to Okta${email ? ` with email: ${email}` : ''}. You will be redirected to the Sign In page in a few seconds.`, 'Another Error'],
+        data: [`Already logged in to Okta${email ? ` with email: ${email}` : ''}. You will be redirected to the Sign In page in a few seconds.`],
         redirectToSignIn: true
       }
     }

diff --git a/src/common/services/session/session.service.spec.js b/src/common/services/session/session.service.spec.js
@@ -610,8 +610,7 @@ describe('session service', function () {
           expect(getUser).toHaveBeenCalled();
           expect(data).toEqual({
             data: [
-              "Already logged in to Okta with email: [email protected]. You will be redirected to the Sign In page in a few seconds.",
-              "Another Error"
+              "Already logged in to Okta with email: [email protected]. You will be redirected to the Sign In page in a few seconds."
             ],
             redirectToSignIn: true,
             status: "error"
@@ -630,8 +629,7 @@ describe('session service', function () {
         sessionService.createAccount('test@[email protected]', 'FirstName', 'LastName').then((data) => {
           expect(data).toEqual({
             data: [
-              "Already logged in to Okta. You will be redirected to the Sign In page in a few seconds.",
-              "Another Error"
+              "Already logged in to Okta. You will be redirected to the Sign In page in a few seconds."
             ],
             redirectToSignIn: true,
             status: "error"