Incorporate observable of loginWithRedirect in observable returned by…

… AuthGuard (#659)
auth0 · Nov 19, 2024 · 4553e0c · 4553e0c
1 parent 81dd79c
commit 4553e0c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/projects/auth0-angular/src/lib/auth.guard.ts b/projects/auth0-angular/src/lib/auth.guard.ts
@@ -8,8 +8,8 @@ import {
   UrlSegment,
   CanActivateChild,
 } from '@angular/router';
-import { Observable } from 'rxjs';
-import { tap, take } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { take, switchMap, map } from 'rxjs/operators';
 import { AuthService } from './auth.service';
 
 @Injectable({
@@ -40,12 +40,15 @@ export class AuthGuard implements CanActivate, CanLoad, CanActivateChild {
     state: RouterStateSnapshot
   ): Observable<boolean> {
     return this.auth.isAuthenticated$.pipe(
-      tap((loggedIn) => {
+      switchMap((loggedIn) => {
         if (!loggedIn) {
-          this.auth.loginWithRedirect({
-            appState: { target: state.url },
-          });
+          return this.auth
+            .loginWithRedirect({
+              appState: { target: state.url },
+            })
+            .pipe(map(() => false));
         }
+        return of(true);
       })
     );
   }