Merge branch 'test'

bcgov · Dec 8, 2023 · 99d6d06 · 99d6d06
2 parents 5b1d8ac + 27b2d89
commit 99d6d06
Show file tree

Hide file tree

Showing 12 changed files with 729 additions and 85 deletions.
diff --git a/...rolment/shared/modules/bcsc-enrolment-login-page/bcsc-enrolment-login-page.component.html b/...rolment/shared/modules/bcsc-enrolment-login-page/bcsc-enrolment-login-page.component.html
@@ -1,3 +1,4 @@
 <app-dashboard-header></app-dashboard-header>
 
-<app-prime-enrolment-access (login)="onLogin()"></app-prime-enrolment-access>
+<app-prime-enrolment-access mode="enrolment"
+                            (login)="onLogin()"></app-prime-enrolment-access>
diff --git a/...ed/modules/health-auth-site-reg-login-page/health-auth-site-reg-login-page.component.html b/...ed/modules/health-auth-site-reg-login-page/health-auth-site-reg-login-page.component.html
@@ -1,5 +1,4 @@
 <app-dashboard-header></app-dashboard-header>
 
-<app-site-reg-access mode="multiple"
-                     [disableLogin]="disableLogin"
-                     (login)="onLogin($event)"></app-site-reg-access>
+<app-prime-enrolment-access mode="health-authority"
+                            (login)="onLogin()"></app-prime-enrolment-access>
diff --git a/...ared/modules/health-auth-site-reg-login-page/health-auth-site-reg-login-page.component.ts b/...ared/modules/health-auth-site-reg-login-page/health-auth-site-reg-login-page.component.ts
@@ -15,7 +15,6 @@ import { SiteRegistrationTypeEnum } from '@health-auth/shared/enums/site-registr
 })
 export class HealthAuthSiteRegLoginPageComponent implements OnInit {
   public title: string;
-  public disableLogin: boolean;
 
   constructor(
     private route: ActivatedRoute,
@@ -26,10 +25,7 @@ export class HealthAuthSiteRegLoginPageComponent implements OnInit {
     this.title = route.snapshot.data.title;
   }
 
-  public onLogin(type: SiteRegistrationTypeEnum) {
-    if (this.disableLogin) {
-      return;
-    }
+  public onLogin() {
 
     // Route to COLLECTION_NOTICE which determines the direction of routing
     const redirectRoute = HealthAuthSiteRegRoutes.routePath(HealthAuthSiteRegRoutes.COLLECTION_NOTICE);
@@ -42,7 +38,5 @@ export class HealthAuthSiteRegLoginPageComponent implements OnInit {
   }
 
   public ngOnInit(): void {
-    // Enable, regardless of environment
-    this.disableLogin = false;
   }
 }
diff --git a/...n/shared/modules/site-registration-login-page/site-registration-login-page.component.html b/...n/shared/modules/site-registration-login-page/site-registration-login-page.component.html
@@ -1,3 +1,4 @@
 <app-dashboard-header></app-dashboard-header>
 
-<app-site-reg-access (login)="onLogin()"></app-site-reg-access>
+<app-prime-enrolment-access mode="community"
+                            (login)="onLogin()"></app-prime-enrolment-access>
diff --git a/...ion/shared/modules/site-registration-login-page/site-registration-login-page.component.ts b/...ion/shared/modules/site-registration-login-page/site-registration-login-page.component.ts
@@ -31,6 +31,7 @@ export class SiteRegistrationLoginPageComponent implements OnInit {
   public onLogin() {
     // Route to COLLECTION_NOTICE which determines the direction of routing
     const redirectRoute = SiteRoutes.routePath(`${this.redirectRoutePath}${SiteRoutes.COLLECTION_NOTICE}`);
+
     const redirectUri = `${this.config.loginRedirectUrl}${redirectRoute}`;
 
     this.authService.login({