@multiplatform.one/keycloak 0.2.4 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/keycloak",
-  "version": "0.2.4",
+  "version": "0.2.7",
   "description": "keycloak client for multiplatform.one ecosystem",
   "main": "dist/lib",
   "module": "dist/esm",
@@ -50,7 +50,6 @@
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-navigation/native": "^6.0.14",
     "expo-keycloak-auth": "1.0.14",
-    "keycloak-js": "^20.0.3",
     "multiplatform.one": "^0.4.3",
     "next": "^13.0.5",
     "react": "^18.2.0",
@@ -64,31 +63,30 @@
     "@react-native-async-storage/async-storage": "^1.18.1",
     "@react-navigation/native": "^6.1.6",
     "@types/eslint": "^8.37.0",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.1",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.startcase": "^4.4.7",
-    "@types/react": "18.0.37",
+    "@types/react": "18.2.0",
     "@types/react-native": "0.71.6",
-    "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
     "babel-plugin-fully-specified": "^1.3.0",
     "cspell": "^6.31.1",
-    "esbuild": "^0.17.17",
+    "esbuild": "^0.17.18",
     "esbuild-plugin-babel": "^0.2.3",
-    "eslint": "^8.38.0",
-    "eslint-config-alloy": "^4.9.0",
+    "eslint": "^8.39.0",
+    "eslint-config-alloy": "^5.0.0",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-spellcheck": "^0.0.20",
     "expo-keycloak-auth": "1.0.14",
     "jest": "^29.5.0",
     "jest-sonar-reporter": "^2.0.0",
-    "keycloak-js": "21.0.2",
     "lockfile-lint": "^4.10.1",
-    "multiplatform.one": "^0.5.21",
-    "next": "^13.3.0",
-    "prettier": "^2.8.7",
+    "multiplatform.one": "^0.5.28",
+    "next": "^13.3.1",
+    "prettier": "^2.8.8",
     "react": "^18.2.0",
-    "react-native": "~0.71.6",
+    "react-native": "~0.71.7",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
@@ -116,16 +114,15 @@
     "indent": 4
   },
   "dependencies": {
-    "@react-keycloak/ssr": "^3.3.0",
-    "@react-keycloak/web": "^3.4.0",
+    "@bitspur/keycloak-js": "21.1.0-3",
+    "@bitspur/react-keycloak-ssr": "4.0.0",
+    "@bitspur/react-keycloak-web": "4.0.0",
     "core-js-pure": "^3.30.1",
     "expo-auth-session": "^4.0.3",
-    "solito": "^3.2.0"
+    "solito": "^3.2.5"
   },
   "resolutions": {
-    "expo-keycloak-auth@1.0.14": "patch:expo-keycloak-auth@npm%3A1.0.14#./.yarn/patches/expo-keycloak-auth-npm-1.0.14-78201597ce.patch",
-    "keycloak-js@21.0.0": "patch:keycloak-js@npm%3A21.0.0#./.yarn/patches/keycloak-js-npm-21.0.0-1387a3b112.patch",
-    "keycloak-js@21.0.2": "patch:keycloak-js@npm%3A21.0.2#./.yarn/patches/keycloak-js-npm-21.0.2-0f4fb90576.patch"
+    "expo-keycloak-auth@1.0.14": "patch:expo-keycloak-auth@npm%3A1.0.14#./.yarn/patches/expo-keycloak-auth-npm-1.0.14-78201597ce.patch"
   },
   "prettier": "eslint-config-alloy/.prettierrc.js"
 }

package/src/Authenticated.tsx

