@multiplatform.one/keycloak 0.3.8 → 0.3.10

package/dist/lib/util.d.ts

@@ -0,0 +1,25 @@
+/**
+ * File: /src/util.ts
+ * Project: @multiplatform.one/keycloak
+ * File Created: 16-05-2023 06:29:32
+ * Author: Clay Risser
+ * -----
+ * Last Modified: 16-05-2023 06:33:36
+ * 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 declare function validToken(token: string | boolean, refreshToken?: string | boolean): string | boolean;
+export declare function isTokenValid(token: string): boolean;

package/dist/lib/util.js

@@ -0,0 +1,51 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var util_exports = {};
+__export(util_exports, {
+  isTokenValid: () => isTokenValid,
+  validToken: () => validToken
+});
+module.exports = __toCommonJS(util_exports);
+function validToken(token, refreshToken) {
+  if (typeof token !== "string")
+    return token;
+  if (refreshToken) {
+    if (refreshToken === true || isTokenValid(refreshToken))
+      return token;
+    return false;
+  }
+  return isTokenValid(token) ? token : false;
+}
+function isTokenValid(token) {
+  var _a;
+  try {
+    const { exp } = JSON.parse(Buffer.from(((_a = token.split(".")) == null ? void 0 : _a[1]) || "", "base64").toString() || "{}");
+    return Math.floor(Date.now() / 1e3) <= exp;
+  } catch (err) {
+    if (err instanceof SyntaxError)
+      return false;
+    throw err;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isTokenValid,
+  validToken
+});
+//# sourceMappingURL=util.js.map

package/dist/lib/util.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/util.ts"],
+  "sourcesContent": ["/**\n * File: /src/util.ts\n * Project: @multiplatform.one/keycloak\n * File Created: 16-05-2023 06:29:32\n * Author: Clay Risser\n * -----\n * Last Modified: 16-05-2023 06:33:36\n * Modified By: Clay Risser\n * -----\n * Risser Labs LLC (c) Copyright 2022 - 2023\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nexport function validToken(token: string | boolean, refreshToken?: string | boolean) {\n  if (typeof token !== 'string') return token;\n  if (refreshToken) {\n    if (refreshToken === true || isTokenValid(refreshToken)) return token;\n    return false;\n  }\n  return isTokenValid(token) ? token : false;\n}\n\nexport function isTokenValid(token: string) {\n  try {\n    const { exp } = JSON.parse(Buffer.from(token.split('.')?.[1] || '', 'base64').toString() || '{}');\n    return Math.floor(Date.now() / 1000) <= exp;\n  } catch (err) {\n    if (err instanceof SyntaxError) return false;\n    throw err;\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwBO,SAAS,WAAW,OAAyB,cAAiC;AACnF,MAAI,OAAO,UAAU;AAAU,WAAO;AACtC,MAAI,cAAc;AAChB,QAAI,iBAAiB,QAAQ,aAAa,YAAY;AAAG,aAAO;AAChE,WAAO;AAAA,EACT;AACA,SAAO,aAAa,KAAK,IAAI,QAAQ;AACvC;AAEO,SAAS,aAAa,OAAe;AAjC5C;AAkCE,MAAI;AACF,UAAM,EAAE,IAAI,IAAI,KAAK,MAAM,OAAO,OAAK,WAAM,MAAM,GAAG,MAAf,mBAAmB,OAAM,IAAI,QAAQ,EAAE,SAAS,KAAK,IAAI;AAChG,WAAO,KAAK,MAAM,KAAK,IAAI,IAAI,GAAI,KAAK;AAAA,EAC1C,SAAS,KAAP;AACA,QAAI,eAAe;AAAa,aAAO;AACvC,UAAM;AAAA,EACR;AACF;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/keycloak",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "keycloak client for multiplatform.one ecosystem",
   "main": "dist/lib",
   "module": "dist/esm",
@@ -114,9 +114,9 @@
     "indent": 4
   },
   "dependencies": {
-    "@bitspur/keycloak-js": "^21.1.1",
-    "@bitspur/react-keycloak-ssr": "^4.0.5",
-    "@bitspur/react-keycloak-web": "^4.0.5",
+    "@bitspur/keycloak-js": "^21.1.1-9",
+    "@bitspur/react-keycloak-ssr": "^4.0.8",
+    "@bitspur/react-keycloak-web": "^4.0.8",
     "core-js-pure": "^3.30.2",
     "expo-auth-session": "^4.0.3",
     "solito": "^3.2.6"

package/src/hooks/index.ts

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

package/src/hooks/useKeycloak/useKeycloak.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 06:04:59
  * Author: Clay Risser
  * -----
- * Last Modified: 15-05-2023 16:25:48
+ * Last Modified: 15-05-2023 18:10:07
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -31,7 +31,6 @@ import { useKeycloak as useSsrKeycloak } from '@bitspur/react-keycloak-ssr';
 export function useKeycloak() {
   const authConfig = useAuthConfig();
   if (MultiPlatform.isStorybook) return { authenticated: true } as IKeycloak;
-  console.log('SSR', authConfig.ssr);
   if (MultiPlatform.isNext && authConfig.ssr) {
     const { keycloak, initialized } = useSsrKeycloak();
     return {
@@ -40,8 +39,6 @@ export function useKeycloak() {
     } as IKeycloak;
   }
   const { keycloak, initialized } = useReactKeycloak();
-  console.log('a1', keycloak.authenticated);
-  console.log('a2', initialized ? keycloak.authenticated : undefined);
   return {
     ...keycloak,
     authenticated: initialized ? keycloak.authenticated : undefined,

package/src/hooks/{useIsPassedInToken → useTokensFromQuery}/index.native.ts

@@ -1,10 +1,10 @@
 /**
- * File: /src/hooks/useIsPassedInToken/index.native.ts
+ * File: /src/hooks/useTokensFromQuery/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
+ * Last Modified: 16-05-2023 07:40:46
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2022 - 2023
@@ -22,4 +22,4 @@
  * limitations under the License.
  */
 
