@multiplatform.one/keycloak 5.0.26 → 6.0.0

package/package.json

@@ -1,32 +1,7 @@
 {
   "name": "@multiplatform.one/keycloak",
-  "version": "5.0.26",
+  "version": "6.0.0",
   "description": "keycloak client for multiplatform.one ecosystem",
-  "main": "dist/cjs",
-  "module": "dist/esm",
-  "module:jsx": "dist/jsx",
-  "source": "src/index.ts",
-  "types": "types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./types/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
-    },
-    "./one": {
-      "types": "./types/one.d.ts",
-      "import": "./dist/esm/one.js",
-      "require": "./dist/cjs/one.js"
-    },
-    "./emptyNextAuthReact": {
-      "types": "./types/emptyNextAuthReact.d.ts",
-      "import": "./dist/esm/emptyNextAuthReact.js",
-      "require": "./dist/cjs/emptyNextAuthReact.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "author": "BitSpur",
-  "sideEffects": false,
   "keywords": [
     "auth",
     "keycloak",
@@ -36,52 +11,81 @@
   ],
   "homepage": "https://multiplatform.one",
   "license": "Apache-2.0",
+  "author": "BitSpur",
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/risserlabs/multiplatform.one/keycloak"
+  },
+  "source": "src/index.ts",
   "files": [
     "dist",
     "routes",
     "src",
     "types"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitlab.com/risserlabs/multiplatform.one/keycloak"
+  "sideEffects": false,
+  "main": "src/index.ts",
+  "module": "src/index.ts",
+  "types": "src/index.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "react-native": "./src/index.native.ts",
+      "types": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.ts",
+      "default": "./src/index.ts"
+    },
+    "./one": {
+      "types": "./src/one.ts",
+      "import": "./src/one.ts",
+      "require": "./src/one.ts"
+    }
   },
-  "peerDependencies": {
-    "@react-native-async-storage/async-storage": "1.21.0",
-    "multiplatform.one": "5.0.26",
-    "react": "~18.2.0"
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@better-auth/expo": "^1.6.9",
+    "better-auth": "^1.6.9",
+    "jwt-decode": "^4.0.0",
+    "@multiplatform.one/keycloak-js": "6.0.0",
+    "@multiplatform.one/store": "6.0.0"
   },
   "devDependencies": {
-    "@react-native-async-storage/async-storage": "1.23.1",
-    "@tamagui/build": "^1.122.6",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^15.0.7",
+    "@tamagui/build": "2.0.0-rc.41",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
     "@types/lodash.camelcase": "^4.3.9",
     "@types/lodash.startcase": "^4.4.9",
-    "@types/react": "^18.3.1",
-    "@types/react-native": "^0.73.0",
-    "@vitejs/plugin-react": "^4.3.4",
-    "multiplatform.one": "5.0.26",
-    "react": "~18.2.0",
-    "typescript": "~5.3.3",
-    "vitest": "^1.6.0"
+    "@types/react": "~19.2.14",
+    "@vitejs/plugin-react": "^6.0.1",
+    "esbuild": "^0.28.0",
+    "one": "^1.16.5",
+    "react": "19.2.5",
+    "typescript": "~5.9.3",
+    "vitest": "^4.1.5",
+    "@multiplatform.one/config": "6.0.0",
+    "@multiplatform.one/logger": "6.0.0",
+    "@multiplatform.one/platform": "6.0.0",
+    "@multiplatform.one/test-utils": "6.0.0"
+  },
+  "peerDependencies": {
+    "react": "^19.1.0",
+    "@multiplatform.one/logger": "6.0.0",
+    "@multiplatform.one/platform": "6.0.0"
+  },
+  "optionalDependencies": {
+    "expo-secure-store": "^55.0.13",
+    "expo-web-browser": "^55.0.14"
   },
   "engines": {
     "node": ">=6.0.0"
   },
-  "dependencies": {
-    "@auth/core": "^0.36.0",
-    "@multiplatform.one/authjs": "5.0.26",
-    "@multiplatform.one/use-store": "5.0.26",
-    "expo-auth-session": "^5.5.2",
-    "expo-crypto": "^13.0.2",
-    "jwt-decode": "^4.0.0",
-    "keycloak-js": "^24.0.5",
-    "next-auth": "^4.24.11"
-  },
+  "module:jsx": "dist/jsx",
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "build": "rm -rf dist types 2>/dev/null && tamagui-build --ts-project ./tsconfig.build.json",
+    "build": "rm -rf dist types 2>/dev/null && node scripts/build.mjs",
     "test": "vitest run --coverage --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=lcov --coverage.reporter=html"
   }
 }

