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.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",

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) {

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())
         }
       })
     }