From d53e5c4da59610f8e63d3de17824201a5c21a9b0 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sat, 24 Jul 2021 10:57:03 +0200 Subject: [PATCH] Refactor auth guard (#226) --- apps/client/src/app/core/auth.guard.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts index d196cb68d..b2e70e446 100644 --- a/apps/client/src/app/core/auth.guard.ts +++ b/apps/client/src/app/core/auth.guard.ts @@ -63,6 +63,7 @@ export class AuthGuard implements CanActivate { ) { this.router.navigate(['/zen']); resolve(false); + return; } else if (state.url.startsWith('/start')) { if (user.settings.viewMode === ViewMode.ZEN) { this.router.navigate(['/zen']); @@ -71,12 +72,14 @@ export class AuthGuard implements CanActivate { } resolve(false); + return; } else if ( state.url.startsWith('/zen') && user.settings.viewMode === ViewMode.DEFAULT ) { this.router.navigate(['/home']); resolve(false); + return; } resolve(true);