From bd77067dc7a10bad1b21a3e0807f4ea6413da4ad Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Fri, 5 Jan 2024 13:06:49 +0200
Subject: [PATCH] RED-8164: fixed newly created users cannot login.

---
 src/lib/users/guards/roles.guard.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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;