From 3906421aa0532346d55024d747ca54c3df025e48 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Wed, 27 Jul 2022 13:25:51 +0300
Subject: [PATCH] update user & auth

---
 src/lib/auth/auth.module.ts       | 5 ++---
 src/lib/auth/base-user.service.ts | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/lib/auth/auth.module.ts b/src/lib/auth/auth.module.ts
index 0639904..b2629f4 100644
--- a/src/lib/auth/auth.module.ts
+++ b/src/lib/auth/auth.module.ts
@@ -35,8 +35,8 @@ function getKeycloakOptions(baseUrl: string, configService: BaseConfigService):
 }
 
 function configureAutomaticRedirectToLoginScreen(keyCloakService: KeycloakService) {
-    keyCloakService.getKeycloakInstance().onAuthRefreshError = () => {
-        void keyCloakService.logout().then();
+    keyCloakService.getKeycloakInstance().onAuthRefreshError = async () => {
+        await keyCloakService.logout();
     };
 }
 
@@ -53,7 +53,6 @@ export function keycloakInitializer(
     imports: [CommonModule, HttpClientModule, KeycloakAngularModule],
     providers: [
         AuthGuard,
-        RoleGuard,
         {
             provide: APP_INITIALIZER,
             useFactory: keycloakInitializer,
diff --git a/src/lib/auth/base-user.service.ts b/src/lib/auth/base-user.service.ts
index 7a3e019..ad33162 100644
--- a/src/lib/auth/base-user.service.ts
+++ b/src/lib/auth/base-user.service.ts
@@ -49,9 +49,9 @@ export abstract class BaseUserService<
         await firstValueFrom(this.loadAll());
     }
 
-    logout() {
-        void this._cacheApiService.wipeCaches().then();
-        void this._keycloakService.logout(window.location.origin + this._baseHref).then();
+    async logout() {
+        await this._cacheApiService.wipeCaches();
+        await this._keycloakService.logout(window.location.origin + this._baseHref);
     }
 
     loadAll() {
@@ -71,8 +71,8 @@ export abstract class BaseUserService<
         try {
             profile = await this._keycloakService.loadUserProfile(true);
         } catch (e) {
-            await this._keycloakService.logout();
             console.log(e);
+            await this.logout();
             return;
         }