@opensaas/keystone-nextjs-auth 21.1.1 → 22.2.0

package/src/templates/auth.ts

@@ -1,10 +1,19 @@
 import ejs from 'ejs';
-import { NextAuthPageProps } from '../pages/NextAuthPage';
+import { NextAuthTemplateProps } from '../pages/NextAuthPage';
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
-import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
+import { PrismaClient } from '.prisma/client';
+import { createQueryAPI } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/node-api';
+
+const prisma = global.prisma || PrismaClient
+
+if (process.env.NODE_ENV !== 'production') global.prisma = prisma
+
+const query = global.query || createQueryAPI(keystoneConfig, prisma);
+
+if (process.env.NODE_ENV !== 'production') global.query = query
 
 export default getNextAuthPage({
         autoCreate: <%= autoCreate %>,
@@ -19,15 +28,13 @@ export default getNextAuthPage({
     });
   `;
 
-type AuthTemplateOptions = NextAuthPageProps;
-
 export const authTemplate = ({
   autoCreate,
   identityField,
   listKey,
   sessionData,
   sessionSecret,
-}: AuthTemplateOptions) => {
+}: NextAuthTemplateProps) => {
   const authOut = ejs.render(template, {
     identityField,
     sessionData,

package/src/templates/next-config.ts

@@ -56,11 +56,7 @@ module.exports = withPreconstruct({
   <% } %>
 });
 `;
-export const nextConfigTemplate = ({
-  keystonePath,
-}: {
-  keystonePath: string;
-}) => {
+export const nextConfigTemplate = ({ keystonePath }: { keystonePath: string }) => {
   const nextConfigOut = ejs.render(template, { keystonePath });
 
   return nextConfigOut;

package/src/{types.ts → types/index.ts}

@@ -1,8 +1,27 @@
-import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
-import { CookiesOptions, PagesOptions } from 'next-auth';
+import type { ServerResponse, IncomingMessage } from 'http';
+import type { NextRequest } from 'next/server';
 import { Provider } from 'next-auth/providers';
+import { CookiesOptions, PagesOptions } from 'next-auth';
+import { BaseListTypeInfo, KeystoneConfig, CreateContext } from '@keystone-6/core/types';
 
-export type NextAuthSession = { listKey: string; itemId: string; data: any };
+type NextAuthResponse = IncomingMessage & NextRequest;
+
+export declare type AuthSessionStrategy<StoredSessionData> = {
+  start: (args: {
+    res: ServerResponse;
+    data: any;
+    createContext: CreateContext;
+  }) => Promise<string>;
+  end: (args: {
+    req: IncomingMessage;
+    res: ServerResponse;
+    createContext: CreateContext;
+  }) => Promise<void>;
+  get: (args: {
+    req: NextAuthResponse;
+    createContext: CreateContext;
+  }) => Promise<StoredSessionData | undefined>;
+};
 
 export type NextAuthProviders = Provider[];
 
@@ -15,9 +34,7 @@ type NextAuthOptions = {
   resolver: any;
 };
 
-export type KeystoneOAuthConfig = KeystoneConfig &
-  KeytoneOAuthOptions &
-  NextAuthOptions;
+export type KeystoneOAuthConfig = KeystoneConfig & KeytoneOAuthOptions & NextAuthOptions;
 
 export type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
   /** Auth Create users in Keystone DB from Auth Provider */
@@ -31,20 +48,20 @@ export type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
   /** Path for Keystone interface */
   keystonePath?: string;
   // Custom pages for different NextAuth events
-  pages?: any; // TODO: Fix types
+  pages?: Partial<PagesOptions>;
   /** Providers for Next Auth */
   providers: NextAuthProviders;
   /** Resolver for user to define their profile */
-  resolver?: Function | undefined;
+  resolver?: (args: { user: any; profile: any; account: any }) => Promise<{
+    [key: string]: boolean | string | number;
+  }>;
   /** Session data population */
   sessionData?: string | undefined;
   /** Next-Auth Session Secret */
   sessionSecret: string;
 };
 
-export type AuthTokenRequestErrorCode =
-  | 'IDENTITY_NOT_FOUND'
-  | 'MULTIPLE_IDENTITY_MATCHES';
+export type AuthTokenRequestErrorCode = 'IDENTITY_NOT_FOUND' | 'MULTIPLE_IDENTITY_MATCHES';
 
 export type PasswordAuthErrorCode =
   | AuthTokenRequestErrorCode

package/src/types/next-auth.d.ts

@@ -0,0 +1,19 @@
+import NextAuth from 'next-auth';
+import { JWT } from 'next-auth/jwt';
+
+declare module 'next-auth' {
+  interface JWT {
+    data?: any | undefined;
+    subject?: string | undefined;
+    listKey?: string;
+    itemId?: string | undefined;
+    name?: string | null | undefined;
+    email?: string | null | undefined;
+    picture?: string | null | undefined;
+    sub?: string | null | undefined;
+    expires?: string | null | undefined;
+  }
+  interface Session extends JWT {
+    user?: any;
+  }
+}