move all to session.ts

Author: Josh Calder

examples/custom-session-next-auth/admin/pages/api/auth/[...nextauth].ts

@@ -1,26 +1,4 @@
 import NextAuth from 'next-auth';
-import GithubProvider from 'next-auth/providers/github';
-import { getNextSession, onNextSignIn } from '../../../../session';
-// WARNING: this example is for demonstration purposes only
-//   as with each of our examples, it has not been vetted
-//   or tested for any particular usage
+import { nextAuthOptions } from '../../../../session';
 
-// WARNING: you need to change this
-const sessionSecret = '-- DEV COOKIE SECRET; CHANGE ME --';
-
-// see https://next-auth.js.org/configuration/options for more
-export const authOptions = {
-  secret: sessionSecret,
-  callbacks: {
-    signIn: onNextSignIn,
-    session: getNextSession,
-  },
-  providers: [
-    GithubProvider({
-      clientId: process.env.GITHUB_ID!,
-      clientSecret: process.env.GITHUB_SECRET!,
-    }),
-  ],
-};
-
-export default NextAuth(authOptions);
+export default NextAuth(nextAuthOptions);

examples/custom-session-next-auth/keystone.ts

@@ -2,7 +2,7 @@ import { config } from '@keystone-6/core';
 import { fixPrismaPath } from '../example-utils';
 import { lists } from './schema';
 
-import { Session, nextAuthSession } from './session';
+import { Session, nextAuthSessionStrategy } from './session';
 import type { TypeInfo } from '.keystone/types';
 
 // WARNING: this example is for demonstration purposes only
@@ -44,5 +44,5 @@ export default config<TypeInfo<Session>>({
   },
   lists,
   // you can find out more at https://keystonejs.com/docs/apis/session#session-api
-  session: nextAuthSession,
+  session: nextAuthSessionStrategy,
 });

examples/custom-session-next-auth/session.ts

@@ -1,13 +1,57 @@
 import { getContext } from '@keystone-6/core/context';
 import { getServerSession } from 'next-auth/next';
-import { authOptions } from './admin/pages/api/auth/[...nextauth]';
+import GithubProvider from 'next-auth/providers/github';
 import config from './keystone';
 import * as PrismaModule from '.myprisma/client';
 import type { Context } from '.keystone/types';
+// WARNING: this example is for demonstration purposes only
+//   as with each of our examples, it has not been vetted
+//   or tested for any particular usage
+
+// WARNING: you need to change this
+const sessionSecret = '-- DEV COOKIE SECRET; CHANGE ME --';
+
+// see https://next-auth.js.org/configuration/options for more
+export const nextAuthOptions = {
+  secret: sessionSecret,
+  callbacks: {
+    async signIn({ user, account, profile }: any) {
+      const sudoContext = getKeystoneContext().sudo();
+      // console.log('Next Auth Sign In Details', { user, account, profile });
+      // check if the user exists in keystone
+      const keystoneUser = await sudoContext.query.Author.findOne({
+        where: { subjectId: profile.id },
+      });
+      // if not, create them
+      if (!keystoneUser) {
+        await sudoContext.query.Author.createOne({
+          data: {
+            subjectId: profile.id,
+            name: profile.name,
+          },
+        });
+      }
+      // return true to allow the sign in to complete
+      return true;
+    },
+    async session({ token, session }: any) {
+      // console.log('Next Auth Session Details', { session, token });
+      // add the users subjectId and email to the session object
+      return { ...session, subjectId: token.sub };
+    },
+  },
+  providers: [
+    GithubProvider({
+      clientId: process.env.GITHUB_ID!,
+      clientSecret: process.env.GITHUB_SECRET!,
+    }),
+  ],
+};
 
 export type Session = {
   id: string;
 };
+
 let _keystoneContext: Context = (globalThis as any)._keystoneContext;
 
 function getKeystoneContext() {
@@ -19,33 +63,8 @@ function getKeystoneContext() {
   }
   return _keystoneContext;
 }
-export async function onNextSignIn({ user, account, profile }: any) {
-  const sudoContext = getKeystoneContext().sudo();
-  // console.log('Next Auth Sign In Details', { user, account, profile });
-  // check if the user exists in keystone
-  const keystoneUser = await sudoContext.query.Author.findOne({
-    where: { subjectId: profile.id },
-  });
-  // if not, create them
-  if (!keystoneUser) {
-    await sudoContext.query.Author.createOne({
-      data: {
-        subjectId: profile.id,
-        name: profile.name,
-      },
-    });
-  }
-  // return true to allow the sign in to complete
-  return true;
-}
-
-export async function getNextSession({ session, token }: any) {
-  // console.log('Next Auth Session Details', { session, token });
-  // add the users subjectId and email to the session object
-  return { ...session, email: token.email, subjectId: token.sub };
-}
 
-export const nextAuthSession = {
+export const nextAuthSessionStrategy = {
   async get({ context }: { context: Context }): Promise<Session | undefined> {
     const { req, res } = context;
     const { headers } = req ?? {};
@@ -58,7 +77,12 @@ export const nextAuthSession = {
       cookies[key] = decodeURIComponent(value);
     }
     // get the next-auth session
-    const nextAuthSession = await getServerSession({ headers, cookies } as any, res, authOptions);
+    // TODO: get types for getServerSession.
+    const nextAuthSession = await getServerSession(
+      { headers, cookies } as any,
+      res,
+      nextAuthOptions
+    );
     // get the keystone user using the subjectId
     const keystoneAuthor = await context.db.Author.findOne({
       where: { subjectId: nextAuthSession?.subjectId },