From 9259a9b217bb20bb7aeef4f121841b7b7579d42a Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sat, 22 May 2021 13:09:38 +0200 Subject: [PATCH] Fix internal navigation with query parameter --- apps/client/src/app/core/auth.guard.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts index 623d20c3a..d2e1fd768 100644 --- a/apps/client/src/app/core/auth.guard.ts +++ b/apps/client/src/app/core/auth.guard.ts @@ -45,12 +45,12 @@ export class AuthGuard implements CanActivate { ) .subscribe((user) => { if ( - state.url === '/home' && + state.url.startsWith('/home') && user.settings.viewMode === ViewMode.ZEN ) { this.router.navigate(['/zen']); resolve(false); - } else if (state.url === '/start') { + } else if (state.url.startsWith('/start')) { if (user.settings.viewMode === ViewMode.ZEN) { this.router.navigate(['/zen']); } else { @@ -59,7 +59,7 @@ export class AuthGuard implements CanActivate { resolve(false); } else if ( - state.url === '/zen' && + state.url.startsWith('/zen') && user.settings.viewMode === ViewMode.DEFAULT ) { this.router.navigate(['/home']);