@multiplatform.one/keycloak 0.7.17 → 1.0.1

package/lib/routes.js

@@ -6,21 +6,17 @@ var _chunkP57PW2IIjs = require('./chunk-P57PW2II.js');
 var _nextauth = require('next-auth');
 var _jwtdecode = require('jwt-decode');
 var KeycloakProvider = _chunkP57PW2IIjs.__require.call(void 0, "next-auth/providers/keycloak").default;
+var _nextAuth;
 var NextAuth = _chunkP57PW2IIjs.__require.call(void 0, "next-auth").default;
 var NextResponse = _chunkP57PW2IIjs.__require.call(void 0, "next/server").NextResponse;
 var logger = console;
-var _nextAuth;
-function createAuthHandler(options = {}) {
-  const handler = NextAuth(createAuthOptions(options));
-  return {
-    GET: handler,
-    POST: handler
-  };
+function createAuthHandler(options = createNextAuthOptions()) {
+  return NextAuth(options);
 }
-function createLogoutHandler(options = {}) {
+function createLogoutHandler(options = createNextAuthOptions()) {
   return {
     async GET() {
-      const idToken = await _asyncOptionalChain([(await _nextauth.getServerSession.call(void 0, createAuthOptions(options))), 'optionalAccess', async _ => _.idToken]);
+      const idToken = await _asyncOptionalChain([(await _nextauth.getServerSession.call(void 0, options)), 'optionalAccess', async _ => _.idToken]);
       if (idToken) {
         try {
           await fetch(
@@ -38,7 +34,7 @@ function createLogoutHandler(options = {}) {
     }
   };
 }
-function createAuthOptions(options = {}) {
+function createNextAuthOptions(options = {}) {
   if (_nextAuth)
     return _nextAuth;
   _nextAuth = {
@@ -97,18 +93,21 @@ function createAuthOptions(options = {}) {
   return _nextAuth;
 }
 async function refreshAccessToken(nextToken) {
-  const res = await fetch(process.env.REFRESH_TOKEN_URL || "", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    },
-    body: new URLSearchParams({
-      client_id: process.env.KEYCLOAK_CLIENT_ID || "",
-      client_secret: process.env.KEYCLOAK_CLIENT_SECRET || "",
-      grant_type: "refresh_token",
-      refresh_token: nextToken.refreshToken
-    })
-  });
+  const res = await fetch(
+    `${process.env.KEYCLOAK_BASE_URL}/realms/${process.env.KEYCLOAK_REALM || "master"}/protocol/openid-connect/token`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: new URLSearchParams({
+        client_id: process.env.KEYCLOAK_CLIENT_ID || "",
+        client_secret: process.env.KEYCLOAK_CLIENT_SECRET || "",
+        grant_type: "refresh_token",
+        refresh_token: nextToken.refreshToken
+      })
+    }
+  );
   const refreshToken = await res.json();
   if (!res.ok)
     throw refreshToken;
@@ -124,4 +123,5 @@ async function refreshAccessToken(nextToken) {
 
 
 
-exports.createAuthHandler = createAuthHandler; exports.createLogoutHandler = createLogoutHandler;
+
+exports.createAuthHandler = createAuthHandler; exports.createLogoutHandler = createLogoutHandler; exports.createNextAuthOptions = createNextAuthOptions;

package/lib/routes.mjs

@@ -6,21 +6,17 @@ import {
 import { getServerSession } from "next-auth";
 import { jwtDecode } from "jwt-decode";
 var KeycloakProvider = __require("next-auth/providers/keycloak").default;
+var _nextAuth;
 var NextAuth = __require("next-auth").default;
 var NextResponse = __require("next/server").NextResponse;
 var logger = console;
-var _nextAuth;
-function createAuthHandler(options = {}) {
-  const handler = NextAuth(createAuthOptions(options));
-  return {
-    GET: handler,
-    POST: handler
-  };
+function createAuthHandler(options = createNextAuthOptions()) {
+  return NextAuth(options);
 }
-function createLogoutHandler(options = {}) {
+function createLogoutHandler(options = createNextAuthOptions()) {
   return {
     async GET() {
-      const idToken = (await getServerSession(createAuthOptions(options)))?.idToken;
+      const idToken = (await getServerSession(options))?.idToken;
       if (idToken) {
         try {
           await fetch(
@@ -38,7 +34,7 @@ function createLogoutHandler(options = {}) {
     }
   };
 }
-function createAuthOptions(options = {}) {
+function createNextAuthOptions(options = {}) {
   if (_nextAuth)
     return _nextAuth;
   _nextAuth = {
@@ -97,18 +93,21 @@ function createAuthOptions(options = {}) {
   return _nextAuth;
 }
 async function refreshAccessToken(nextToken) {
-  const res = await fetch(process.env.REFRESH_TOKEN_URL || "", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    },
-    body: new URLSearchParams({
-      client_id: process.env.KEYCLOAK_CLIENT_ID || "",
-      client_secret: process.env.KEYCLOAK_CLIENT_SECRET || "",
-      grant_type: "refresh_token",
-      refresh_token: nextToken.refreshToken
-    })
-  });
+  const res = await fetch(
+    `${process.env.KEYCLOAK_BASE_URL}/realms/${process.env.KEYCLOAK_REALM || "master"}/protocol/openid-connect/token`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: new URLSearchParams({
+        client_id: process.env.KEYCLOAK_CLIENT_ID || "",
+        client_secret: process.env.KEYCLOAK_CLIENT_SECRET || "",
+        grant_type: "refresh_token",
+        refresh_token: nextToken.refreshToken
+      })
+    }
+  );
   const refreshToken = await res.json();
   if (!res.ok)
     throw refreshToken;
@@ -123,5 +122,6 @@ async function refreshAccessToken(nextToken) {
 }
 export {
   createAuthHandler,
-  createLogoutHandler
+  createLogoutHandler,
+  createNextAuthOptions
 };

package/lib/session/index.js

@@ -2,9 +2,9 @@
 
 
 
-var _chunkNH335CDKjs = require('../chunk-NH335CDK.js');
+var _chunk2VGMJ7WPjs = require('../chunk-2VGMJ7WP.js');
 require('../chunk-P57PW2II.js');
 
 
 
-exports.getSession = _chunkNH335CDKjs.getSession; exports.useSession = _chunkNH335CDKjs.useSession;
+exports.getSession = _chunk2VGMJ7WPjs.getSession; exports.useSession = _chunk2VGMJ7WPjs.useSession;

package/lib/session/index.mjs

@@ -2,7 +2,7 @@ import "../chunk-OAUYHIWG.mjs";
 import {
   getSession,
   useSession
-} from "../chunk-FU4CT24B.mjs";
+} from "../chunk-KWNIT4G4.mjs";
 import "../chunk-ZFXKCRJC.mjs";
 export {
   getSession,

package/lib/session/session.d.mts

@@ -1,7 +1,7 @@
-import { Session as Session$1 } from 'next-auth';
-import { SessionContextValue as SessionContextValue$1, UseSessionOptions } from 'next-auth/react';
+import { AuthOptions, Session as Session$1 } from 'next-auth';
+import { GetSessionParams, SessionContextValue as SessionContextValue$1, UseSessionOptions } from 'next-auth/react';
 
-declare function getSession(): Promise<Session | null>;
+declare function getSession(options?: AuthOptions | GetSessionParams, req?: any, res?: any): Promise<Session | null>;
 type SessionContextValue<R extends boolean> = Partial<Omit<SessionContextValue$1<R> & {
     session: Session;
 }, 'data'>>;

package/lib/session/session.d.ts

@@ -1,7 +1,7 @@
-import { Session as Session$1 } from 'next-auth';
-import { SessionContextValue as SessionContextValue$1, UseSessionOptions } from 'next-auth/react';
+import { AuthOptions, Session as Session$1 } from 'next-auth';
+import { GetSessionParams, SessionContextValue as SessionContextValue$1, UseSessionOptions } from 'next-auth/react';
 
-declare function getSession(): Promise<Session | null>;
+declare function getSession(options?: AuthOptions | GetSessionParams, req?: any, res?: any): Promise<Session | null>;
 type SessionContextValue<R extends boolean> = Partial<Omit<SessionContextValue$1<R> & {
     session: Session;
 }, 'data'>>;

package/lib/session/session.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkNH335CDKjs = require('../chunk-NH335CDK.js');
+var _chunk2VGMJ7WPjs = require('../chunk-2VGMJ7WP.js');
 require('../chunk-P57PW2II.js');
 
 
 
-exports.getSession = _chunkNH335CDKjs.getSession; exports.useSession = _chunkNH335CDKjs.useSession;
+exports.getSession = _chunk2VGMJ7WPjs.getSession; exports.useSession = _chunk2VGMJ7WPjs.useSession;

package/lib/session/session.mjs

@@ -1,7 +1,7 @@
 import {
   getSession,
   useSession
-} from "../chunk-FU4CT24B.mjs";
+} from "../chunk-KWNIT4G4.mjs";
 import "../chunk-ZFXKCRJC.mjs";
 export {
   getSession,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/keycloak",
-  "version": "0.7.17",
+  "version": "1.0.1",
   "description": "keycloak client for multiplatform.one ecosystem",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -42,7 +42,7 @@
   "peerDependencies": {
     "@react-native-async-storage/async-storage": "1.19.3",
     "expo-keycloak-auth": "1.0.14",
-    "multiplatform.one": "^1.0.0",
+    "multiplatform.one": "^1.0.2",
     "next": "^13.0.5",
     "react": "^18.2.0",
     "react-native": "~0.73.1"
@@ -54,16 +54,16 @@
     "@types/jest": "^29.5.11",
     "@types/lodash.camelcase": "^4.3.9",
     "@types/lodash.startcase": "^4.4.9",
-    "@types/react": "^18.2.47",
+    "@types/react": "^18.2.48",
     "@types/react-native": "^0.73.0",
     "cspell": "^8.3.2",
     "eslint": "^8.56.0",
     "expo-keycloak-auth": "1.0.14",
     "jest": "^29.7.0",
     "jest-sonar-reporter": "^2.0.0",
-    "multiplatform.one": "^1.0.0",
-    "next": "^13.5.6",
-    "prettier": "^3.1.1",
+    "multiplatform.one": "^1.0.2",
+    "next": "^14.0.4",
+    "prettier": "^3.2.4",
     "react": "^18.2.0",
     "react-native": "~0.73.2",
     "ts-node": "^10.9.2",
@@ -95,6 +95,7 @@
     "indent": 4
   },
   "dependencies": {
+    "@apollo/client": "^3.8.9",
     "expo-auth-session": "^5.4.0",
     "keycloak-js": "^23.0.4",
     "next-auth": "^4.24.5"

package/src/Authenticated.tsx

@@ -19,14 +19,12 @@
  * limitations under the License.
  */
 
-import React, { useEffect } from 'react';
-import type { ComponentType, ReactNode } from 'react';
+import React, { ComponentType, PropsWithChildren, useEffect } from 'react';
 import { MultiPlatform } from 'multiplatform.one';
 import { useAuthConfig, useTokensFromQuery, useTokensFromState } from './hooks';
 import { useKeycloak } from './keycloak';
 
-export interface AuthenticatedProps {
-  children: ReactNode;
+export interface AuthenticatedProps extends PropsWithChildren {
   disabled?: boolean;
   loadingComponent?: ComponentType;
   loggedOutComponent?: ComponentType;

package/src/apollo.ts

@@ -0,0 +1,95 @@
+/*
+ *  File: /src/apollo.ts
+ *  Project: @multiplatform.one/keycloak
+ *  File Created: 13-01-2024 13:37:13
+ *  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 { useKeycloak } from './keycloak';
+import { useQuery, useMutation, useSubscription } from '@apollo/client';
+import type {
+  ApolloCache,
+  DefaultContext,
+  DocumentNode,
+  MutationHookOptions,
+  MutationTuple,
+  NoInfer,
+  OperationVariables,
+  QueryHookOptions,
+  QueryResult,
+  SubscriptionHookOptions,
+  SubscriptionResult,
+  TypedDocumentNode,
+} from '@apollo/client';
+
+export function useAuthQuery<TData = any, TVariables extends OperationVariables = OperationVariables>(
+  query: DocumentNode | TypedDocumentNode<TData, TVariables>,
+  options?: QueryHookOptions<NoInfer<TData>, NoInfer<TVariables>>,
+): QueryResult<TData, TVariables> {
+  const keycloak = useKeycloak();
+  return useQuery(query, {
+    ...options,
+    skip: options?.skip || !keycloak?.authenticated || !keycloak.token,
+    context: {
+      ...options?.context,
+      headers: {
+        ...(options?.context?.headers || {}),
+        authorization: `Bearer ${keycloak?.token}`,
+      },
+    },
+  });
+}
+
+export function useAuthMutation<
+  TData = any,
+  TVariables = OperationVariables,
+  TContext = DefaultContext,
+  TCache extends ApolloCache<any> = ApolloCache<any>,
+>(
+  mutation: DocumentNode | TypedDocumentNode<TData, TVariables>,
+  options?: MutationHookOptions<NoInfer<TData>, NoInfer<TVariables>, TContext, TCache>,
+): MutationTuple<TData, TVariables, TContext, TCache> {
+  const keycloak = useKeycloak();
+  return useMutation(mutation, {
+    ...options,
+    context: {
+      ...options?.context,
+      headers: {
+        ...((options?.context as DefaultContext)?.headers || {}),
+        authorization: `Bearer ${keycloak?.token}`,
+      },
+    } as TContext,
+  });
+}
+
+export function useAuthSubscription<TData = any, TVariables extends OperationVariables = OperationVariables>(
+  subscription: DocumentNode | TypedDocumentNode<TData, TVariables>,
+  options?: SubscriptionHookOptions<NoInfer<TData>, NoInfer<TVariables>>,
+): SubscriptionResult<TData, TVariables> {
+  const keycloak = useKeycloak();
+  return useSubscription(subscription, {
+    ...options,
+    skip: options?.skip || !keycloak?.authenticated || !keycloak.token,
+    context: {
+      ...options?.context,
+      headers: {
+        ...((options?.context as DefaultContext)?.headers || {}),
+        authorization: `Bearer ${keycloak?.token}`,
+      },
+    },
+  });
+}

package/src/index.ts

@@ -20,6 +20,7 @@
  */
 
 export * from './Authenticated';
+export * from './apollo';
 export * from './authConfig';
 export * from './hooks';
 export * from './keycloak';

package/src/keycloak/keycloak.ts

@@ -21,6 +21,8 @@
 
 import type KeycloakClient from 'keycloak-js';
 import type { AccessTokenParsed, TokenParsed } from '../token';
+import type { AuthOptions } from 'next-auth';
+import type { GetSessionParams } from 'next-auth/react';
 import type { KeycloakLoginOptions, KeycloakLogoutOptions } from 'keycloak-js';
 import type { KeycloakMock } from '../types';
 import type { Session } from '../session/session';
@@ -155,7 +157,6 @@ export function useKeycloak() {
   const keycloak = useContext(KeycloakContext);
   if (keycloak) return keycloak;
   const { session, status } = useSession();
-  if (MultiPlatform.isServer) return;
   if (MultiPlatform.isStorybook) {
     return new Keycloak({
       email: 'storybook@example.com',
@@ -168,8 +169,8 @@ export function useKeycloak() {
   }
 }
 
-export async function getKeycloak() {
-  const session = await getSession();
+export async function getKeycloak(options?: AuthOptions | GetSessionParams, req?: any, res?: any) {
+  const session = await getSession(options, req, res);
   if (session?.accessToken) return new Keycloak(session as Session);
   return new Keycloak();
 }

package/src/provider/AfterAuth.tsx

@@ -56,7 +56,7 @@ export function AfterAuth({ children }: AfterAuthProps) {
   }, [keycloak?.refreshToken]);
 
   useEffect(() => {
-    if (keycloak?.authenticated) logger.debug('authenticated', keycloak.authenticated);
+    if (authConfig.debug && keycloak?.authenticated) logger.debug('authenticated', keycloak.authenticated);
   }, [keycloak?.authenticated]);
 
   return <>{children}</>;

package/src/routes.ts

@@ -27,25 +27,24 @@ import type { Session } from './session';
 import { getServerSession } from 'next-auth';
 import { jwtDecode } from 'jwt-decode';
 
-const KeycloakProvider = require('next-auth/providers/keycloak').default;
-const NextAuth = require('next-auth').default;
-const NextResponse = require('next/server').NextResponse;
+const KeycloakProvider = require('next-auth/providers/keycloak')
+  .default as typeof import('next-auth/providers/keycloak').default;
 
-const logger = console;
 let _nextAuth: AuthOptions | undefined;
 
-export function createAuthHandler(options: CreateAuthHandlerOptions = {}) {
-  const handler = NextAuth(createAuthOptions(options));
-  return {
-    GET: handler,
-    POST: handler,
-  };
+const NextAuth = require('next-auth').default as typeof import('next-auth').default;
+const NextResponse = require('next/server').NextResponse as typeof import('next/server').NextResponse;
+
+const logger = console;
+
+export function createAuthHandler(options = createNextAuthOptions()) {
+  return NextAuth(options);
 }
 
-export function createLogoutHandler(options: CreateAuthHandlerOptions = {}) {
+export function createLogoutHandler(options = createNextAuthOptions()) {
   return {
     async GET() {
-      const idToken = ((await getServerSession(createAuthOptions(options))) as Session)?.idToken;
+      const idToken = ((await getServerSession(options)) as Session)?.idToken;
       if (idToken) {
         try {
           await fetch(
@@ -66,7 +65,7 @@ export function createLogoutHandler(options: CreateAuthHandlerOptions = {}) {
   };
 }
 
-function createAuthOptions(options: CreateAuthHandlerOptions = {}) {
+export function createNextAuthOptions(options: CreateAuthHandlerOptions = {}) {
   if (_nextAuth) return _nextAuth;
   _nextAuth = {
     ...options.nextAuth,
@@ -122,31 +121,6 @@ function createAuthOptions(options: CreateAuthHandlerOptions = {}) {
   return _nextAuth;
 }
 
-async function refreshAccessToken(nextToken: NextToken) {
-  const res = await fetch(process.env.REFRESH_TOKEN_URL || '', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-    body: new URLSearchParams({
-      client_id: process.env.KEYCLOAK_CLIENT_ID || '',
-      client_secret: process.env.KEYCLOAK_CLIENT_SECRET || '',
-      grant_type: 'refresh_token',
-      refresh_token: nextToken.refreshToken,
-    }),
-  });
-  const refreshToken = await res.json();
-  if (!res.ok) throw refreshToken;
-  return {
-    ...nextToken,
-    accessToken: refreshToken.access_token,
-    decoded: jwtDecode(refreshToken.access_token),
-    expiresAt: Math.floor(Date.now() / 1000) + Number(refreshToken.expires_in),
-    idToken: refreshToken.id_token,
-    refreshToken: refreshToken.refresh_token,
-  };
-}
-
 export interface CreateAuthHandlerOptions {
   keycloakProvider?: Partial<OAuthUserConfig<any>>;
   nextAuth?: AuthOptions;
@@ -161,3 +135,31 @@ export interface NextToken extends JWT {
   refreshToken: string;
   roles: string[];
 }
+
+async function refreshAccessToken(nextToken: NextToken) {
+  const res = await fetch(
+    `${process.env.KEYCLOAK_BASE_URL}/realms/${process.env.KEYCLOAK_REALM || 'master'}/protocol/openid-connect/token`,
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      body: new URLSearchParams({
+        client_id: process.env.KEYCLOAK_CLIENT_ID || '',
+        client_secret: process.env.KEYCLOAK_CLIENT_SECRET || '',
+        grant_type: 'refresh_token',
+        refresh_token: nextToken.refreshToken,
+      }),
+    },
+  );
+  const refreshToken = await res.json();
+  if (!res.ok) throw refreshToken;
+  return {
+    ...nextToken,
+    accessToken: refreshToken.access_token,
+    decoded: jwtDecode(refreshToken.access_token),
+    expiresAt: Math.floor(Date.now() / 1000) + Number(refreshToken.expires_in),
+    idToken: refreshToken.id_token,
+    refreshToken: refreshToken.refresh_token,
+  };
+}

package/src/session/session.ts

@@ -1,5 +1,5 @@
 /*
- *  File: /src/session.ts
+ *  File: /src/session/session.ts
  *  Project: @multiplatform.one/keycloak
  *  File Created: 10-01-2024 02:31:26
  *  Author: Clay Risser
@@ -19,21 +19,31 @@
  *  limitations under the License.
  */
 
-import type { Session as NextSession } from 'next-auth';
-import type { SessionContextValue as NextSessionContextValue, UseSessionOptions } from 'next-auth/react';
+import type { AuthOptions, Session as NextSession } from 'next-auth';
 import { MultiPlatform } from 'multiplatform.one';
 import { useSession as useNextSession, getSession as getNextSession } from 'next-auth/react';
+import type {
+  GetSessionParams,
+  SessionContextValue as NextSessionContextValue,
+  UseSessionOptions,
+} from 'next-auth/react';
 
-let _getServerSession: (() => Promise<Session | null>) | undefined;
+let _getServerSession: ((options?: AuthOptions, req?: any, res?: any) => Promise<Session | null>) | undefined;
 
-export async function getSession(): Promise<Session | null> {
+export async function getSession(
+  options?: AuthOptions | GetSessionParams,
+  req?: any,
+  res?: any,
+): Promise<Session | null> {
   if (MultiPlatform.isServer) {
-    if (typeof _getServerSession === 'function') return _getServerSession();
+    if (typeof _getServerSession === 'function') return _getServerSession(options as AuthOptions, req, res);
     const getSession = (await import('next-auth')).getServerSession;
-    _getServerSession = () => getSession();
-    return _getServerSession();
+    _getServerSession = (options?: AuthOptions, req?: any, res?: any) => {
+      return req && res ? getSession(req, res, options as any) : getSession(options as any);
+    };
+    return _getServerSession(options as AuthOptions, req, res);
   }
-  return getNextSession();
+  return getNextSession(options as GetSessionParams);
 }
 
 export type SessionContextValue<R extends boolean> = Partial<