-export const useIsPassedInToken = () => false;
+export const useTokensFromQuery = () => false;

package/src/hooks/{useIsPassedInToken → useTokensFromQuery}/index.ts

@@ -1,10 +1,10 @@
 /**
- * File: /src/hooks/useIsPassedInToken/index.ts
+ * File: /src/hooks/useTokensFromQuery/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
+ * Last Modified: 16-05-2023 07:40:41
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2022 - 2023
@@ -25,7 +25,7 @@
 import { MultiPlatform } from 'multiplatform.one';
 import { useRouter } from 'next/router';
 
-export function useIsPassedInToken() {
+export function useTokensFromQuery() {
   const { query } = MultiPlatform.isNext ? useRouter() : { query: {} };
   return 'idToken' in query || 'token' in query || 'refreshToken' in query;
 }

package/src/hooks/useTokensFromState.ts

@@ -0,0 +1,31 @@
+/**
+ * File: /src/hooks/useTokensFromState.ts
+ * Project: @multiplatform.one/keycloak
+ * File Created: 16-05-2023 06:29:02
+ * Author: Clay Risser
+ * -----
+ * Last Modified: 16-05-2023 07:40:36
+ * 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 { useAuthState } from '../state';
+import { validToken } from '../util';
+
+export function useTokensFromState() {
+  const authState = useAuthState();
+  return !!validToken(authState.token, authState.refreshToken);
+}

package/src/provider/afterAuth.tsx

@@ -36,8 +36,8 @@ const logger = console;
 
 export const AfterAuth: FC<AfterAuthProps> = ({ children }: AfterAuthProps) => {
   const authConfig = useAuthConfig();
-  const { token, refreshToken, authenticated, idToken } = useKeycloak();
   const authState = useAuthState();
+  const { token, refreshToken, authenticated, idToken } = useKeycloak();
 
   useEffect(() => {
     if (!authenticated) return;

package/src/provider/index.tsx

@@ -29,7 +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';
+import { useTokensFromState, useTokensFromQuery } from '../hooks';
 // @ts-ignore
 import { config } from 'app/config';
 
@@ -68,7 +68,8 @@ export const AuthProvider: FC<AuthProviderProps> = ({
   onTokens,
   ...keycloakInitOptions
 }: AuthProviderProps) => {
-  const isPassedInToken = useIsPassedInToken();
+  const tokensFromQuery = useTokensFromQuery();
+  const tokensFromState = useTokensFromState();
   const authConfig = useMemo(
     () => ({
       ...defaultAuthConfig,
@@ -76,8 +77,8 @@ export const AuthProvider: FC<AuthProviderProps> = ({
       ensureFreshness,
       loginRoute,
       messageHandlerKeys,
-      persist: ssr || isPassedInToken ? false : persist,
-      ssr,
+      persist: !tokensFromState && !tokensFromQuery && cookies && ssr ? false : persist,
+      ssr: !tokensFromState && !tokensFromQuery && cookies ? ssr : false,
     }),
     [debug, ensureFreshness, loginRoute, messageHandlerKeys, persist, ssr],
   );

package/src/provider/keycloakProvider.tsx

@@ -33,8 +33,9 @@ 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 { useTokensFromQuery } from '../hooks';
 import { useRouter } from 'next/router';
+import { validToken } from '../util';
 
 export interface KeycloakProviderProps {
   children: ReactNode;
@@ -81,7 +82,7 @@ export function KeycloakProvider({
       refreshToken,
     ),
   );
-  const isPassedInToken = useIsPassedInToken();
+  const tokensFromQuery = useTokensFromQuery();
 
   useEffect(() => {
     if (token !== true && refreshToken !== true && idToken !== true) return;
@@ -223,7 +224,7 @@ export function KeycloakProvider({
       initOptions.token = token;
       if (idToken && typeof idToken === 'string') initOptions.idToken = idToken;
       if (refreshToken && typeof refreshToken === 'string') initOptions.refreshToken = refreshToken;
-      if (isPassedInToken) {
+      if (tokensFromQuery) {
         initOptions.checkLoginIframe = false;
         initOptions.flow = 'implicit';
         initOptions.onLoad = undefined;
@@ -233,7 +234,7 @@ export function KeycloakProvider({
   }, [keycloakInitOptions, token, refreshToken, idToken]);
 
   if (token === true || idToken === true || refreshToken === true) return <LoadingComponent />;
-  if (!isPassedInToken && cookies && ssr) {
+  if (cookies && ssr) {
     return (
       // @ts-ignore
       <SSRKeycloakProvider
@@ -270,25 +271,6 @@ export function KeycloakProvider({
   );
 }
 
-function validToken(token: string | boolean, refreshToken?: string | boolean) {
-  if (typeof token !== 'string') return token;
-  if (refreshToken) {
-    if (refreshToken === true || isTokenValid(refreshToken)) return token;
-    return false;
-  }
-  return isTokenValid(token) ? token : false;
-}
-
-function isTokenValid(token: string) {
-  try {
-    const { exp } = JSON.parse(Buffer.from(token.split('.')?.[1] || '', 'base64').toString() || '{}');
-    return Math.floor(Date.now() / 1000) <= exp;
-  } catch (err) {
-    if (err instanceof SyntaxError) return false;
-    throw err;
-  }
-}
-
 export const defaultKeycloakInitOptions: KeycloakInitOptions = {
   checkLoginIframe: true,
   checkLoginIframeInterval: 5,

package/src/util.ts

@@ -0,0 +1,42 @@
+/**
+ * File: /src/util.ts
+ * Project: @multiplatform.one/keycloak
+ * File Created: 16-05-2023 06:29:32
+ * Author: Clay Risser
+ * -----
+ * Last Modified: 16-05-2023 06:33:36
+ * 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 function validToken(token: string | boolean, refreshToken?: string | boolean) {
+  if (typeof token !== 'string') return token;
+  if (refreshToken) {
+    if (refreshToken === true || isTokenValid(refreshToken)) return token;
+    return false;
+  }
+  return isTokenValid(token) ? token : false;
+}
+
+export function isTokenValid(token: string) {
+  try {
+    const { exp } = JSON.parse(Buffer.from(token.split('.')?.[1] || '', 'base64').toString() || '{}');
+    return Math.floor(Date.now() / 1000) <= exp;
+  } catch (err) {
+    if (err instanceof SyntaxError) return false;
+    throw err;
+  }
+}