From 334aff5c9d7f84c717172d00d3cdb6e65fd0c644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 14 Mar 2022 15:22:56 +0200 Subject: [PATCH] RED-3585: Fixed user admin role guard --- apps/red-ui/src/app/modules/auth/red-role.guard.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/red-ui/src/app/modules/auth/red-role.guard.ts b/apps/red-ui/src/app/modules/auth/red-role.guard.ts index 9ac205529..f9d43d465 100644 --- a/apps/red-ui/src/app/modules/auth/red-role.guard.ts +++ b/apps/red-ui/src/app/modules/auth/red-role.guard.ts @@ -25,6 +25,18 @@ export class RedRoleGuard implements CanActivate { } // we have at least 1 RED Role -> if it's not user he must be admin + if ( + this._userService.currentUser.isUserAdmin && + !this._userService.currentUser.isAdmin && + state.url.includes('admin') && + !state.url.includes('users') + ) { + this._router.navigate(['/main/admin/users']); + obs.next(false); + obs.complete(); + return; + } + if ( this._userService.currentUser.isUserAdmin && !this._userService.currentUser.isAdmin &&