@multiplatform.one/keycloak 0.3.29 → 0.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/keycloak",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "description": "keycloak client for multiplatform.one ecosystem",
   "main": "dist/lib",
   "module": "dist/esm",

package/src/hooks/useKeycloak/useKeycloak.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 06:04:59
  * Author: Clay Risser
  * -----
- * Last Modified: 31-05-2023 12:41:30
+ * Last Modified: 31-05-2023 12:49:27
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -30,12 +30,17 @@ import { useKeycloak as useSsrKeycloak } from '@bitspur/react-keycloak-ssr';
 
 export function useKeycloak() {
   const authConfig = useAuthConfig();
-  if (MultiPlatform.isStorybook) return { authenticated: true } as IKeycloak;
+  if (MultiPlatform.isStorybook) {
+    return { authenticated: true, username: 'storybook', email: 'storybook@example.com', userId: '0' } as IKeycloak;
+  }
   if (MultiPlatform.isNext && authConfig.ssr) {
     const { keycloak, initialized } = useSsrKeycloak();
     return {
       ...keycloak,
       authenticated: initialized ? keycloak?.authenticated : undefined,
+      email: keycloak?.tokenParsed?.email,
+      userId: keycloak?.tokenParsed?.sub,
+      username: keycloak?.tokenParsed?.preferred_username,
     } as IKeycloak;
   }
   const { keycloak, initialized } = useReactKeycloak();

package/src/provider/keycloakProvider.tsx

@@ -220,6 +220,7 @@ export function KeycloakProvider({
     if (debug) initOptions.enableLogging = true;
     if (token && typeof token === 'string') {
       initOptions.token = token;
+      initOptions.timeSkew = 0;
       if (idToken && typeof idToken === 'string') initOptions.idToken = idToken;
       if (refreshToken && typeof refreshToken === 'string') initOptions.refreshToken = refreshToken;
     }
@@ -227,7 +228,6 @@ export function KeycloakProvider({
       initOptions.checkLoginIframe = false;
       initOptions.flow = 'implicit';
       initOptions.onLoad = undefined;
-      initOptions.timeSkew = 0;
     }
     return initOptions;
   }, [keycloakInitOptions, token, refreshToken, idToken]);
@@ -238,8 +238,7 @@ export function KeycloakProvider({
       // @ts-ignore
       <SSRKeycloakProvider
         LoadingComponent={<LoadingComponent />}
-        // keycloak-js already handles refreshing tokens
-        autoRefreshToken={false}
+        autoRefreshToken={initOptions.checkLoginIframe}
         initOptions={initOptions}
         onEvent={handleEvent}
         onTokens={onTokens}
@@ -259,8 +258,7 @@ export function KeycloakProvider({
     <ReactKeycloakProvider
       LoadingComponent={<LoadingComponent />}
       authClient={keycloak}
-      // keycloak-js already handles refreshing tokens
-      autoRefreshToken={false}
+      autoRefreshToken={initOptions.checkLoginIframe}
       initOptions={initOptions}
       onEvent={handleEvent}
       onTokens={onTokens}