bugfix: fix issue #600, keycloak initialization (#602)

mauriciovigolo · Dec 24, 2024 · 982677a · 982677a
1 parent 81dede8
commit 982677a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/projects/keycloak-angular/src/lib/provide-keycloak.spec.ts b/projects/keycloak-angular/src/lib/provide-keycloak.spec.ts
@@ -10,12 +10,12 @@ import Keycloak, { KeycloakConfig, KeycloakInitOptions } from 'keycloak-js';
 import { TestBed } from '@angular/core/testing';
 
 import { provideKeycloak } from './provide-keycloak';
+import { KeycloakFeature } from './features/keycloak.feature';
+import { createInterceptorCondition } from './interceptors/keycloak.interceptor';
 import {
   INCLUDE_BEARER_TOKEN_INTERCEPTOR_CONFIG,
   IncludeBearerTokenCondition
 } from './interceptors/include-bearer-token.interceptor';
-import { createInterceptorCondition } from './interceptors/keycloak.interceptor';
-import { KeycloakFeature } from './features/keycloak.feature';
 
 describe('provideKeycloak', () => {
   it('should instantiate keycloak and initialize it if initOptions is provided', () => {
@@ -127,7 +127,7 @@ describe('provideKeycloak', () => {
     };
 
     const initOptions: KeycloakInitOptions = {
-      onLoad: 'login-required'
+      onLoad: 'check-sso'
     };
 
     const withCustomFeature: KeycloakFeature = {
@@ -144,7 +144,6 @@ describe('provideKeycloak', () => {
     TestBed.configureTestingModule({
       providers: [provideKeycloakAngular]
     });
-
     const keycloak = TestBed.inject(Keycloak);
 
     expect(keycloak).toBeDefined();

diff --git a/projects/keycloak-angular/src/lib/provide-keycloak.ts b/projects/keycloak-angular/src/lib/provide-keycloak.ts
@@ -7,7 +7,15 @@
  */
 
 import Keycloak, { KeycloakConfig, KeycloakInitOptions } from 'keycloak-js';
-import { EnvironmentProviders, makeEnvironmentProviders, provideAppInitializer, Provider } from '@angular/core';
+import {
+  EnvironmentInjector,
+  EnvironmentProviders,
+  inject,
+  makeEnvironmentProviders,
+  provideAppInitializer,
+  Provider,
+  runInInjectionContext
+} from '@angular/core';
 import { createKeycloakSignal, KEYCLOAK_EVENT_SIGNAL } from './signals/keycloak-events-signal';
 import { KeycloakFeature } from './features/keycloak.feature';
 
@@ -55,12 +63,10 @@ const provideKeycloakInAppInitializer = (
     return [];
   }
 
-  return provideAppInitializer(() => {
-    keycloak.init(initOptions).catch((error) => {
-      console.error('Keycloak initialization failed', error);
-      return Promise.reject(error);
-    });
-    features.forEach((feature) => feature.configure());
+  return provideAppInitializer(async () => {
+    const injector = inject(EnvironmentInjector);
+    runInInjectionContext(injector, () => features.forEach((feature) => feature.configure()));
+    await keycloak.init(initOptions).catch((error) => console.error('Keycloak initialization failed', error));
   });
 };