Merge pull request #854 from bcgov/development

Dev to test

Author: sumesh-aot

auth-web/package-lock.json

@@ -21,7 +21,7 @@
     "moment": "^2.24.0",
     "regenerator-runtime": "^0.13.3",
     "register-service-worker": "^1.6.2",
-    "sbc-common-components": "^2.1.37",
+    "sbc-common-components": "^2.1.38",
     "vue": "^2.6.11",
     "vue-i18n": "^8.0.0",
     "vue-property-decorator": "^8.3.0",

auth-web/package.json

@@ -38,6 +38,7 @@ import { Member, MembershipStatus, Organization } from '@/models/Organization'
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
 import { AccountSettings } from '@/models/account-settings'
 import BusinessModule from '@/store/modules/business'
+import CommonUtils from '@/util/common-util'
 import ConfigHelper from '@/util/config-helper'
 import { Event } from '@/models/event'
 import { EventBus } from '@/event-bus'
@@ -102,12 +103,6 @@ export default class App extends Mixins(NextPageMixin) {
     header: SbcHeader
   }
 
-  get signingIn (): boolean {
-    return this.$route.name === 'signin' ||
-           this.$route.name === 'signin-redirect' ||
-           this.$route.name === 'signin-redirect-full'
-  }
-
   get showNavigationBar (): boolean {
     return this.$route.meta.showNavBar
   }
@@ -158,9 +153,17 @@ export default class App extends Mixins(NextPageMixin) {
     }
   }
 
+  private async created () {
+    // If session is synced, then sync user details
+    if (ConfigHelper.getFromSession(SessionStorageKeys.SessionSynced) === 'true' && !CommonUtils.isSigningIn() && !CommonUtils.isSigningOut()) {
+      this.loadUserInfo()
+      await this.syncUser()
+      this.setupNavigationBar()
+      this.$store.commit('loadComplete')
+    }
+  }
+
   private async mounted (): Promise<void> {
-    // set keycloak config file's location to the sbc-common-components
-    await KeyCloakService.setKeycloakConfigUrl(`${process.env.VUE_APP_PATH}config/kc/keycloak.json`)
     this.showLoading = false
 
     EventBus.$on('show-toast', (eventInfo: Event) => {
@@ -193,12 +196,11 @@ export default class App extends Mixins(NextPageMixin) {
   private async setup () {
     // Header added modules to store so can access mapped actions now
     if (this.$store.getters['auth/isAuthenticated']) {
-      this.loadUserInfo()
-      await this.syncUser()
-      this.setupNavigationBar()
       try {
-        await this.tokenService.init(this.$store)
-        this.tokenService.scheduleRefreshTimer()
+        this.initTokenService()
+        this.loadUserInfo()
+        await this.syncUser()
+        this.setupNavigationBar()
       } catch (e) {
         // eslint-disable-next-line no-console
         console.log('Could not initialize token refresher: ' + e)
@@ -210,6 +212,11 @@ export default class App extends Mixins(NextPageMixin) {
     }
     this.$store.commit('loadComplete')
   }
+
+  private async initTokenService () {
+    await this.tokenService.init(this.$store)
+    this.tokenService.scheduleRefreshTimer()
+  }
 }
 
 </script>

auth-web/src/App.vue

@@ -130,8 +130,8 @@ export default class NextPageMixin extends Vue {
 
   protected async syncUser () {
     // eslint-disable-next-line no-console
-    this.setCurrentAccountSettings(this.getAccountFromSession())
     await this.syncUserProfile()
+    this.setCurrentAccountSettings(this.getAccountFromSession())
     if (this.currentAccountSettings) {
       await this.syncMembership(this.currentAccountSettings.id)
       // await this.syncOrganization(this.currentAccountSettings.id)

auth-web/src/components/auth/mixins/NextPageMixin.vue

@@ -3,7 +3,9 @@ import '@mdi/font/css/materialdesignicons.min.css' // icon library (https://mate
 import 'regenerator-runtime/runtime' // to use transpiled generator functions
 import './registerServiceWorker'
 import App from './App.vue'
+import CommonUtils from '@/util/common-util'
 import ConfigHelper from '@/util/config-helper'
+import KeyCloakService from 'sbc-common-components/src/services/keycloak.services'
 import LaunchDarklyService from 'sbc-common-components/src/services/launchdarkly.services'
 import TokenService from 'sbc-common-components/src/services/token.services'
 import Vue from 'vue'
@@ -24,9 +26,26 @@ Vue.prototype.$tokenService = new TokenService()
 ConfigHelper.saveConfigToSessionStorage().then(async (data) => {
   // Initializing Launch Darkly services
   await LaunchDarklyService.init(ConfigHelper.getValue('LAUNCH_DARKLY_ENV_KEY'))
+  await syncSession()
   renderVue()
 }
 )
+
+async function syncSession () {
+  await KeyCloakService.setKeycloakConfigUrl(`${process.env.VUE_APP_PATH}config/kc/keycloak.json`)
+
+  // Initialize token service which will do a check-sso to initiate session
+  if (!CommonUtils.isSigningIn() && !CommonUtils.isSigningOut()) {
+    await Vue.prototype.$tokenService.init(null).then(() =>
+      Vue.prototype.$tokenService.scheduleRefreshTimer()
+    ).catch(err => {
+      if (err.message !== 'NOT_AUTHENTICATED') {
+        throw err
+      }
+    })
+  }
+}
+
 function renderVue () {
   new Vue({
     router,

auth-web/src/main.ts

@@ -89,4 +89,13 @@ export default class CommonUtils {
       }, 200)
     }
   }
+
+  static isSigningIn ():boolean {
+    const path = window.location.pathname
+    return path.includes('/signin') || path.includes('/signin-redirect') || path.includes('/signin-redirect-full')
+  }
+  static isSigningOut ():boolean {
+    const path = window.location.pathname
+    return path.includes('/signout')
+  }
 }

auth-web/src/util/common-util.ts

@@ -7,7 +7,8 @@ export enum SessionStorageKeys {
     UserAccountType = 'USER_ACCOUNT_TYPE',
     CurrentAccount = 'CURRENT_ACCOUNT',
     LaunchDarklyFlags = 'LD_FLAGS',
-    ExtraProvincialUser = 'EXTRAPROVINCIAL_USER'
+    ExtraProvincialUser = 'EXTRAPROVINCIAL_USER',
+    SessionSynced = 'SESSION_SYNCED'
 }
 
 export enum Role {