From d0fc8dd1b67f9265302be328c37168c64b760b8a Mon Sep 17 00:00:00 2001
From: Nitheesh T Ganesh <60233274+nitheesh-aot@users.noreply.github.com>
Date: Tue, 14 Jul 2020 09:14:40 -0700
Subject: [PATCH 1/3] BCSC - Frozen on one screen#4300 (#870)

* BCSC - Frozen on one screen#4300

* handling route from common components
---
 .../components/auth/mixins/NextPageMixin.vue  | 20 +++++++++--------
 auth-web/src/util/constants.ts                |  5 ++++-
 .../src/views/auth/ChooseAuthMethodView.vue   | 22 +++++++++++++++----
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/auth-web/src/components/auth/mixins/NextPageMixin.vue b/auth-web/src/components/auth/mixins/NextPageMixin.vue
index ceff83f61c..cf67d8db02 100644
--- a/auth-web/src/components/auth/mixins/NextPageMixin.vue
+++ b/auth-web/src/components/auth/mixins/NextPageMixin.vue
@@ -1,6 +1,6 @@
 // You can declare a mixin as the same style as components.
 <script lang="ts">
-import { LoginSource, Pages, SessionStorageKeys } from '@/util/constants'
+import { LoginSource, Pages, Role, SessionStorageKeys } from '@/util/constants'
 import { Member, MembershipStatus, MembershipType, OrgStatus, Organization } from '@/models/Organization'
 import { mapActions, mapMutations, mapState } from 'vuex'
 import { AccountSettings } from '@/models/account-settings'
@@ -81,25 +81,27 @@ export default class NextPageMixin extends Vue {
         }
         return `/${nextStep}`
       case LoginSource.BCEID:
-        let bceditNextStep = '/'
+        let bceidNextStep = '/'
         // Redirect to TOS if no terms accepted
         // for invited users , handle user profile
         // Redirect to create team if no orgs
         // Redirect to dashboard otherwise
         if (!this.userProfile?.userTerms?.isTermsOfUseAccepted) {
-          bceditNextStep = Pages.USER_PROFILE_TERMS
+          bceidNextStep = Pages.USER_PROFILE_TERMS
+        } else if (!this.currentUser?.roles?.includes(Role.AccountHolder)) {
+          bceidNextStep = Pages.CHOOSE_AUTH_METHOD
         } else if (!this.currentOrganization && !this.currentMembership) {
-          bceditNextStep = Pages.CREATE_NON_BCSC_ACCOUNT
+          bceidNextStep = Pages.CREATE_NON_BCSC_ACCOUNT
         } else if (this.currentOrganization && this.currentOrganization.statusCode === OrgStatus.PendingAffidavitReview) {
-          bceditNextStep = `${Pages.PENDING_APPROVAL}/${this.currentAccountSettings?.label}`
+          bceidNextStep = `${Pages.PENDING_APPROVAL}/${this.currentAccountSettings?.label}`
         } else if (this.currentOrganization && this.currentMembership.membershipStatus === MembershipStatus.Active) {
-          bceditNextStep = `${Pages.MAIN}/${this.currentOrganization.id}`
+          bceidNextStep = `${Pages.MAIN}/${this.currentOrganization.id}`
         } else if (this.currentMembership.membershipStatus === MembershipStatus.Pending) {
-          bceditNextStep = `${Pages.PENDING_APPROVAL}/${this.currentAccountSettings?.label}`
+          bceidNextStep = `${Pages.PENDING_APPROVAL}/${this.currentAccountSettings?.label}`
         } else {
-          bceditNextStep = `${Pages.MAIN}/${this.currentOrganization.id}`
+          bceidNextStep = `${Pages.MAIN}/${this.currentOrganization.id}`
         }
-        return `/${bceditNextStep}`
+        return `/${bceidNextStep}`
       default:
         return `/${Pages.HOME}`
     }
diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts
index 7d644ff349..3a05535aba 100644
--- a/auth-web/src/util/constants.ts
+++ b/auth-web/src/util/constants.ts
@@ -17,13 +17,16 @@ export enum Role {
     StaffAdmin = 'staff_admin',
     StaffAdminBCOL = 'bcol_staff_admin',
     AnonymousUser = 'anonymous_user',
-    Tester = 'tester'
+    Tester = 'tester',
+    AccountHolder = 'account_holder',
+    PublicUser = 'public_user'
 }
 
 export enum Pages {
     USER_PROFILE = 'userprofile',
     CREATE_ACCOUNT = 'setup-account',
     CREATE_NON_BCSC_ACCOUNT = 'setup-non-bcsc-account',
+    CHOOSE_AUTH_METHOD = 'choose-authentication-method',
     PENDING_APPROVAL = 'pendingapproval',
     MAIN = 'account',
     SIGNIN = 'signin',
diff --git a/auth-web/src/views/auth/ChooseAuthMethodView.vue b/auth-web/src/views/auth/ChooseAuthMethodView.vue
index 45a367e399..47a85ac1e2 100644
--- a/auth-web/src/views/auth/ChooseAuthMethodView.vue
+++ b/auth-web/src/views/auth/ChooseAuthMethodView.vue
@@ -96,14 +96,20 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { LoginSource, Pages, SessionStorageKeys } from '@/util/constants'
 import ConfigHelper from '@/util/config-helper'
+import { mapGetters } from 'vuex'
 
 @Component({
-  name: 'Home',
-  components: {
+  computed: {
+    ...mapGetters('auth', [
+      'isAuthenticated',
+      'currentLoginSource'
+    ])
   }
 })
 
 export default class ChooseAuthMethodView extends Vue {
+  private readonly isAuthenticated!: boolean
+  private readonly currentLoginSource!: string
   private authType = ''
 
   private selectBCSCAuth () {
@@ -119,7 +125,7 @@ export default class ChooseAuthMethodView extends Vue {
   }
 
   private goNext () {
-  // TODO might need to set some session variables
+    // TODO might need to set some session variables
     switch (this.authType) {
       case LoginSource.BCEID:
         ConfigHelper.addToSession(SessionStorageKeys.ExtraProvincialUser, 'true')
@@ -128,7 +134,15 @@ export default class ChooseAuthMethodView extends Vue {
         break
       case LoginSource.BCSC:
         ConfigHelper.addToSession(SessionStorageKeys.ExtraProvincialUser, 'false') // this flag shouldnt be used for bcsc users.still setting the right value
-        this.$router.push(`/signin/bcsc/${Pages.CREATE_ACCOUNT}`)
+        if (this.isAuthenticated) {
+          if (this.currentLoginSource === LoginSource.BCEID) {
+            this.$router.push(`/${Pages.SETUP_ACCOUNT_NON_BCSC}`)
+          } else {
+            this.$router.push(`/${Pages.CREATE_ACCOUNT}`)
+          }
+        } else {
+          this.$router.push(`/signin/bcsc/${Pages.CREATE_ACCOUNT}`)
+        }
         break
     }
   }

From 2137445e77b945ac8dc65466fafed8c6811601a7 Mon Sep 17 00:00:00 2001
From: Nitheesh T Ganesh <60233274+nitheesh-aot@users.noreply.github.com>
Date: Tue, 14 Jul 2020 10:55:00 -0700
Subject: [PATCH 2/3] cc version to 2.2.2 (#876)

---
 auth-web/package-lock.json | 20 ++++++++++----------
 auth-web/package.json      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
index 32bc074798..a0257343b9 100644
--- a/auth-web/package-lock.json
+++ b/auth-web/package-lock.json
@@ -9583,18 +9583,18 @@
       }
     },
     "launchdarkly-js-client-sdk": {
-      "version": "2.17.5",
-      "resolved": "https://registry.npmjs.org/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.17.5.tgz",
-      "integrity": "sha512-ca6Dud0uD63GOh3ghIFzWi9IkRtAKsI29GWJNvL6TSrWH0Ez/IddAu6GqVK/6SSPOpNCOl+LjVxFIYtoDv4pLA==",
+      "version": "2.17.6",
+      "resolved": "https://registry.npmjs.org/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.17.6.tgz",
+      "integrity": "sha512-vzsxuoCkMSOAtx/JkkfFIR0msGne5xsn2o7CoQD5ioMAcEwdjBdp+JacqrL65aBfjFM9h5sVcsQdtgs3vxQYtg==",
       "requires": {
         "escape-string-regexp": "^1.0.5",
-        "launchdarkly-js-sdk-common": "3.2.8"
+        "launchdarkly-js-sdk-common": "3.2.9"
       }
     },
     "launchdarkly-js-sdk-common": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.2.8.tgz",
-      "integrity": "sha512-inZVhqRPJcs9jIOeEHFb5LmNbemWMRx2jJY0VIQajKAaDymseGxx2XVfeZukTrNKyB5JBNVMYpTRvnawWuLJQw==",
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.2.9.tgz",
+      "integrity": "sha512-XZ0rpa0zuRIq/v34G3TFSnQLiLQvEOEaKzA05iVD4HeAH1erPl0UpmLzDHqa/9TeHyNuA+a78wGFM9Tt3V4/qg==",
       "requires": {
         "base64-js": "^1.3.0",
         "fast-deep-equal": "^2.0.1",
@@ -13218,9 +13218,9 @@
       }
     },
     "sbc-common-components": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-2.2.1.tgz",
-      "integrity": "sha512-RAUfbfblV9RAa7PYF786XVbxnXrJqUGm0o9yWZrc1HSFnABrjVzkkzZg0JaBzvfDiSAjDws3xulYQAhXtRFFcA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-2.2.2.tgz",
+      "integrity": "sha512-fsdt7JxJZ9hgEh+WXVEVFBJjehr9or5HpxiPV3i7htnwMhFj1ua7d7OMBr6ec0Izjquifq3VLv8LyQuinvqq4w==",
       "requires": {
         "@mdi/font": "^4.5.95",
         "axios": "^0.18.0",
diff --git a/auth-web/package.json b/auth-web/package.json
index fced443fde..bef55cc1fb 100644
--- a/auth-web/package.json
+++ b/auth-web/package.json
@@ -21,7 +21,7 @@
     "moment": "^2.24.0",
     "regenerator-runtime": "^0.13.3",
     "register-service-worker": "^1.6.2",
-    "sbc-common-components": "^2.2.1",
+    "sbc-common-components": "^2.2.2",
     "vue": "^2.6.11",
     "vue-i18n": "^8.0.0",
     "vue-property-decorator": "^8.3.0",

From 2da0f19bbe0ec1182578d48e2bef5fc3bf3eccff Mon Sep 17 00:00:00 2001
From: Nitheesh T Ganesh <60233274+nitheesh-aot@users.noreply.github.com>
Date: Tue, 14 Jul 2020 11:50:57 -0700
Subject: [PATCH 3/3] Bcsc login fix (#875)

* BCSC - Frozen on one screen#4300

* handling route from common components

* redirection only for non sbc-auth routes

* removing unwanted check

* cc version to 2.2.3
---
 auth-web/package-lock.json                          |  6 +++---
 auth-web/package.json                               |  2 +-
 .../src/components/auth/mixins/NextPageMixin.vue    |  4 +---
 auth-web/src/views/auth/SigninView.vue              | 13 +++++--------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
index a0257343b9..e5efc55a9a 100644
--- a/auth-web/package-lock.json
+++ b/auth-web/package-lock.json
@@ -13218,9 +13218,9 @@
       }
     },
     "sbc-common-components": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-2.2.2.tgz",
-      "integrity": "sha512-fsdt7JxJZ9hgEh+WXVEVFBJjehr9or5HpxiPV3i7htnwMhFj1ua7d7OMBr6ec0Izjquifq3VLv8LyQuinvqq4w==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-2.2.3.tgz",
+      "integrity": "sha512-sQiGqmE56+o5i9CgXwmdabzpaIpcM3GPLf75evN733PPGNriwkKaBQCgk5mnZUU+/Lm6MN3/phbN/EANUXlcMw==",
       "requires": {
         "@mdi/font": "^4.5.95",
         "axios": "^0.18.0",
diff --git a/auth-web/package.json b/auth-web/package.json
index bef55cc1fb..a7ab62abe8 100644
--- a/auth-web/package.json
+++ b/auth-web/package.json
@@ -21,7 +21,7 @@
     "moment": "^2.24.0",
     "regenerator-runtime": "^0.13.3",
     "register-service-worker": "^1.6.2",
-    "sbc-common-components": "^2.2.2",
+    "sbc-common-components": "^2.2.3",
     "vue": "^2.6.11",
     "vue-i18n": "^8.0.0",
     "vue-property-decorator": "^8.3.0",
diff --git a/auth-web/src/components/auth/mixins/NextPageMixin.vue b/auth-web/src/components/auth/mixins/NextPageMixin.vue
index cf67d8db02..cb1bf91d95 100644
--- a/auth-web/src/components/auth/mixins/NextPageMixin.vue
+++ b/auth-web/src/components/auth/mixins/NextPageMixin.vue
@@ -88,10 +88,8 @@ export default class NextPageMixin extends Vue {
         // Redirect to dashboard otherwise
         if (!this.userProfile?.userTerms?.isTermsOfUseAccepted) {
           bceidNextStep = Pages.USER_PROFILE_TERMS
-        } else if (!this.currentUser?.roles?.includes(Role.AccountHolder)) {
-          bceidNextStep = Pages.CHOOSE_AUTH_METHOD
         } else if (!this.currentOrganization && !this.currentMembership) {
-          bceidNextStep = Pages.CREATE_NON_BCSC_ACCOUNT
+          bceidNextStep = Pages.CHOOSE_AUTH_METHOD
         } else if (this.currentOrganization && this.currentOrganization.statusCode === OrgStatus.PendingAffidavitReview) {
           bceidNextStep = `${Pages.PENDING_APPROVAL}/${this.currentAccountSettings?.label}`
         } else if (this.currentOrganization && this.currentMembership.membershipStatus === MembershipStatus.Active) {
diff --git a/auth-web/src/views/auth/SigninView.vue b/auth-web/src/views/auth/SigninView.vue
index 13b38f257f..17c47e1073 100644
--- a/auth-web/src/views/auth/SigninView.vue
+++ b/auth-web/src/views/auth/SigninView.vue
@@ -39,19 +39,16 @@ export default class Signin extends Mixins(NextPageMixin) {
   @Prop({ default: '' }) redirectUrl: string
   @Prop({ default: '' }) redirectUrlLoginFail: string
 
-  private async authenticationComplete (isRedirectToCreateAccount = false) {
+  private async authenticationComplete () {
     await this.loadUserInfo()
     // Check if user is authenticated, and redirect according to specified redirect
     // or fallback to default route for their login source
     if (this.$store.getters['auth/isAuthenticated']) {
       this.$root.$emit('signin-complete', () => {
-        // isRedirectToCreateAccount: if true, redirection already happend from sbc-common-components
-        if (!isRedirectToCreateAccount) {
-          if (this.redirectUrl) {
-            this.redirectTo(decodeURIComponent(CommonUtils.isUrl(this.redirectUrl) ? this.redirectUrl : `/${this.redirectUrl}`))
-          } else {
-            this.redirectTo(this.getNextPageUrl())
-          }
+        if (this.redirectUrl) {
+          this.redirectTo(decodeURIComponent(CommonUtils.isUrl(this.redirectUrl) ? this.redirectUrl : `/${this.redirectUrl}`))
+        } else {
+          this.redirectTo(this.getNextPageUrl())
         }
       })
     }