@multiplatform.one/keycloak 0.3.22 → 0.3.25

package/package.json

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

package/src/Authenticated.tsx

@@ -50,7 +50,7 @@ export function Authenticated({ children, disabled, loginRoute, loggedOutCompone
       authState.setRefreshToken('');
       authState.setToken('');
     }
-    if (typeof window !== 'undefined' && !tokensFromQuery && !tokensFromState) login();
+    if (typeof window !== 'undefined' && !tokensFromQuery && !tokensFromState && window.self === window.top) login();
   }, [authenticated]);
 
   if (disabled || authenticated) return <>{children}</>;

package/src/authConfig.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 09:21:15
  * Author: Clay Risser
  * -----
- * Last Modified: 14-05-2023 01:22:15
+ * Last Modified: 26-05-2023 08:07:00
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022

package/src/provider/index.tsx

@@ -73,12 +73,22 @@ export const AuthProvider: FC<AuthProviderProps> = ({
   const authConfig = useMemo(
     () => ({
       ...defaultAuthConfig,
-      debug,
-      ensureFreshness,
-      loginRoute,
-      messageHandlerKeys,
-      persist: !tokensFromState && !tokensFromQuery && cookies && ssr ? false : persist,
-      ssr: !tokensFromState && !tokensFromQuery && cookies ? ssr : false,
+      ...(typeof debug !== 'undefined' ? { debug } : {}),
+      ...(typeof ensureFreshness !== 'undefined' ? { ensureFreshness } : {}),
+      ...(typeof loginRoute !== 'undefined' ? { loginRoute } : {}),
+      ...(typeof messageHandlerKeys !== 'undefined' ? { messageHandlerKeys } : {}),
+      persist:
+        !tokensFromState && !tokensFromQuery && cookies && ssr
+          ? false
+          : typeof persist !== 'undefined'
+          ? persist
+          : defaultAuthConfig.persist,
+      ssr:
+        !tokensFromState && !tokensFromQuery && cookies
+          ? typeof ssr !== 'undefined'
+            ? ssr
+            : defaultAuthConfig.ssr
+          : false,
     }),
     [debug, ensureFreshness, loginRoute, messageHandlerKeys, persist, ssr],
   );

package/src/provider/keycloakProvider.tsx

@@ -33,7 +33,6 @@ import { ReactKeycloakProvider } from '@bitspur/react-keycloak-web';
 import { SSRKeycloakProvider, SSRCookies } from '@bitspur/react-keycloak-ssr';
 import { useAuthConfig } from '../hooks/useAuthConfig';
 import { useAuthState } from '../state';
-import { useTokensFromQuery } from '../hooks';
 import { useRouter } from 'next/router';
 import { validToken } from '../util';
 
@@ -82,7 +81,6 @@ export function KeycloakProvider({
       refreshToken,
     ),
   );
-  const tokensFromQuery = useTokensFromQuery();
 
   useEffect(() => {
     if (token !== true && refreshToken !== true && idToken !== true) return;
@@ -225,7 +223,7 @@ export function KeycloakProvider({
       if (idToken && typeof idToken === 'string') initOptions.idToken = idToken;
       if (refreshToken && typeof refreshToken === 'string') initOptions.refreshToken = refreshToken;
     }
-    if (tokensFromQuery) {
+    if (window.self !== window.top) {
       initOptions.checkLoginIframe = false;
       initOptions.flow = 'implicit';
       initOptions.onLoad = undefined;