Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RED-8164: fixed newly created users cannot login.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2024-01-05 13:06:49 +02:00
parent da086cdaa6
commit bd77067dc7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/users/guards/roles.guard.ts
View File

@ -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;