Browse Source

Improve error handling

pull/7679/head
Thomas Kaul 1 week ago
parent
commit
0d0dfc29da
  1. 8
      apps/client/src/app/core/auth.guard.ts

8
apps/client/src/app/core/auth.guard.ts

@ -34,9 +34,11 @@ export class AuthGuard {
if (utmSource === 'ios') { if (utmSource === 'ios') {
this.router.navigate(publicRoutes.demo.routerLink); this.router.navigate(publicRoutes.demo.routerLink);
resolve(false); resolve(false);
return EMPTY;
} else if (utmSource === 'trusted-web-activity') { } else if (utmSource === 'trusted-web-activity') {
this.router.navigate(publicRoutes.register.routerLink); this.router.navigate(publicRoutes.register.routerLink);
resolve(false); resolve(false);
return EMPTY;
} else if ( } else if (
Object.values(publicRoutes) Object.values(publicRoutes)
.map(({ path }) => { .map(({ path }) => {
@ -77,13 +79,13 @@ export class AuthGuard {
return; return;
} else if ( } else if (
state.url.startsWith(`/${internalRoutes.home.path}`) && state.url.startsWith(`/${internalRoutes.home.path}`) &&
user.settings.viewMode === 'ZEN' user?.settings?.viewMode === 'ZEN'
) { ) {
this.router.navigate(internalRoutes.zen.routerLink); this.router.navigate(internalRoutes.zen.routerLink);
resolve(false); resolve(false);
return; return;
} else if (state.url.startsWith(`/${publicRoutes.start.path}`)) { } else if (state.url.startsWith(`/${publicRoutes.start.path}`)) {
if (user.settings.viewMode === 'ZEN') { if (user?.settings?.viewMode === 'ZEN') {
this.router.navigate(internalRoutes.zen.routerLink); this.router.navigate(internalRoutes.zen.routerLink);
} else { } else {
this.router.navigate(internalRoutes.home.routerLink); this.router.navigate(internalRoutes.home.routerLink);
@ -93,7 +95,7 @@ export class AuthGuard {
return; return;
} else if ( } else if (
state.url.startsWith(`/${internalRoutes.zen.path}`) && state.url.startsWith(`/${internalRoutes.zen.path}`) &&
user.settings.viewMode === 'DEFAULT' user?.settings?.viewMode === 'DEFAULT'
) { ) {
this.router.navigate(internalRoutes.home.routerLink); this.router.navigate(internalRoutes.home.routerLink);
resolve(false); resolve(false);

Loading…
Cancel
Save