@opensaas/keystone-nextjs-auth 21.1.1 → 22.2.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @opensaas-keystone/nextjs-auth
 
+## 22.2.0
+
+### Minor Changes
+
+- 4a2f20a: Allow custom session `get`, `start` and `end`
+
+### Patch Changes
+
+- 4a2f20a: Set prisma and query on global in dev to prevent instantiating extra `PrismaClient` instances
+
+## 22.1.0
+
+### Minor Changes
+
+- b89f4e7: Invalidate user when deleted from database
+
+### Patch Changes
+
+- b89f4e7: signin pages error fix
+
+## 22.0.0
+
+### Major Changes
+
+- 059d0cc: type fixes and and update user on login
+
 ## 21.1.1
 
 ### Patch Changes

package/dist/declarations/src/index.d.ts

@@ -1,11 +1,11 @@
-import { BaseListTypeInfo, KeystoneConfig } from "@keystone-6/core/types";
-import { AuthConfig, KeystoneOAuthConfig } from "./types";
+import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
+import { AuthConfig, KeystoneOAuthConfig } from './types';
 /**
  * createAuth function
  *
  * Generates config for Keystone to implement standard auth features.
  */
-export type { NextAuthProviders, KeystoneOAuthConfig } from "./types";
+export type { NextAuthProviders, KeystoneOAuthConfig } from './types';
 export declare function createAuth<GeneratedListTypes extends BaseListTypeInfo>({ autoCreate, cookies, identityField, listKey, keystonePath, pages, resolver, providers, sessionData, sessionSecret, }: AuthConfig<GeneratedListTypes>): {
     withAuth: (keystoneConfig: KeystoneConfig) => KeystoneOAuthConfig;
 };

package/dist/declarations/src/pages/NextAuthPage.d.ts

