From 25c27c66c77106b16015c2c513efcacab243c531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 1 Nov 2023 00:59:16 +0200 Subject: [PATCH] DM-540: Check for roles before main guard --- apps/red-ui/src/app/app-routing.module.ts | 6 +++--- libs/common-ui | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 1b32fde0e..7985561ac 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -15,7 +15,7 @@ import { ifNotLoggedIn } from '@guards/if-not-logged-in.guard'; import { TrashGuard } from '@guards/trash.guard'; import { CompositeRouteGuard, DEFAULT_REDIRECT_KEY, IqserPermissionsGuard, IqserRoutes, orderedAsyncGuards } from '@iqser/common-ui'; import { TenantSelectComponent } from '@iqser/common-ui/lib/tenants'; -import { hasAnyRoleGuard, IqserAuthGuard } from '@iqser/common-ui/lib/users'; +import { doesNotHaveAnyRole, hasAnyRole, IqserAuthGuard } from '@iqser/common-ui/lib/users'; import { CustomRouteReuseStrategy } from '@iqser/common-ui/lib/utils'; import { ARCHIVE_ROUTE, BreadcrumbTypes, DOSSIER_ID, DOSSIER_TEMPLATE_ID, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE, FILE_ID } from '@red/domain'; import { RedRoleGuard } from '@users/red-role.guard'; @@ -211,14 +211,14 @@ const routes: IqserRoutes = [ }, { path: ':tenant/main', - canActivate: [orderedAsyncGuards([ifLoggedIn(), mainGuard()])], + canActivate: [orderedAsyncGuards([ifLoggedIn(), hasAnyRole(), mainGuard()])], component: BaseScreenComponent, children: mainRoutes, }, { path: ':tenant/auth-error', component: AuthErrorComponent, - canActivate: [hasAnyRoleGuard()], + canActivate: [doesNotHaveAnyRole()], }, { path: '**', diff --git a/libs/common-ui b/libs/common-ui index 85fba4a1d..a6f8a3576 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 85fba4a1dd57ecbb133d938552d75fceffa1099c +Subproject commit a6f8a3576522614b2d5bcc95b8a59ec0315e3a57