Merge pull request bcgov#236 from dimak1/feat/account-flow-updates

Update Account Flow
avni-work · Oct 29, 2024 · e1c6a86 · e1c6a86
2 parents 06f3e18 + 8c559bc
commit e1c6a86
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/strr-web/composables/useBcrosAuth.ts b/strr-web/composables/useBcrosAuth.ts
@@ -23,8 +23,10 @@ export const useBcrosAuth = () => {
 
   /** Logout and then redirect to given page (if redirect provided). */
   async function logout (redirect: string) {
-    localStorage.clear()
+    account.setCurrentAccount({} as AccountI)
+    account.userOrgs = []
     await keycloak.logout(redirect)
+    localStorage.removeItem(SessionStorageKeyE.CURRENT_ACCOUNT)
   }
 
   /** redirect if account status is suspended */
@@ -66,13 +68,14 @@ export const useBcrosAuth = () => {
           // verify account status
           verifyAccountStatus()
 
-          console.info('Checking Terms of Service acceptance...')
-          const isToSAccepted = await checkTermsOfService()
-
-          // if Terms not accepted - redirect TOS page
-          if (!isToSAccepted) {
-            goToTermsOfService()
-            return
+          // do not show Terms for IDIR users
+          if (keycloak.kcUser.loginSource !== 'IDIR') {
+            const isToSAccepted = await checkTermsOfService()
+            // if Terms not accepted - redirect TOS page
+            if (!isToSAccepted) {
+              goToTermsOfService()
+              return
+            }
           }
 
           // if user has not picked an account - go to Account Select

diff --git a/strr-web/package.json b/strr-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strr-web",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "Short Term Rental Registration UI - Mono repo workspace",
   "scripts": {
     "preinstall": "npx only-allow pnpm",

diff --git a/strr-web/stores/account.ts b/strr-web/stores/account.ts
@@ -144,7 +144,7 @@ export const useBcrosAccount = defineStore('bcros/account', () => {
       let storedUserProfile: MeI | void = JSON.parse(sessionStorage.getItem(SessionStorageKeyE.USER_PROFILE) || 'null')
 
       // if no stored user profile or account ID is provided, fetch user profile
-      if (!storedUserProfile || !!currentAccountId) {
+      if ((!storedUserProfile || !!currentAccountId) || !currentAccount.value.id) {
         storedUserProfile = await getMe()
         if (storedUserProfile) {
           sessionStorage.setItem(SessionStorageKeyE.USER_PROFILE, JSON.stringify(storedUserProfile))

diff --git a/strr-web/stores/keycloak.ts b/strr-web/stores/keycloak.ts
@@ -42,6 +42,7 @@ export const useBcrosKeycloak = defineStore('bcros/keycloak', () => {
     sessionStorage.removeItem(SessionStorageKeyE.USER_PROFILE)
     // TODO: TC - investigate if this fix for "not quite logged out redirect issue"
     sessionStorage.removeItem(SessionStorageKeyE.CURRENT_ACCOUNT)
+    localStorage.removeItem(SessionStorageKeyE.CURRENT_ACCOUNT)
   }
 
   function syncSessionStorage () {