@multiplatform.one/keycloak 0.3.3 → 0.3.5

package/package.json

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

package/src/hooks/index.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 06:34:56
  * Author: Clay Risser
  * -----
- * Last Modified: 25-11-2022 09:52:31
+ * Last Modified: 15-05-2023 01:58:05
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -23,5 +23,6 @@
  */
 
 export * from './useCurrentRouteName';
+export * from './useIsPassedInToken';
 export * from './useKeycloak';
 export * from './useLogin';

package/src/hooks/useIsPassedInToken/index.native.ts

@@ -0,0 +1,25 @@
+/**
+ * File: /src/hooks/useIsPassedInToken/index.native.ts
+ * Project: @multiplatform.one/keycloak
+ * File Created: 15-05-2023 01:54:48
+ * Author: Clay Risser
+ * -----
+ * Last Modified: 15-05-2023 01:55:27
+ * Modified By: Clay Risser
+ * -----
+ * Risser Labs LLC (c) Copyright 2022 - 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const useIsPassedInToken = () => false;

package/src/hooks/useIsPassedInToken/index.ts

@@ -0,0 +1,31 @@
+/**
+ * File: /src/hooks/useIsPassedInToken/index.ts
+ * Project: @multiplatform.one/keycloak
+ * File Created: 15-05-2023 01:54:44
+ * Author: Clay Risser
+ * -----
+ * Last Modified: 15-05-2023 01:56:30
+ * Modified By: Clay Risser
+ * -----
+ * Risser Labs LLC (c) Copyright 2022 - 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { MultiPlatform } from 'multiplatform.one';
+import { useRouter } from 'next/router';
+
+export function useIsPassedInToken() {
+  const { query } = MultiPlatform.isNext ? useRouter() : { query: {} };
+  return 'idToken' in query || 'token' in query || 'refreshToken' in query;
+}

package/src/provider/index.tsx

@@ -29,6 +29,7 @@ import type { FC, ComponentType, ReactNode } from 'react';
 import type { KeycloakConfig, KeycloakInitOptions } from '@bitspur/keycloak-js';
 import { AuthConfigContext, defaultAuthConfig } from '../authConfig';
 import { KeycloakProvider } from './keycloakProvider';
+import { useIsPassedInToken } from '../hooks';
 // @ts-ignore
 import { config } from 'app/config';
 
@@ -67,6 +68,7 @@ export const AuthProvider: FC<AuthProviderProps> = ({
   onTokens,
   ...keycloakInitOptions
 }: AuthProviderProps) => {
+  const isPassedInToken = useIsPassedInToken();
   const authConfig = useMemo(
     () => ({
       ...defaultAuthConfig,
@@ -74,7 +76,7 @@ export const AuthProvider: FC<AuthProviderProps> = ({
       ensureFreshness,
       loginRoute,
       messageHandlerKeys,
-      persist: ssr ? false : persist,
+      persist: ssr || isPassedInToken ? false : persist,
       ssr,
     }),
     [debug, ensureFreshness, loginRoute, messageHandlerKeys, persist, ssr],

package/src/provider/keycloakProvider.tsx

@@ -33,6 +33,7 @@ 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 { useIsPassedInToken } from '../hooks';
 import { useRouter } from 'next/router';
 
 export interface KeycloakProviderProps {
@@ -80,7 +81,7 @@ export function KeycloakProvider({
       refreshToken,
     ),
   );
-  const explicitToken = 'idToken' in query || 'token' in query || 'refreshToken' in query;
+  const isPassedInToken = useIsPassedInToken();
 
   useEffect(() => {
     if (token !== true && refreshToken !== true && idToken !== true) return;
@@ -101,7 +102,7 @@ export function KeycloakProvider({
           data = JSON.parse(data);
         } catch (err) {}
       }
-      if (debug) logger.debug('received message', data);
+      if (debug) logger.debug('received message', JSON.stringify(data));
       const message: MessageSchema = data;
       if (!message.type) return;
       if (message.type.toUpperCase() === 'REFRESH_TOKEN' && message.payload) {
@@ -130,7 +131,7 @@ export function KeycloakProvider({
           data = JSON.parse(data);
         } catch (err) {}
       }
-      if (debug) logger.debug('received message', data);
+      if (debug) logger.debug('received message', JSON.stringify(data));
       const message: MessageSchema = data;
       if (!message.type) return;
       if (message.type.toUpperCase() === 'TOKEN' && message.payload) {
@@ -159,7 +160,7 @@ export function KeycloakProvider({
           data = JSON.parse(data);
         } catch (err) {}
       }
-      if (debug) logger.debug('received message', data);
+      if (debug) logger.debug('received message', JSON.stringify(data));
       const message: MessageSchema = data;
       if (!message.type) return;
       if (message.type.toUpperCase() === 'ID_TOKEN' && message.payload) {
@@ -197,7 +198,7 @@ export function KeycloakProvider({
         realm: keycloakConfig.realm,
         clientId: keycloakConfig.clientId,
       }),
-    [],
+    [keycloakInitOptions, token, refreshToken, idToken],
   );
 
   const initOptions = useMemo(() => {
@@ -210,7 +211,7 @@ export function KeycloakProvider({
       initOptions.token = token;
       if (idToken && typeof idToken === 'string') initOptions.idToken = idToken;
       if (refreshToken && typeof refreshToken === 'string') initOptions.refreshToken = refreshToken;
-      if (explicitToken) {
+      if (isPassedInToken) {
         initOptions.checkLoginIframe = false;
         initOptions.onLoad = undefined;
       }
@@ -218,8 +219,12 @@ export function KeycloakProvider({
     return initOptions;
   }, [keycloakInitOptions, token, refreshToken, idToken]);
 
+  console.log('token', token);
+  console.log('idToken', idToken);
+  console.log('refreshToken', refreshToken);
+
   if (token === true || idToken === true || refreshToken === true) return <LoadingComponent />;
-  if (cookies && ssr) {
+  if (!isPassedInToken && cookies && ssr) {
     return (
       // @ts-ignore
       <SSRKeycloakProvider
@@ -240,6 +245,7 @@ export function KeycloakProvider({
       </SSRKeycloakProvider>
     );
   }
+  console.log('keycloak', keycloak);
   if (!keycloak) return <>{children}</>;
   return (
     <ReactKeycloakProvider