@opensaas/keystone-nextjs-auth 21.1.0 → 22.1.0

package/src/pages/NextAuthPage.tsx

@@ -1,14 +1,9 @@
-import NextAuth, {
-  CookiesOptions,
-  EventCallbacks,
-  PagesOptions,
-} from 'next-auth';
+import NextAuth, { CookiesOptions, EventCallbacks, PagesOptions } from 'next-auth';
 import type { KeystoneListsAPI } from '@keystone-6/core/types';
 import { Provider } from 'next-auth/providers';
 import { JWTOptions } from 'next-auth/jwt';
 import { validateNextAuth } from '../lib/validateNextAuth';
 
-// TODO: See if possible to merge with `type AuthConfig`
 type CoreNextAuthPageProps = {
   autoCreate: boolean;
   cookies?: Partial<CookiesOptions>;
@@ -18,7 +13,9 @@ type CoreNextAuthPageProps = {
   listKey: string;
   pages?: Partial<PagesOptions>;
   providers?: Provider[];
-  resolver?: Function | undefined;
+  resolver?: (args: { user: any; profile: any; account: any }) => {
+    [key: string]: boolean | string | number;
+  };
   sessionData: string | undefined;
   sessionSecret: string;
 };
@@ -45,8 +42,6 @@ export default function NextAuthPage(props: NextAuthPageProps) {
     sessionData,
     sessionSecret,
   } = props;
-  // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
-  console.log('NextAuthPages... ', pages);
 
   if (!query) {
     console.error('NextAuthPage got no query.');
@@ -79,16 +74,9 @@ export default function NextAuthPage(props: NextAuthPageProps) {
         } else {
           identity = 0;
         }
-        const userInput = resolver
-          ? await resolver({ user, account, profile })
-          : {};
-
-        const result = await validateNextAuth(
-          identityField,
-          identity,
-          protectIdentities,
-          queryAPI
-        );
+        const userInput = resolver ? await resolver({ user, account, profile }) : {};
+
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
         // ID
         const data: any = {
           [identityField]: identity,
@@ -97,66 +85,72 @@ export default function NextAuthPage(props: NextAuthPageProps) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log(
-              '`autoCreate` if set to `false`, skipping user auto-creation'
-            );
+            console.log('`autoCreate` is set to `false`, skipping user auto-creation');
             return false;
           }
-          console.log(
-            '`autoCreate` if set to `true`, auto-creating a new user'
-          );
+          console.log('`autoCreate` is set to `true`, auto-creating a new user');
 
           const createUser = await list
             .createOne({ data })
-            .then((returned) => {
-              console.log('User Created', JSON.stringify(returned));
-              return true;
+            .then(returned => {
+              return { success: true, user: returned };
             })
-            .catch((error) => {
+            .catch(error => {
               console.log(error);
               throw new Error(error);
             });
           console.log('Created User', createUser);
-          return createUser;
+          return createUser.success;
         }
-        // await list.updateOne({where: {id: result.item.id}, data});
-        return result.success;
+        console.log('Data', data);
+
+        const updateUser = await list
+          .updateOne({ where: { id: result.item.id }, data })
+          .then(returned => {
+            return { success: true, user: returned };
+          })
+          .catch(error => {
+            console.log(error);
+            throw new Error(error);
+          });
+        return updateUser.success;
       },
       async redirect({ url }) {
         return url;
       },
       async session({ session, token }) {
-        const returnSession = {
-          ...session,
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId,
-        };
+        let returnSession = session;
+        if (!token.itemId) {
+          return { expires: '0' };
+        } else {
+          returnSession = {
+            ...session,
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey as string,
+            itemId: token.itemId as string,
+          };
+        }
+        console.log('Session', returnSession);
+
         return returnSession;
       },
       async jwt({ token }) {
         const identity = token.sub as number | string;
-        if (!token.itemId) {
-          const result = await validateNextAuth(
-            identityField,
-            identity,
-            protectIdentities,
-            queryAPI
-          );
-
-          if (!result.success) {
-            return token;
-          }
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
+
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: { id: token.itemId },
+            query: sessionData || 'id',
+          });
+          token.data = data;
         }
-        const data = await query[listKey].findOne({
-          where: { id: token.itemId },
-          query: sessionData || 'id',
-        });
         const returnToken = {
           ...token,
-          data,
           subject: token.sub,
           listKey,
         };
@@ -167,5 +161,4 @@ export default function NextAuthPage(props: NextAuthPageProps) {
   });
 }
 
-export const getNextAuthPage = (props: NextAuthPageProps) => () =>
-  NextAuthPage({ ...props });
+export const getNextAuthPage = (props: NextAuthPageProps) => () => NextAuthPage({ ...props });

package/src/schema.ts

@@ -9,13 +9,11 @@ export const getSchemaExtension = ({
   identityField: string;
   listKey: string;
 }): ExtendGraphqlSchema =>
-  graphql.extend((base) => {
+  graphql.extend(base => {
     const baseSchema = getBaseAuthSchema({
       listKey,
       base,
     });
 
-    return [baseSchema.extension].filter(
-      (x): x is Exclude<typeof x, undefined> => x !== undefined
-    );
+    return [baseSchema.extension].filter((x): x is Exclude<typeof x, undefined> => x !== undefined);
   });

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;
+  }
+}