@multiplatform.one/keycloak 0.3.19 → 0.3.21

package/package.json

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

package/src/Authenticated.tsx

@@ -26,7 +26,7 @@ import React, { useEffect } from 'react';
 import type { ComponentType, ReactNode } from 'react';
 import { useLogin, useKeycloak } from './hooks';
 import { useAuthState } from './state';
-import { useAuthConfig } from './hooks/useAuthConfig';
+import { useAuthConfig, useTokensFromQuery, useTokensFromState } from './hooks';
 
 export interface AuthenticatedProps {
   children: ReactNode;
@@ -39,6 +39,8 @@ export function Authenticated({ children, disabled, loginRoute, loggedOutCompone
   const authConfig = useAuthConfig();
   const authState = useAuthState();
   const login = useLogin(loginRoute);
+  const tokensFromQuery = useTokensFromQuery();
+  const tokensFromState = useTokensFromState();
   const { authenticated } = useKeycloak();
 
   useEffect(() => {
@@ -48,11 +50,11 @@ export function Authenticated({ children, disabled, loginRoute, loggedOutCompone
       authState.setRefreshToken('');
       authState.setToken('');
     }
-    login();
+    if (typeof window !== 'undefined' && !tokensFromQuery && !tokensFromState) login();
   }, [authenticated]);
 
   if (disabled || authenticated) return <>{children}</>;
-  const LoggedOutComponent = loggedOutComponent || (() => null);
+  const LoggedOutComponent = loggedOutComponent || (() => <>{authState.debug ? 'not authenticated' : null}</>);
   return <LoggedOutComponent />;
 }
 

package/src/hooks/index.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 06:34:56
  * Author: Clay Risser
  * -----
- * Last Modified: 16-05-2023 07:40:57
+ * Last Modified: 26-05-2023 07:00:31
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -22,6 +22,7 @@
  * limitations under the License.
  */
 
+export * from './useAuthConfig';
 export * from './useCurrentRouteName';
 export * from './useKeycloak';
 export * from './useLogin';

package/src/provider/keycloakProvider.tsx

@@ -224,12 +224,12 @@ export function KeycloakProvider({
       initOptions.token = token;
       if (idToken && typeof idToken === 'string') initOptions.idToken = idToken;
       if (refreshToken && typeof refreshToken === 'string') initOptions.refreshToken = refreshToken;
-      if (tokensFromQuery) {
-        initOptions.checkLoginIframe = false;
-        initOptions.flow = 'implicit';
-        initOptions.onLoad = undefined;
-        initOptions.timeSkew = 0;
-      }
+    }
+    if (tokensFromQuery) {
+      initOptions.checkLoginIframe = false;
+      initOptions.flow = 'implicit';
+      initOptions.onLoad = undefined;
+      initOptions.timeSkew = 0;
     }
     return initOptions;
   }, [keycloakInitOptions, token, refreshToken, idToken]);