@@ -2,24 +2,29 @@ import { 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';
-declare type CoreNextAuthPageProps = {
+export declare type NextAuthTemplateProps = {
     autoCreate: boolean;
-    cookies?: Partial<CookiesOptions>;
-    events?: Partial<EventCallbacks>;
     identityField: string;
-    jwt?: Partial<JWTOptions>;
     listKey: string;
-    pages?: Partial<PagesOptions>;
-    providers?: Provider[];
-    resolver?: Function | undefined;
     sessionData: string | undefined;
     sessionSecret: string;
 };
-declare type NextAuthGglProps = {
-    mutationName?: string;
-    query?: KeystoneListsAPI<any>;
+export declare type CoreNextAuthPageProps = {
+    cookies?: Partial<CookiesOptions>;
+    events?: Partial<EventCallbacks>;
+    jwt?: Partial<JWTOptions>;
+    pages?: Partial<PagesOptions>;
+    providers: Provider[];
+    resolver?: (args: {
+        user: any;
+        profile: any;
+        account: any;
+    }) => Promise<{
+        [key: string]: boolean | string | number;
+    }>;
+} & NextAuthTemplateProps;
+export declare type NextAuthPageProps = CoreNextAuthPageProps & {
+    query: KeystoneListsAPI<any>;
 };
-export declare type NextAuthPageProps = CoreNextAuthPageProps & NextAuthGglProps;
 export default function NextAuthPage(props: NextAuthPageProps): any;
 export declare const getNextAuthPage: (props: NextAuthPageProps) => () => any;
-export {};

package/dist/declarations/src/templates/auth.d.ts

@@ -1,4 +1,2 @@
-import { NextAuthPageProps } from '../pages/NextAuthPage';
-declare type AuthTemplateOptions = NextAuthPageProps;
-export declare const authTemplate: ({ autoCreate, identityField, listKey, sessionData, sessionSecret, }: AuthTemplateOptions) => string;
-export {};
+import { NextAuthTemplateProps } from '../pages/NextAuthPage';
+export declare const authTemplate: ({ autoCreate, identityField, listKey, sessionData, sessionSecret, }: NextAuthTemplateProps) => string;

package/dist/declarations/src/templates/next-config.d.ts

@@ -1,3 +1,3 @@
-export declare const nextConfigTemplate: ({ keystonePath, }: {
+export declare const nextConfigTemplate: ({ keystonePath }: {
     keystonePath: string;
 }) => string;

package/dist/declarations/src/{types.d.ts → types/index.d.ts}

@@ -1,10 +1,25 @@
-import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
-import { CookiesOptions, PagesOptions } from 'next-auth';
+/// <reference types="node" />
+import type { ServerResponse, IncomingMessage } from 'http';
+import type { NextRequest } from 'next/server';
 import { Provider } from 'next-auth/providers';
-export declare type NextAuthSession = {
-    listKey: string;
-    itemId: string;
-    data: any;
+import { CookiesOptions, PagesOptions } from 'next-auth';
+import { BaseListTypeInfo, KeystoneConfig, CreateContext } from '@keystone-6/core/types';
+declare 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 declare type NextAuthProviders = Provider[];
 declare type KeytoneOAuthOptions = {
@@ -27,11 +42,17 @@ export declare type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
     identityField: GeneratedListTypes['fields'];
     /** Path for Keystone interface */
     keystonePath?: string;
-    pages?: any;
+    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 */

package/dist/opensaas-keystone-nextjs-auth.cjs.dev.js

@@ -164,8 +164,17 @@ const getSchemaExtension = ({
 
 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 %>,
@@ -196,7 +205,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get", "start"];
+const _excluded = ["get", "end"];
 /**
  * createAuth function
  *
@@ -219,7 +228,7 @@ function createAuth({
   // part of the createAuth API (in which case its use cases need to be documented and tested)
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
-  const customPath = !keystonePath || keystonePath === "/" ? "" : keystonePath;
+  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
   /**
    * pageMiddleware
    *
@@ -242,16 +251,16 @@ function createAuth({
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      if (pathname === `${customPath}/api/auth/signin` || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn)) {
         return {
-          kind: "redirect",
+          kind: 'redirect',
           to: `${customPath}`
         };
       }
 
-      if (customPath !== "" && pathname === "/") {
+      if (customPath !== '' && pathname === '/') {
         return {
-          kind: "redirect",
+          kind: 'redirect',
           to: `${customPath}`
         };
       }
@@ -259,13 +268,13 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/") || _includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth/") || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
+    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/') || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
     if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
-        kind: "redirect",
+        kind: 'redirect',
         to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
@@ -282,8 +291,8 @@ function createAuth({
 
   const getAdditionalFiles = () => {
     const filesToWrite = [{
-      mode: "write",
-      outputPath: "pages/api/auth/[...nextauth].js",
+      mode: 'write',
+      outputPath: 'pages/api/auth/[...nextauth].js',
       src: authTemplate({
         autoCreate,
         identityField,
@@ -292,8 +301,8 @@ function createAuth({
         sessionSecret
       })
     }, {
-      mode: "write",
-      outputPath: "next.config.js",
+      mode: 'write',
+      outputPath: 'next.config.js',
       src: nextConfigTemplate({
         keystonePath: customPath
       })
@@ -370,64 +379,70 @@ function createAuth({
   const withItemData = _sessionStrategy => {
     const {
       get,
-      start
+      end
     } = _sessionStrategy,
           sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      start: async ({
-        res
-      }) => {
-        console.log("start");
-        const session = await start({
-          res
-        });
-        return session;
-      },
       get: async ({
-        req
+        req,
+        createContext
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
+        const session = await get({
+          req,
+          createContext
+        });
+        const sudoContext = createContext({
+          sudo: true
+        });
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        let nextSession;
 
-        if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth")) {
+        if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth')) {
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(" ")[0]) === "Bearer") {
-          var _token$data;
-
-          const token = await jwt.getToken({
+        if (((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : (_req$headers$authoriz = _req$headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+          nextSession = await jwt.getToken({
             req,
             secret: sessionSecret
           });
-
-          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
-            return token;
-          }
+        } else {
+          nextSession = await react.getSession({
+            req
+          });
         }
 
-        const nextSession = await react.getSession({
-          req
-        });
-
-        if (nextSession) {
-          return nextSession;
+        if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
+          return;
         }
+
+        return _objectSpread(_objectSpread({}, nextSession), {}, {
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId
+        }, session);
       },
       end: async ({
         res,
-        req
+        req,
+        createContext
       }) => {
-        const TOKEN_NAME = process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token";
-        res.setHeader("Set-Cookie", cookie__namespace.serialize(TOKEN_NAME, "", {
+        await end({
+          res,
+          req,
+          createContext
+        });
+        const TOKEN_NAME = process.env.NODE_ENV === 'production' ? '__Secure-next-auth.session-token' : 'next-auth.session-token';
+        res.setHeader('Set-Cookie', cookie__namespace.serialize(TOKEN_NAME, '', {
           maxAge: 0,
           expires: new Date(),
           httpOnly: true,
-          secure: process.env.NODE_ENV === "production",
-          path: "/",
-          sameSite: "lax",
+          secure: process.env.NODE_ENV === 'production',
+          path: '/',
+          sameSite: 'lax',
           // TODO: Update parse to URL
           domain: url__default["default"].parse(req.url).hostname
         }));
@@ -472,12 +487,12 @@ function createAuth({
           } = context;
           const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
 
-          if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/")) {
+          if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/')) {
             return true;
           } // Allow keystone to access /api/__keystone_api_build for hot reloading
 
 
-          if (process.env.NODE_ENV !== "production" && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL__default["default"](context.req.url, "http://example.com").pathname === `${customPath}/api/__keystone_api_build`) {
+          if (process.env.NODE_ENV !== 'production' && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL__default["default"](context.req.url, 'http://example.com').pathname === `${customPath}/api/__keystone_api_build`) {
             return true;
           }
 
@@ -486,7 +501,7 @@ function createAuth({
       });
     }
 
-    if (!keystoneConfig.session) throw new TypeError("Missing .session configuration");
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {

package/dist/opensaas-keystone-nextjs-auth.cjs.prod.js

@@ -163,8 +163,17 @@ const getSchemaExtension = ({
 
 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 %>,
@@ -195,7 +204,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get", "start"];
+const _excluded = ["get", "end"];
 /**
  * createAuth function
  *
@@ -218,7 +227,7 @@ function createAuth({
   // part of the createAuth API (in which case its use cases need to be documented and tested)
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
-  const customPath = !keystonePath || keystonePath === "/" ? "" : keystonePath;
+  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
   /**
    * pageMiddleware
    *
@@ -241,16 +250,16 @@ function createAuth({
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      if (pathname === `${customPath}/api/auth/signin` || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn)) {
         return {
-          kind: "redirect",
+          kind: 'redirect',
           to: `${customPath}`
         };
       }
 
-      if (customPath !== "" && pathname === "/") {
+      if (customPath !== '' && pathname === '/') {
         return {
-          kind: "redirect",
+          kind: 'redirect',
           to: `${customPath}`
         };
       }
@@ -258,13 +267,13 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/") || _includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth/") || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
+    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/') || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
     if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
-        kind: "redirect",
+        kind: 'redirect',
         to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
@@ -281,8 +290,8 @@ function createAuth({
 
   const getAdditionalFiles = () => {
     const filesToWrite = [{
-      mode: "write",
-      outputPath: "pages/api/auth/[...nextauth].js",
+      mode: 'write',
+      outputPath: 'pages/api/auth/[...nextauth].js',
       src: authTemplate({
         autoCreate,
         identityField,
@@ -291,8 +300,8 @@ function createAuth({
         sessionSecret
       })
     }, {
-      mode: "write",
-      outputPath: "next.config.js",
+      mode: 'write',
+      outputPath: 'next.config.js',
       src: nextConfigTemplate({
         keystonePath: customPath
       })
@@ -369,64 +378,70 @@ function createAuth({
   const withItemData = _sessionStrategy => {
     const {
       get,
-      start
+      end
     } = _sessionStrategy,
           sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      start: async ({
-        res
-      }) => {
-        console.log("start");
-        const session = await start({
-          res
-        });
-        return session;
-      },
       get: async ({
-        req
+        req,
+        createContext
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
+        const session = await get({
+          req,
+          createContext
+        });
+        const sudoContext = createContext({
+          sudo: true
+        });
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        let nextSession;
 
-        if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/api/auth")) {
+        if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth')) {
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(" ")[0]) === "Bearer") {
-          var _token$data;
-
-          const token = await jwt.getToken({
+        if (((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : (_req$headers$authoriz = _req$headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+          nextSession = await jwt.getToken({
             req,
             secret: sessionSecret
           });
-
-          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
-            return token;
-          }
+        } else {
+          nextSession = await react.getSession({
+            req
+          });
         }
 
-        const nextSession = await react.getSession({
-          req
-        });
-
-        if (nextSession) {
-          return nextSession;
+        if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
+          return;
         }
+
+        return _objectSpread(_objectSpread({}, nextSession), {}, {
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId
+        }, session);
       },
       end: async ({
         res,
-        req
+        req,
+        createContext
       }) => {
-        const TOKEN_NAME = "__Secure-next-auth.session-token" ;
-        res.setHeader("Set-Cookie", cookie__namespace.serialize(TOKEN_NAME, "", {
+        await end({
+          res,
+          req,
+          createContext
+        });
+        const TOKEN_NAME = '__Secure-next-auth.session-token' ;
+        res.setHeader('Set-Cookie', cookie__namespace.serialize(TOKEN_NAME, '', {
           maxAge: 0,
           expires: new Date(),
           httpOnly: true,
-          secure:         "production" === "production",
-          path: "/",
-          sameSite: "lax",
+          secure:         "production" === 'production',
+          path: '/',
+          sameSite: 'lax',
           // TODO: Update parse to URL
           domain: url__default["default"].parse(req.url).hostname
         }));
@@ -471,7 +486,7 @@ function createAuth({
           } = context;
           const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
 
-          if (_includesInstanceProperty__default["default"](pathname).call(pathname, "/_next/")) {
+          if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/')) {
             return true;
           } // Allow keystone to access /api/__keystone_api_build for hot reloading
 
@@ -480,7 +495,7 @@ function createAuth({
       });
     }
 
-    if (!keystoneConfig.session) throw new TypeError("Missing .session configuration");
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {