Skip to content

Commit 9538b0b

Browse files
authored
fix keycloak init check (bcgov#125)
1 parent ed695c4 commit 9538b0b

File tree

1 file changed

+14
-2
lines changed
  • met-web/src/services/userService

1 file changed

+14
-2
lines changed

met-web/src/services/userService/index.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,34 @@ import { USER_ROLES } from 'services/userService/constants';
1818
import { getBaseUrl } from 'utils/helpers';
1919

2020
const KeycloakData = _kc;
21+
22+
let isInitializing = false;
23+
let isInitialized = false;
24+
2125
/**
2226
* Initializes Keycloak instance.
2327
*/
2428
const initKeycloak = async (dispatch: Dispatch<AnyAction>) => {
2529
console.log('[Keycloak] Starting initialization');
26-
if (KeycloakData.authenticated === true || KeycloakData.authenticated === false) {
27-
console.log('[Keycloak] Already initialized');
30+
31+
if (isInitializing || isInitialized) {
32+
console.log('[Keycloak] Already initialized or initializing');
2833
return;
2934
}
35+
36+
isInitializing = true;
3037
try {
3138
const authenticated = await KeycloakData.init({
3239
onLoad: 'check-sso',
3340
silentCheckSsoRedirectUri: window.location.origin + '/silent-check-sso.html',
3441
pkceMethod: 'S256',
3542
checkLoginIframe: false,
3643
});
44+
45+
isInitialized = true;
46+
47+
console.log('[Keycloak] Init completed, authenticated:', authenticated);
48+
3749
if (!authenticated) {
3850
console.warn('not authenticated!');
3951
dispatch(userAuthentication(authenticated));

0 commit comments

Comments
 (0)