Prevent redirecting againt in the middle of redirect (ORCID#1926)

kadet1090 · Apr 7, 2023 · 8518a89 · 8518a89
1 parent b3920b8
commit 8518a89
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/app/guards/authorize.guard.ts b/src/app/guards/authorize.guard.ts
@@ -23,6 +23,7 @@ import { GoogleTagManagerService } from '../core/google-tag-manager/google-tag-m
 })
 export class AuthorizeGuard implements CanActivateChild {
   lastRedirectUrl: string
+  inTheMiddleOfRedirect: boolean = false
   constructor(
     private _user: UserService,
     private _router: Router,
@@ -67,7 +68,14 @@ export class AuthorizeGuard implements CanActivateChild {
   }
 
   sendUserToRedirectURL(oauthSession: RequestInfoForm): Observable<boolean> {
+    // Prevent double redirection caused by races using simple semaphore like construct
+    if (this.inTheMiddleOfRedirect) {
+      return;
+    }
+
     this.window.location.href = oauthSession.redirectUrl
+    this.inTheMiddleOfRedirect = true;
+
     return NEVER
   }