Bug bix - #3709 (#699) (#703)

* Bug bix - #3709 Safff user redirect to staff dashboard. * bug fix - #3705 Redirect user to create account when current account is null.
bcgov · May 19, 2020 · 3900b6f · 3900b6f
1 parent dc7bdd9
commit 3900b6f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
diff --git a/auth-web/src/components/auth/EntityManagement.vue b/auth-web/src/components/auth/EntityManagement.vue
@@ -138,6 +138,9 @@ export default class EntityManagement extends Mixins(AccountChangeMixin, NextPag
   }
 
   private async mounted () {
+    if (this.currentMembership === undefined) {
+      this.$router.push(`/${Pages.CREATE_ACCOUNT}`)
+    }
     // If pending approval on current account, redirect away
     if (this.currentMembership?.membershipStatus !== MembershipStatus.Active) {
       this.$router.push(this.getNextPageUrl())

diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts
@@ -40,7 +40,8 @@ export enum Pages {
     USER_PROFILE_TERMS = 'userprofileterms',
     USER_PROFILE_TERMS_DECLINE = 'unauthorizedtermsdecline',
     HOME = 'home',
-    EDIT_ACCOUNT_TYPE= '/change-account'
+    EDIT_ACCOUNT_TYPE= '/change-account',
+    STAFF_DASHBOARD= 'searchbusiness'
 }
 
 export enum Account {

diff --git a/auth-web/src/views/auth/HomeView.vue b/auth-web/src/views/auth/HomeView.vue
@@ -261,6 +261,7 @@ export default class HomeView extends Vue {
   private noPasscodeDialog = false
   private accountDialog = false
   private isDirSearchUser: boolean = false
+  private isStaffUser: boolean = false
   private readonly resetCurrentOrganisation!: () => void
 
   private get showManageBusinessesBtn (): boolean {
@@ -286,6 +287,10 @@ export default class HomeView extends Vue {
 
   mounted () {
     this.isDirSearchUser = (this.currentUser?.loginSource === LoginSource.BCROS)
+    this.isStaffUser = (this.currentUser?.loginSource === LoginSource.IDIR)
+    if (this.isStaffUser) {
+      this.$router.push(`/${Pages.STAFF_DASHBOARD}`)
+    }
   }
 }
 </script>