package/src/@types/expo_keycloak_auth.d.ts

@@ -0,0 +1,4 @@
+declare module "expo-keycloak-auth" {
+  export const KeycloakProvider: any;
+  export function useKeycloak(): any;
+}

package/src/Authenticated.tsx

@@ -1,33 +1,9 @@
-/**
- * File: /src/Authenticated.tsx
- * Project: @multiplatform.one/keycloak
- * File Created: 19-11-2024 20:26:31
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 AsyncStorage from "@react-native-async-storage/async-storage";
-import { isIframe, isServer } from "multiplatform.one";
+import { isIframe, isServer } from "@multiplatform.one/platform";
 import { type ComponentType, type PropsWithChildren, useEffect } from "react";
 import { Text } from "tamagui";
 import { useAuthConfig, useTokensFromQuery } from "./hooks";
 import { useKeycloak } from "./keycloak/index";
 
-global.AsyncStorage = AsyncStorage;
-
 export interface AuthenticatedProps extends PropsWithChildren {
   disabled?: boolean;
   loadingComponent?: ComponentType;

package/src/Loading.tsx

@@ -1,24 +1,3 @@
-/**
- * File: /src/Loading.tsx
- * Project: @multiplatform.one/keycloak
- * File Created: 01-01-1970 00:00:00
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 type { ComponentType } from "react";
 import { Text } from "tamagui";
 import { useAuthConfig } from "./hooks";

package/src/authConfig.ts

@@ -1,24 +1,3 @@
-/*
- * File: /src/authConfig.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 04-04-2024 15:50:39
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 { createContext } from "react";
 
 export const defaultAuthConfig: AuthConfig = {};

package/src/betterAuth/client.ts

@@ -0,0 +1,22 @@
+/**
+ * Better Auth React client instance for web.
+ * Used by AuthProvider and useKeycloak on web platform.
+ * Base URL is set at runtime via KeycloakProvider props (or defaults to same origin).
+ */
+
+import { createAuthClient } from "better-auth/react";
+import { genericOAuthClient } from "better-auth/client/plugins";
+import { isWeb } from "@multiplatform.one/platform";
+
+let _client: ReturnType<typeof createAuthClient> | undefined;
+
+export function getAuthClient(baseURL?: string) {
+  if (_client) return _client;
+  _client = createAuthClient({
+    baseURL: baseURL || (isWeb && typeof window !== "undefined" ? window.location.origin : ""),
+    plugins: [genericOAuthClient()],
+  });
+  return _client;
+}
+
+export type AuthClient = ReturnType<typeof getAuthClient>;

package/src/betterAuth/expoClient.ts

@@ -0,0 +1,35 @@
+/**
+ * Better Auth Expo client for native (React Native / Expo).
+ * Uses @better-auth/expo/client (expoClient plugin) and SecureStore.
+ * Wraps signIn.social for Keycloak; same session/useSession API.
+ */
+
+import { createAuthClient } from "better-auth/react";
+import { genericOAuthClient } from "better-auth/client/plugins";
+import { expoClient } from "@better-auth/expo/client";
+import * as SecureStore from "expo-secure-store";
+
+let _client: ReturnType<typeof createAuthClient> | undefined;
+
+/**
+ * Create or return the singleton Better Auth Expo client.
+ * @param baseURL — Better Auth server base URL (e.g. https://app.example.com)
+ * @param scheme — Expo deep link scheme (from app.json, e.g. "one" or "myapp")
+ */
+export function getExpoAuthClient(baseURL: string, scheme = "one") {
+  if (_client) return _client;
+  _client = createAuthClient({
+    baseURL,
+    plugins: [
+      genericOAuthClient(),
+      expoClient({
+        scheme,
+        storagePrefix: "better-auth",
+        storage: SecureStore,
+      }),
+    ],
+  });
+  return _client;
+}
+
+export type ExpoAuthClient = ReturnType<typeof getExpoAuthClient>;

package/src/betterAuth/index.ts

@@ -0,0 +1,2 @@
+export { getAuthClient, type AuthClient } from "./client";
+export { getExpoAuthClient, type ExpoAuthClient } from "./expoClient";

package/src/hooks/index.ts

