Merge pull request #2562 from sam-warren/registration-flow-fix

Fix verified registraion flow blocking users from registering
bcgov · Jan 15, 2025 · 46cf913 · 46cf913
2 parents 24905a8 + 3eaef10
commit 46cf913
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/registrants/src/UI/embc-registrant/src/app/core/services/login.service.ts b/registrants/src/UI/embc-registrant/src/app/core/services/login.service.ts
@@ -20,7 +20,7 @@ export class LoginService {
   public async login(targetUrl: string = undefined): Promise<boolean> {
     return await this.oauthService.tryLoginImplicitFlow().then(() => {
       if (!this.oauthService.hasValidAccessToken()) {
-        if (this.verifiedRegistrationFlow(targetUrl)) {
+        if (this.verifiedRegistrationFlow(targetUrl) || this.nonVerifiedRegistrationFlow(targetUrl)) {
           this.oauthService.initImplicitFlow(targetUrl);
           this.isLoggedIn$.next(false);
           return Promise.resolve(false);
@@ -67,6 +67,16 @@ export class LoginService {
     );
   }
 
+  private nonVerifiedRegistrationFlow(targetUrl: string): boolean {
+    if (!targetUrl) {
+      return false;
+    }
+
+    const url = new URL(targetUrl, window.location.origin);
+
+    return url.pathname === '/verified-registration' && !url.searchParams.has('inviteId');
+  }
+
   public async tryLogin(): Promise<void> {
     await this.oauthService.tryLogin().then(() => {
       if (this.oauthService.hasValidAccessToken()) {