fix: timeout in auth guard only on first routing

intershop · Feb 28, 2020 · d7a310c · d7a310c
1 parent 7314bf0
commit d7a310c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts
@@ -37,8 +37,10 @@ export class AuthGuard implements CanActivate, CanActivateChild {
         whenTruthy(),
         take(1)
       ),
-      // send to login after timeout
-      timer(4000).pipe(mapTo(this.router.createUrlTree(['/login'], { queryParams: { returnUrl: url } })))
+      // send to login after timeout on first routing only
+      timer(this.router.navigated ? 0 : 4000).pipe(
+        mapTo(this.router.createUrlTree(['/login'], { queryParams: { returnUrl: url } }))
+      )
     );
   }
 }