@@ -22,9 +22,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import type { ComponentType, FC, ReactNode } from 'react';
+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';
 
 export interface AuthenticatedProps {
   children: ReactNode;
@@ -33,16 +35,26 @@ export interface AuthenticatedProps {
   loginRoute?: string;
 }
 
-export const Authenticated: FC<AuthenticatedProps> = (props: AuthenticatedProps) => {
+export function Authenticated({ children, disabled, loginRoute, loggedOutComponent }: AuthenticatedProps) {
+  const authConfig = useAuthConfig();
+  const authState = useAuthState();
+  const login = useLogin(loginRoute);
   const { authenticated } = useKeycloak();
-  const login = useLogin(props.loginRoute);
-  if (!props.disabled && !authenticated) {
-    if (authenticated === false) login();
-    const LoggedOutComponent = props.loggedOutComponent || (() => null);
-    return <LoggedOutComponent />;
-  }
-  return <>{props.children}</>;
-};
+
+  useEffect(() => {
+    if (authenticated !== false) return;
+    if (authConfig.persist) {
+      authState.setIdToken('');
+      authState.setRefreshToken('');
+      authState.setToken('');
+    }
+    login();
+  }, [authenticated]);
+
+  if (disabled || authenticated) return <>{children}</>;
+  const LoggedOutComponent = loggedOutComponent || (() => null);
+  return <LoggedOutComponent />;
+}
 
 export function withAuthenticated<P extends object>(Component: ComponentType<P>) {
   return (props: P) => (

package/src/authConfig.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 09:21:15
  * Author: Clay Risser
  * -----
- * Last Modified: 17-04-2023 22:55:41
+ * Last Modified: 25-04-2023 23:08:17
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -26,6 +26,7 @@ import { createContext } from 'react';
 
 export const defaultAuthConfig: AuthConfig = {
   ensureFreshness: true,
+  persist: true,
   ssr: true,
 };
 
@@ -36,5 +37,6 @@ export interface AuthConfig {
   ensureFreshness?: boolean;
   loginRoute?: string;
   messageHandlerKeys?: string[];
+  persist?: boolean;
   ssr?: boolean;
 }

package/src/hooks/useKeycloak/index.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 14:10:44
  * Author: Clay Risser
  * -----
- * Last Modified: 18-04-2023 00:28:11
+ * Last Modified: 24-04-2023 17:50:36
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import type { KeycloakResourceAccess, KeycloakRoles, KeycloakTokenParsed } from 'keycloak-js';
+import type { KeycloakResourceAccess, KeycloakRoles, KeycloakTokenParsed } from '@bitspur/keycloak-js';
 export * from './useKeycloak';
 
 export interface IKeycloak {

package/src/hooks/useKeycloak/useKeycloak.native.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 14:10:25
  * Author: Clay Risser
  * -----
- * Last Modified: 24-02-2023 06:29:25
+ * Last Modified: 24-04-2023 17:50:55
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -26,7 +26,7 @@ import atob from 'core-js-pure/stable/atob';
 import escape from 'core-js-pure/stable/escape';
 import type { AuthRequestPromptOptions, AuthSessionResult } from 'expo-auth-session';
 import type { IKeycloak } from './index';
-import type { KeycloakResourceAccess, KeycloakRoles, KeycloakTokenParsed } from 'keycloak-js';
+import type { KeycloakResourceAccess, KeycloakRoles, KeycloakTokenParsed } from '@bitspur/keycloak-js';
 import { MultiPlatform } from 'multiplatform.one';
 import { useKeycloak as useExpoKeycloak } from 'expo-keycloak-auth';
 

package/src/hooks/useKeycloak/useKeycloak.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 06:04:59
  * Author: Clay Risser
  * -----
- * Last Modified: 18-04-2023 04:08:56
+ * Last Modified: 25-04-2023 23:18:16
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -22,24 +22,23 @@
  * limitations under the License.
  */
 
-import type Keycloak from 'keycloak-js';
+import type Keycloak from '@bitspur/keycloak-js';
 import type { IKeycloak } from './index';
 import { MultiPlatform } from 'multiplatform.one';
 import { useAuthConfig } from '../useAuthConfig';
-import { useKeycloak as useReactKeycloak } from '@react-keycloak/web';
-import { useKeycloak as useSsrKeycloak } from '@react-keycloak/ssr';
+import { useKeycloak as useReactKeycloak } from '@bitspur/react-keycloak-web';
+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.isNext && authConfig.ssr) {
     const { keycloak: ssrKeycloak, initialized } = useSsrKeycloak();
-    const keycloak = { ...ssrKeycloak } as Keycloak;
+    const keycloak = (ssrKeycloak || {}) as Keycloak;
     if (!initialized) keycloak.authenticated = undefined;
     return keycloak as IKeycloak;
   }
-  const { keycloak: reactKeycloak, initialized } = useReactKeycloak();
-  const keycloak = { ...reactKeycloak } as Keycloak;
+  const { keycloak, initialized } = useReactKeycloak();
   if (!initialized) keycloak.authenticated = undefined;
   return keycloak as IKeycloak;
 }

package/src/hooks/useLogin.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 08:49:14
  * Author: Clay Risser
  * -----
- * Last Modified: 24-02-2023 06:22:27
+ * Last Modified: 25-04-2023 23:09:10
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022

package/src/provider/afterAuth.tsx

@@ -41,7 +41,7 @@ export const AfterAuth: FC<AfterAuthProps> = ({ children }: AfterAuthProps) => {
 
   useEffect(() => {
     if (!authenticated) return;
-    if (token) {
+    if (authConfig.persist && token) {
       authState.setToken(token);
       if (idToken) authState.setIdToken(idToken);
       if (authConfig.ensureFreshness && refreshToken) authState.setRefreshToken(refreshToken);

package/src/provider/keycloakProvider.native.tsx

@@ -24,7 +24,7 @@
 
 import React from 'react';
 import type { FC } from 'react';
-import type { KeycloakConfig } from 'keycloak-js';
+import type { KeycloakConfig } from '@bitspur/keycloak-js';
 import type { KeycloakProviderProps } from './keycloakProvider';
 import { AfterAuth } from './afterAuth';
 import { KeycloakProvider as ExpoKeycloakProvider } from 'expo-keycloak-auth';

package/src/provider/keycloakProvider.tsx

@@ -22,14 +22,14 @@
  * limitations under the License.
  */
 
-import Keycloak from 'keycloak-js';
+import Keycloak from '@bitspur/keycloak-js';
 import React, { useMemo, useEffect, useState } from 'react';
-import type { FC, ReactNode, ComponentType } from 'react';
-import type { KeycloakInitOptions } from 'keycloak-js';
+import type { KeycloakInitOptions } from '@bitspur/keycloak-js';
+import type { ReactNode, ComponentType } from 'react';
 import { AfterAuth } from './afterAuth';
 import { MultiPlatform } from 'multiplatform.one';
-import { ReactKeycloakProvider } from '@react-keycloak/web';
-import { SSRKeycloakProvider, SSRCookies } from '@react-keycloak/ssr';
+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 { useRouter } from 'next/router';
@@ -46,27 +46,28 @@ export interface KeycloakProviderProps {
 
 const logger = console;
 
-export const KeycloakProvider: FC<KeycloakProviderProps> = ({
+export function KeycloakProvider({
   children,
   cookies,
   debug,
   keycloakConfig,
   keycloakInitOptions,
   loadingComponent,
-}: KeycloakProviderProps) => {
+}: KeycloakProviderProps) {
   const authState = useAuthState();
   const LoadingComponent = loadingComponent || (() => <>{debug ? 'authenticating' : null}</>);
   const { query } = MultiPlatform.isNext ? useRouter() : { query: {} };
   const authConfig = useAuthConfig();
   const [idToken, setIdToken] = useState<string | boolean>(
-    ('idToken' in query && (query.idToken?.toString() || true)) || authState.idToken || false,
+    ('idToken' in query && (query.idToken?.toString() || true)) || (authConfig.persist && authState.idToken) || false,
   );
   const [token, setToken] = useState<string | boolean>(
-    ('token' in query && (query.token?.toString() || true)) || authState.token || false,
+    ('token' in query && (query.token?.toString() || true)) || (authConfig.persist && authState.token) || false,
   );
   const [refreshToken, setRefreshToken] = useState<string | boolean>(
     (authConfig.ensureFreshness &&
-      (('refreshToken' in query && (query.refreshToken?.toString() || true)) || authState.refreshToken)) ||
+      (('refreshToken' in query && (query.refreshToken?.toString() || true)) ||
+        (authConfig.persist && authState.refreshToken))) ||
       false,
   );
   const explicitToken = 'idToken' in query || 'token' in query || 'refreshToken' in query;
@@ -184,6 +185,7 @@ export const KeycloakProvider: FC<KeycloakProviderProps> = ({
       ...defaultKeycloakInitOptions,
       ...keycloakInitOptions,
     };
+    if (debug) initOptions.enableLogging = true;
     if (token && typeof token === 'string') {
       initOptions.token = token;
       if (idToken && typeof idToken === 'string') initOptions.idToken = idToken;
@@ -196,7 +198,7 @@ export const KeycloakProvider: FC<KeycloakProviderProps> = ({
     return initOptions;
   }, [keycloakInitOptions, token, refreshToken, idToken]);
 
-  if (token === true || refreshToken === true) return <LoadingComponent />;
+  if (token === true || idToken === true || refreshToken === true) return <LoadingComponent />;
   if (cookies && authConfig.ssr) {
     return (
       // @ts-ignore
@@ -220,7 +222,7 @@ export const KeycloakProvider: FC<KeycloakProviderProps> = ({
       <AfterAuth>{children}</AfterAuth>
     </ReactKeycloakProvider>
   );
-};
+}
 
 export interface KeycloakConfig {
   clientId: string;