@@ -1,24 +1,3 @@
-/**
- * File: /src/hooks/index.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 19-11-2024 20:26:31
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 * from "./useAuthConfig";
 export * from "./useTokensFromQuery/index";
 export * from "./useTokensFromState";

package/src/hooks/useAuthConfig.ts

@@ -1,24 +1,3 @@
-/*
- * File: /src/hooks/useAuthConfig.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 04-04-2024 15:50:39
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 { useContext } from "react";
 import { AuthConfigContext } from "../authConfig";
 

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

@@ -1,22 +1 @@
-/*
- * File: /src/hooks/useTokensFromQuery/index.native.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 04-04-2024 15:50:39
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 useTokensFromQuery = () => false;

package/src/hooks/useTokensFromQuery/index.ts

@@ -1,25 +1,4 @@
-/*
- * File: /src/hooks/useTokensFromQuery/index.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 19-11-2024 20:26:31
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 { isIframe } from "multiplatform.one";
+import { isIframe } from "@multiplatform.one/platform";
 import { useAuthConfig } from "../useAuthConfig";
 
 export function useTokensFromQuery() {

package/src/hooks/useTokensFromState.ts

@@ -1,29 +1,7 @@
-/*
- * File: /src/hooks/useTokensFromState.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 04-04-2024 15:50:39
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 { useAuthStore } from "../state";
 import { validOrRefreshableToken } from "../token";
 
 export function useTokensFromStore() {
   const authStore = useAuthStore();
-  if (typeof authStore === "undefined") return undefined;
   return !!validOrRefreshableToken(authStore.token, authStore.refreshToken);
 }

package/src/index.ts

@@ -1,49 +1,8 @@
-/*
- * File: /src/index.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 10-01-2025 21:02:36
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2025
- *
- * 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.
- */
-
-/**
- * File: /src/index.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 19-11-2024 20:26:31
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 * from "./Authenticated";
 export * from "./authConfig";
 export * from "./hooks/index";
 export * from "./keycloak/index";
 export * from "./provider/index";
 export * from "./session/index";
+export * from "./token";
 export * from "./types";

package/src/keycloak/base.ts

@@ -1,31 +1,9 @@
-/*
- * File: /src/keycloak/base.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 25-12-2024 04:55:48
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 type { AuthRequestPromptOptions } from "expo-auth-session";
 import { jwtDecode } from "jwt-decode";
-import type KeycloakClient from "keycloak-js";
+import type KeycloakClient from "@multiplatform.one/keycloak-js";
 import type {
   KeycloakLoginOptions as KeycloakJsLoginOptions,
   KeycloakLogoutOptions as KeycloakJsLogoutOptions,
-} from "keycloak-js";
+} from "@multiplatform.one/keycloak-js";
 import { useContext } from "react";
 import { useAuthConfig } from "../hooks/index";
 import type { Session } from "../session/index";
@@ -199,8 +177,7 @@ export function useKeycloak() {
 }
 
 export type KeycloakLogoutOptions = KeycloakJsLogoutOptions;
-export type KeycloakLoginOptions = KeycloakJsLoginOptions &
-  AuthRequestPromptOptions & { redirect?: boolean };
+export type KeycloakLoginOptions = KeycloakJsLoginOptions & { redirect?: boolean };
 
 export interface ResourceAccess {
   [clientId: string]: {

package/src/keycloak/config.ts

@@ -1,30 +1,14 @@
-/*
- * File: /src/keycloak/config.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 27-04-2024 10:53:19
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 type { KeycloakConfig as KeycloakJsConfig } from "keycloak-js";
+import type { KeycloakServerConfig } from "@multiplatform.one/keycloak-js";
 import { createContext } from "react";
 
-export interface KeycloakConfig extends KeycloakJsConfig {
+/** App config uses the Keycloak-server shape ({ url, realm, clientId }), not generic OIDC. */
+export interface KeycloakConfig extends KeycloakServerConfig {
   publicClientId?: string;
   scopes?: string[];
+  /** Better Auth server base URL (for native/Expo). Defaults to same origin on web. */
+  betterAuthBaseUrl?: string;
+  /** Expo deep-link scheme (e.g. "multiplatform-one"). Used by @better-auth/expo client. */
+  expoScheme?: string;
 }
 
 export const KeycloakConfigContext = createContext<KeycloakConfig>({

package/src/keycloak/context.ts

@@ -1,24 +1,3 @@
-/*
- * File: /src/keycloak/context.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 04-04-2024 15:50:39
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 { createContext } from "react";
 import type { Keycloak } from ".";
 

package/src/keycloak/index.native.ts

@@ -1,25 +1,4 @@
-/**
- * File: /src/keycloak/index.native.ts
- * Project: @multiplatform.one/keycloak
- * File Created: 19-11-2024 20:26:31
- * Author: Clay Risser
- * -----
- * BitSpur (c) Copyright 2021 - 2024
- *
- * 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 { isStorybook } from "multiplatform.one";
+import { isStorybook } from "@multiplatform.one/platform";
 import { useContext } from "react";
 import { useAuthConfig } from "../hooks";
 import { BaseKeycloak } from "./base";