@opensaas/keystone-nextjs-auth 15.0.0 → 18.0.0

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

@@ -13,9 +13,9 @@ var client = require('next-auth/client');
 var Providers = require('next-auth/providers');
 var cookie = require('cookie');
 var ejs = require('ejs');
-var _reduceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/reduce');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
-var merge = require('@graphql-tools/merge');
+var graphql = require('graphql');
+var keystone = require('@keystone-next/keystone');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -28,14 +28,12 @@ function _interopNamespace(e) {
         var d = Object.getOwnPropertyDescriptor(e, k);
         Object.defineProperty(n, k, d.get ? d : {
           enumerable: true,
-          get: function () {
-            return e[k];
-          }
+          get: function () { return e[k]; }
         });
       }
     });
   }
-  n['default'] = e;
+  n["default"] = e;
   return Object.freeze(n);
 }
 
@@ -47,7 +45,6 @@ var url__default = /*#__PURE__*/_interopDefault(url);
 var Providers__default = /*#__PURE__*/_interopDefault(Providers);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
-var _reduceInstanceProperty__default = /*#__PURE__*/_interopDefault(_reduceInstanceProperty);
 var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 
 const template$1 = `
@@ -77,16 +74,36 @@ module.exports = withPreconstruct({
         /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
         /.prisma\\/client/
       ];
+    // we need to set these to true so that when __dirname/__filename is used
+    // to resolve the location of field views, we will get a path that we can use
+    // rather than just the __dirname/__filename of the generated file.
+    // https://webpack.js.org/configuration/node/#node__filename
+    (_config$node = config.node) !== null && _config$node !== void 0 ? _config$node : config.node = {};
+    config.node.__dirname = true;
+    config.node.__filename = true;
     }
     return config;
   },
+  <% if (keystonePath) { %>
+    <% if (process.env.NODE_ENV != 'production') { %> 
+  async rewrites() {
+    return [
+      {
+        source: '/api/__keystone_api_build',
+        destination: 'http://localhost:3000<%= keystonePath || '' %>/api/__keystone_api_build',
+        basePath: false
+      }
+    ];
+  },
+  <% }%>
   basePath: '<%= keystonePath || '' %>'
+  <% } %>
 });
 `;
 const nextConfigTemplate = ({
   keystonePath
 }) => {
-  const nextConfigOut = ejs__default['default'].render(template$1, {
+  const nextConfigOut = ejs__default["default"].render(template$1, {
     keystonePath
   });
   return nextConfigOut;
@@ -94,82 +111,74 @@ const nextConfigTemplate = ({
 
 function getBaseAuthSchema({
   listKey,
-  gqlNames
+  gqlNames,
+  base
 }) {
-  return {
-    typeDefs: `
-      # Auth
-      union AuthenticatedItem = ${listKey}
-      type Query {
-        authenticatedItem: AuthenticatedItem
-      }
-    `,
-    resolvers: {
-      Query: {
-        async authenticatedItem(root, args, {
+  const extension = {
+    query: {
+      authenticatedItem: keystone.graphql.field({
+        type: keystone.graphql.union({
+          name: 'AuthenticatedItem',
+          types: [base.object(listKey)],
+          resolveType: (root, context) => {
+            var _context$session;
+
+            return (_context$session = context.session) === null || _context$session === void 0 ? void 0 : _context$session.listKey;
+          }
+        }),
+
+        resolve(root, args, {
           session,
-          query
+          db
         }) {
           if (typeof (session === null || session === void 0 ? void 0 : session.itemId) === 'string' && typeof session.listKey === 'string') {
-            try {
-              return query[session.listKey].findOne({
-                where: {
-                  id: session.itemId
-                },
-                resolveFields: false
-              });
-            } catch (e) {
-              return null;
-            }
+            return db[session.listKey].findOne({
+              where: {
+                id: session.itemId
+              }
+            });
           }
 
           return null;
         }
 
-      },
-      AuthenticatedItem: {
-        __resolveType(rootVal, {
-          session
-        }) {
-          return session === null || session === void 0 ? void 0 : session.listKey;
-        }
-
-      },
-      // TODO: Is this the preferred approach for this?
-      [gqlNames.ItemAuthenticationWithPasswordResult]: {
-        __resolveType(rootVal) {
-          return rootVal.sessionToken ? gqlNames.ItemAuthenticationWithPasswordSuccess : gqlNames.ItemAuthenticationWithPasswordFailure;
-        }
-
-      }
+      })
     }
   };
+  return {
+    extension
+  };
 }
 
 const getSchemaExtension = ({
   identityField,
   listKey,
   gqlNames
-}) => schema => {
-  var _context, _context2;
+}) => keystone.graphql.extend(base => {
+  var _context;
+
+  const uniqueWhereInputType = graphql.assertInputObjectType(base.schema.getType(`${listKey}WhereUniqueInput`));
+  const identityFieldOnUniqueWhere = uniqueWhereInputType.getFields()[identityField];
+
+  if ((identityFieldOnUniqueWhere === null || identityFieldOnUniqueWhere === void 0 ? void 0 : identityFieldOnUniqueWhere.type) !== graphql.GraphQLString && (identityFieldOnUniqueWhere === null || identityFieldOnUniqueWhere === void 0 ? void 0 : identityFieldOnUniqueWhere.type) !== graphql.GraphQLID) {
+    throw new Error(`createAuth was called with an identityField of ${identityField} on the list ${listKey} ` + `but that field doesn't allow being searched uniquely with a String or ID. ` + `You should likely add \`isIndexed: 'unique'\` ` + `to the field at ${listKey}.${identityField}`);
+  }
 
-  return _reduceInstanceProperty__default['default'](_context = _filterInstanceProperty__default['default'](_context2 = [getBaseAuthSchema({
+  const baseSchema = getBaseAuthSchema({
     listKey,
-    gqlNames
-  })]).call(_context2, x => x)).call(_context, (s, extension) => merge.mergeSchemas(_objectSpread({
-    schemas: [s]
-  }, extension)), schema);
-};
+    gqlNames,
+    base
+  });
+  return _filterInstanceProperty__default["default"](_context = [baseSchema.extension]).call(_context, x => x !== undefined);
+});
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
-import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
 import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
         identityField: '<%= identityField %>',
-        mutationName: '<%= gqlNames.authenticateItemWithPassword %>',
         sessionData: '<%= sessionData %>',
         listKey: '<%= listKey %>',
         userMap: <%- JSON.stringify(userMap) %>,
@@ -190,7 +199,7 @@ const authTemplate = ({
   accountMap,
   profileMap
 }) => {
-  const authOut = ejs__default['default'].render(template, {
+  const authOut = ejs__default["default"].render(template, {
     gqlNames,
     identityField,
     sessionData,
@@ -204,7 +213,7 @@ const authTemplate = ({
 };
 
 const _excluded = ["get"];
-const nextAuthProviders = Providers__default['default'];
+const nextAuthProviders = Providers__default["default"];
 /**
  * createAuth function
  *
@@ -256,7 +265,7 @@ function createAuth({
       req,
       session
     } = context;
-    const pathname = url__default['default'].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+    const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
@@ -269,7 +278,7 @@ function createAuth({
       return;
     }
 
-    if (!session && !_includesInstanceProperty__default['default'](pathname).call(pathname, `${customPath}/api/auth/`)) {
+    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
         to: `${customPath}/api/auth/signin`
@@ -324,7 +333,7 @@ function createAuth({
     publicPages.push(`${customPath}/api/auth/callback/${name}`);
   }
 
-  _mapInstanceProperty__default['default'](providers).call(providers, addPages);
+  _mapInstanceProperty__default["default"](providers).call(providers, addPages);
   /**
    * extendGraphqlSchema
    *
@@ -357,7 +366,7 @@ function createAuth({
     const identityFieldConfig = listConfig.fields[identityField];
 
     if (identityFieldConfig === undefined) {
-      const i = _JSON$stringify__default['default'](identityField);
+      const i = _JSON$stringify__default["default"](identityField);
 
       const msg = `A createAuth() invocation for the "${listKey}" list specifies ${i} as its identityField but no field with that key exists on the list.`;
       throw new Error(msg);
@@ -381,9 +390,9 @@ function createAuth({
       get: async ({
         req
       }) => {
-        const pathname = url__default['default'].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
-        if (_includesInstanceProperty__default['default'](pathname).call(pathname, '/api/auth')) {
+        if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth')) {
           return;
         }
 
@@ -407,7 +416,7 @@ function createAuth({
           secure:         "production" === 'production',
           path: '/',
           sameSite: 'lax',
-          domain: url__default['default'].parse(req.url).hostname
+          domain: url__default["default"].parse(req.url).hostname
         }));
       }
     });
@@ -431,37 +440,33 @@ function createAuth({
     } = keystoneConfig;
 
     if (keystoneConfig.ui) {
+      var _keystoneConfig$ui;
+
       ui = _objectSpread(_objectSpread({}, keystoneConfig.ui), {}, {
         publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
-        getAdditionalFiles: [...(keystoneConfig.ui.getAdditionalFiles || []), getAdditionalFiles],
+        getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
         pageMiddleware: async args => {
-          var _await$pageMiddleware, _keystoneConfig$ui, _keystoneConfig$ui$pa;
+          var _await$pageMiddleware, _keystoneConfig$ui2, _keystoneConfig$ui2$p;
 
-          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : (_keystoneConfig$ui$pa = _keystoneConfig$ui.pageMiddleware) === null || _keystoneConfig$ui$pa === void 0 ? void 0 : _keystoneConfig$ui$pa.call(_keystoneConfig$ui, args);
+          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args);
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {
-          var _context$req, _keystoneConfig$ui2;
+          var _context$req, _keystoneConfig$ui3;
 
           // Allow access to the adminMeta data from the /init path to correctly render that page
           // even if the user isn't logged in (which should always be the case if they're seeing /init)
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.headers;
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
-          const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL__default['default'](headers.referer) : undefined;
+          const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL__default["default"](headers.referer) : undefined;
           const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
-          return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
+          return accessingInitPage || ((_keystoneConfig$ui3 = keystoneConfig.ui) !== null && _keystoneConfig$ui3 !== void 0 && _keystoneConfig$ui3.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });
     }
 
-    let {
-      session
-    } = keystoneConfig;
-
-    if (session && sessionData) {
-      session = withItemData(session);
-    }
-
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {
       ui,

package/dist/opensaas-keystone-nextjs-auth.esm.js

@@ -9,9 +9,9 @@ import { getSession } from 'next-auth/client';
 import Providers from 'next-auth/providers';
 import * as cookie from 'cookie';
 import ejs from 'ejs';
-import _reduceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/reduce';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
-import { mergeSchemas } from '@graphql-tools/merge';
+import { assertInputObjectType, GraphQLString, GraphQLID } from 'graphql';
+import { graphql } from '@keystone-next/keystone';
 
 const template$1 = `
 const Path = require('path');
@@ -40,10 +40,30 @@ module.exports = withPreconstruct({
         /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
         /.prisma\\/client/
       ];
+    // we need to set these to true so that when __dirname/__filename is used
+    // to resolve the location of field views, we will get a path that we can use
+    // rather than just the __dirname/__filename of the generated file.
+    // https://webpack.js.org/configuration/node/#node__filename
+    (_config$node = config.node) !== null && _config$node !== void 0 ? _config$node : config.node = {};
+    config.node.__dirname = true;
+    config.node.__filename = true;
     }
     return config;
   },
+  <% if (keystonePath) { %>
+    <% if (process.env.NODE_ENV != 'production') { %> 
+  async rewrites() {
+    return [
+      {
+        source: '/api/__keystone_api_build',
+        destination: 'http://localhost:3000<%= keystonePath || '' %>/api/__keystone_api_build',
+        basePath: false
+      }
+    ];
+  },
+  <% }%>
   basePath: '<%= keystonePath || '' %>'
+  <% } %>
 });
 `;
 const nextConfigTemplate = ({
@@ -57,82 +77,74 @@ const nextConfigTemplate = ({
 
 function getBaseAuthSchema({
   listKey,
-  gqlNames
+  gqlNames,
+  base
 }) {
-  return {
-    typeDefs: `
-      # Auth
-      union AuthenticatedItem = ${listKey}
-      type Query {
-        authenticatedItem: AuthenticatedItem
-      }
-    `,
-    resolvers: {
-      Query: {
-        async authenticatedItem(root, args, {
+  const extension = {
+    query: {
+      authenticatedItem: graphql.field({
+        type: graphql.union({
+          name: 'AuthenticatedItem',
+          types: [base.object(listKey)],
+          resolveType: (root, context) => {
+            var _context$session;
+
+            return (_context$session = context.session) === null || _context$session === void 0 ? void 0 : _context$session.listKey;
+          }
+        }),
+
+        resolve(root, args, {
           session,
-          query
+          db
         }) {
           if (typeof (session === null || session === void 0 ? void 0 : session.itemId) === 'string' && typeof session.listKey === 'string') {
-            try {
-              return query[session.listKey].findOne({
-                where: {
-                  id: session.itemId
-                },
-                resolveFields: false
-              });
-            } catch (e) {
-              return null;
-            }
+            return db[session.listKey].findOne({
+              where: {
+                id: session.itemId
+              }
+            });
           }
 
           return null;
         }
 
-      },
-      AuthenticatedItem: {
-        __resolveType(rootVal, {
-          session
-        }) {
-          return session === null || session === void 0 ? void 0 : session.listKey;
-        }
-
-      },
-      // TODO: Is this the preferred approach for this?
-      [gqlNames.ItemAuthenticationWithPasswordResult]: {
-        __resolveType(rootVal) {
-          return rootVal.sessionToken ? gqlNames.ItemAuthenticationWithPasswordSuccess : gqlNames.ItemAuthenticationWithPasswordFailure;
-        }
-
-      }
+      })
     }
   };
+  return {
+    extension
+  };
 }
 
 const getSchemaExtension = ({
   identityField,
   listKey,
   gqlNames
-}) => schema => {
-  var _context, _context2;
+}) => graphql.extend(base => {
+  var _context;
+
+  const uniqueWhereInputType = assertInputObjectType(base.schema.getType(`${listKey}WhereUniqueInput`));
+  const identityFieldOnUniqueWhere = uniqueWhereInputType.getFields()[identityField];
+
+  if ((identityFieldOnUniqueWhere === null || identityFieldOnUniqueWhere === void 0 ? void 0 : identityFieldOnUniqueWhere.type) !== GraphQLString && (identityFieldOnUniqueWhere === null || identityFieldOnUniqueWhere === void 0 ? void 0 : identityFieldOnUniqueWhere.type) !== GraphQLID) {
+    throw new Error(`createAuth was called with an identityField of ${identityField} on the list ${listKey} ` + `but that field doesn't allow being searched uniquely with a String or ID. ` + `You should likely add \`isIndexed: 'unique'\` ` + `to the field at ${listKey}.${identityField}`);
+  }
 
-  return _reduceInstanceProperty(_context = _filterInstanceProperty(_context2 = [getBaseAuthSchema({
+  const baseSchema = getBaseAuthSchema({
     listKey,
-    gqlNames
-  })]).call(_context2, x => x)).call(_context, (s, extension) => mergeSchemas(_objectSpread({
-    schemas: [s]
-  }, extension)), schema);
-};
+    gqlNames,
+    base
+  });
+  return _filterInstanceProperty(_context = [baseSchema.extension]).call(_context, x => x !== undefined);
+});
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
-import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
 import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
         identityField: '<%= identityField %>',
-        mutationName: '<%= gqlNames.authenticateItemWithPassword %>',
         sessionData: '<%= sessionData %>',
         listKey: '<%= listKey %>',
         userMap: <%- JSON.stringify(userMap) %>,
@@ -394,17 +406,19 @@ function createAuth({
     } = keystoneConfig;
 
     if (keystoneConfig.ui) {
+      var _keystoneConfig$ui;
+
       ui = _objectSpread(_objectSpread({}, keystoneConfig.ui), {}, {
         publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
-        getAdditionalFiles: [...(keystoneConfig.ui.getAdditionalFiles || []), getAdditionalFiles],
+        getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
         pageMiddleware: async args => {
-          var _await$pageMiddleware, _keystoneConfig$ui, _keystoneConfig$ui$pa;
+          var _await$pageMiddleware, _keystoneConfig$ui2, _keystoneConfig$ui2$p;
 
-          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : (_keystoneConfig$ui$pa = _keystoneConfig$ui.pageMiddleware) === null || _keystoneConfig$ui$pa === void 0 ? void 0 : _keystoneConfig$ui$pa.call(_keystoneConfig$ui, args);
+          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args);
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {
-          var _context$req, _keystoneConfig$ui2;
+          var _context$req, _keystoneConfig$ui3;
 
           // Allow access to the adminMeta data from the /init path to correctly render that page
           // even if the user isn't logged in (which should always be the case if they're seeing /init)
@@ -412,19 +426,13 @@ function createAuth({
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
           const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL(headers.referer) : undefined;
           const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
-          return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
+          return accessingInitPage || ((_keystoneConfig$ui3 = keystoneConfig.ui) !== null && _keystoneConfig$ui3 !== void 0 && _keystoneConfig$ui3.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });
     }
 
-    let {
-      session
-    } = keystoneConfig;
-
-    if (session && sessionData) {
-      session = withItemData(session);
-    }
-
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {
       ui,

package/package.json

@@ -1,28 +1,28 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "15.0.0",
+  "version": "18.0.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
   "module": "dist/opensaas-keystone-nextjs-auth.esm.js",
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@babel/runtime-corejs3": "^7.15.3",
-    "@graphql-tools/merge": "^6.2.14",
+    "@babel/runtime": "^7.15.8",
+    "@babel/runtime-corejs3": "^7.15.4",
     "@keystone-next/admin-ui-utils": "^6.0.0",
-    "@types/ejs": "^3.0.6",
+    "@types/ejs": "^3.1.0",
     "cookie": "^0.4.1",
     "cross-fetch": "^3.1.4",
     "ejs": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
+    "graphql": "^15.6.1",
     "next-auth": "^3.29.0"
   },
   "devDependencies": {
-    "@keystone-next/keystone": "^26.1.1",
+    "@keystone-next/keystone": "^29.0.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^26.1.1",
+    "@keystone-next/keystone": "^29.0.0",
     "react": "^17.0.2"
   },
   "engines": {

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

@@ -13,10 +13,8 @@ async function findMatchingIdentity(identityField, identity, queryAPI) {
   const item = await queryAPI.findOne({
     where: {
       [identityField]: identity
-    },
-    resolveFields: false
-  });
-  console.log(item); // Identity failures with helpful errors
+    }
+  }); // Identity failures with helpful errors
 
   let code;
 
@@ -71,7 +69,7 @@ function NextAuthPage(props) {
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
-  return NextAuth__default['default']({
+  return NextAuth__default["default"]({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
@@ -128,13 +126,11 @@ function NextAuthPage(props) {
         }
       },
 
-      async redirect(url, baseUrl) {
+      async redirect(url) {
         return url;
       },
 
       async session(session, token) {
-        console.log('session:', session);
-
         const returnSession = _objectSpread(_objectSpread({}, session), {}, {
           data: token.data,
           subject: token.sub,
@@ -145,8 +141,7 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt(token, user, account, profile, isNewUser) {
-        console.log('account:', account);
+      async jwt(token) {
         const identity = token.sub;
 
         if (!token.itemId) {
@@ -181,5 +176,5 @@ function NextAuthPage(props) {
 }
 const getNextAuthPage = props => () => NextAuthPage(_objectSpread({}, props));
 
-exports['default'] = NextAuthPage;
+exports["default"] = NextAuthPage;
 exports.getNextAuthPage = getNextAuthPage;