diff --git a/src/lib/users/guards/roles.guard.ts b/src/lib/users/guards/roles.guard.ts index 3b6a75e..68ca869 100644 --- a/src/lib/users/guards/roles.guard.ts +++ b/src/lib/users/guards/roles.guard.ts @@ -1,16 +1,14 @@ import { Router } from '@angular/router'; import { inject } from '@angular/core'; import { IqserUserService } from '../services/iqser-user.service'; -import { TenantsService } from '../../tenants'; import { AsyncGuard } from '../../services'; export function doesNotHaveAnyRole(): AsyncGuard { return async () => { const router = inject(Router); - const activeTenantId = inject(TenantsService).activeTenantId; const user = await inject(IqserUserService).loadCurrentUser(); if (user?.hasAnyRole) { - await router.navigate([`/${activeTenantId}/main`]); + await router.navigate(['main']); return false; } return true; @@ -20,10 +18,10 @@ export function doesNotHaveAnyRole(): AsyncGuard { export function hasAnyRole(): AsyncGuard { return async () => { const router = inject(Router); - const activeTenantId = inject(TenantsService).activeTenantId; const user = await inject(IqserUserService).loadCurrentUser(); + if (!user?.hasAnyRole) { - await router.navigate([`/${activeTenantId}/auth-error`]); + await router.navigate(['auth-error']); return false; } return true;