@opensaas/keystone-nextjs-auth 25.0.0 → 26.0.0

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

@@ -7,7 +7,7 @@ var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProp
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
-require('@babel/runtime-corejs3/core-js-stable/url');
+var _startsWithInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
 var url = require('url');
 var react = require('next-auth/react');
 var jwt = require('next-auth/jwt');
@@ -39,67 +39,19 @@ function _interopNamespace(e) {
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
+var _startsWithInstanceProperty__default = /*#__PURE__*/_interopDefault(_startsWithInstanceProperty);
 var url__default = /*#__PURE__*/_interopDefault(url);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
 var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 
 const template$1 = `
-const Path = require('path');
-// @ts-ignore
-const withPreconstruct = require('@preconstruct/next');
-
-module.exports = withPreconstruct({
-  typescript: {
-    ignoreBuildErrors: true,
-  },
-  env: {
-    NEXTAUTH_URL: process.env.NEXTAUTH_URL || 'http://localhost:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/auth',
-  },
-  eslint: {
-    ignoreDuringBuilds: true,
-  },
-  webpack(config, { isServer }) {
-    config.resolve.alias = {
-      ...config.resolve.alias,
-      react: Path.dirname(require.resolve('react/package.json')),
-      'react-dom': Path.dirname(require.resolve('react-dom/package.json')),
-      '@keystone-6/core': Path.dirname(
-        require.resolve('@keystone-6/core/package.json')
-      ),
-    };
-    if (isServer) {
-      config.externals = [
-        ...config.externals, 
-        /@keystone-6\\/core(?!\\/___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:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/__keystone_api_build',
-        basePath: false
-      }
-    ];
-  },
-  <% }%>
-  basePath: '<%= keystonePath || '' %>'
-  <% } %>
-});
-`;
+const keystoneConfig = require('@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/next-config').config;
+
+module.exports = {
+    ...keystoneConfig,
+    basePath: '<%= keystonePath || '' %>'
+};`;
 const nextConfigTemplate = _ref => {
   let {
     keystonePath
@@ -244,7 +196,7 @@ function createAuth(_ref) {
    *  - to the signin page when no valid session is present
    */
 
-  const pageMiddleware = async _ref2 => {
+  const authMiddleware = async _ref2 => {
     let {
       context,
       isValidSession
@@ -256,13 +208,6 @@ function createAuth(_ref) {
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      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',
-          to: `${customPath}`
-        };
-      }
-
       if (customPath !== '' && pathname === '/') {
         return {
           kind: 'redirect',
@@ -273,10 +218,6 @@ function createAuth(_ref) {
       return;
     }
 
-    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',
@@ -285,7 +226,7 @@ function createAuth(_ref) {
     }
   };
   /**
-   * getAdditionalFiles
+   * authGetAdditionalFiles
    *
    * This function adds files to be generated into the Admin UI build. Must be added to the
    * ui.getAdditionalFiles config.
@@ -294,7 +235,7 @@ function createAuth(_ref) {
    */
 
 
-  const getAdditionalFiles = () => {
+  const authGetAdditionalFiles = () => {
     const filesToWrite = [{
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
@@ -321,13 +262,13 @@ function createAuth(_ref) {
    */
 
 
-  const publicPages = [`${customPath}/api/__keystone_api_build`, `${customPath}/api/auth/csrf`, `${customPath}/api/auth/signin`, `${customPath}/api/auth/callback`, `${customPath}/api/auth/session`, `${customPath}/api/auth/providers`, `${customPath}/api/auth/signout`, `${customPath}/api/auth/error`]; // TODO: Add Provider Types
+  const authPublicPages = [`${customPath}/api/auth/csrf`, `${customPath}/api/auth/signin`, `${customPath}/api/auth/callback`, `${customPath}/api/auth/session`, `${customPath}/api/auth/providers`, `${customPath}/api/auth/signout`, `${customPath}/api/auth/error`]; // TODO: Add Provider Types
   // @ts-ignore
 
   function addPages(provider) {
     const name = provider.id;
-    publicPages.push(`${customPath}/api/auth/signin/${name}`);
-    publicPages.push(`${customPath}/api/auth/callback/${name}`);
+    authPublicPages.push(`${customPath}/api/auth/signin/${name}`);
+    authPublicPages.push(`${customPath}/api/auth/callback/${name}`);
   }
 
   _mapInstanceProperty__default["default"](providers).call(providers, addPages);
@@ -393,23 +334,24 @@ function createAuth(_ref) {
         var _req$headers, _req$headers$authoriz;
 
         let {
-          req,
-          createContext
+          context
         } = _ref3;
+        const {
+          req
+        } = context;
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
+        if (!req) return;
 
         if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth')) {
           return;
         }
 
-        const sudoContext = createContext({
-          sudo: true
-        });
+        const sudoContext = context.sudo();
 
         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,
+            req: req,
             secret: sessionSecret
           });
         } else {
@@ -429,8 +371,7 @@ function createAuth(_ref) {
           data: nextSession.data
         };
         const userSession = await get({
-          req: reqWithUser,
-          createContext
+          context
         });
         return _objectSpread(_objectSpread(_objectSpread({}, userSession), nextSession), {}, {
           data: nextSession.data,
@@ -440,16 +381,17 @@ function createAuth(_ref) {
       },
       end: async _ref4 => {
         let {
-          res,
-          req,
-          createContext
+          context
         } = _ref4;
         await end({
-          res,
-          req,
-          createContext
+          context
         });
         const TOKEN_NAME = '__Secure-next-auth.session-token' ;
+        const {
+          req,
+          res
+        } = context;
+        if (!req || !res) return;
         res.setHeader('Set-Cookie', cookie__namespace.serialize(TOKEN_NAME, '', {
           maxAge: 0,
           expires: new Date(),
@@ -463,6 +405,13 @@ function createAuth(_ref) {
       }
     });
   };
+
+  function defaultIsAccessAllowed(_ref5) {
+    let {
+      session
+    } = _ref5;
+    return session !== undefined;
+  }
   /**
    * withAuth
    *
@@ -476,35 +425,38 @@ function createAuth(_ref) {
 
 
   const withAuth = keystoneConfig => {
+    var _ui;
+
     validateConfig(keystoneConfig);
     let {
       ui
     } = keystoneConfig;
 
-    if (keystoneConfig.ui) {
-      var _keystoneConfig$ui;
-
-      ui = _objectSpread(_objectSpread({}, keystoneConfig.ui), {}, {
-        publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
-        getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
-        pageMiddleware: async args => {
-          var _keystoneConfig$ui2, _keystoneConfig$ui2$p;
-
-          return (await pageMiddleware(args)) ?? (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));
-        },
+    if (!((_ui = ui) !== null && _ui !== void 0 && _ui.isDisabled)) {
+      const {
+        getAdditionalFiles = [],
+        isAccessAllowed = defaultIsAccessAllowed,
+        pageMiddleware,
+        publicPages = []
+      } = ui || {};
+      ui = _objectSpread(_objectSpread({}, ui), {}, {
+        publicPages: [...publicPages, ...authPublicPages],
         isAccessAllowed: async context => {
-          var _keystoneConfig$ui3;
+          var _context$req;
 
-          const {
-            req
-          } = 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
+          const pathname = url__default["default"].parse((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url).pathname;
 
-          if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/')) {
+          if (_startsWithInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/_next`) || _startsWithInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/__next`) || _startsWithInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/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 true;
-          } // Allow keystone to access /api/__keystone_api_build for hot reloading
+          }
 
-          return (_keystoneConfig$ui3 = keystoneConfig.ui) !== null && _keystoneConfig$ui3 !== void 0 && _keystoneConfig$ui3.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined;
+          return await isAccessAllowed(context);
+        },
+        getAdditionalFiles: [...getAdditionalFiles, authGetAdditionalFiles],
+        pageMiddleware: async args => {
+          const shouldRedirect = await authMiddleware(args);
+          if (shouldRedirect) return shouldRedirect;
+          return pageMiddleware === null || pageMiddleware === void 0 ? void 0 : pageMiddleware(args);
         }
       });
     }

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

@@ -3,7 +3,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutPr
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringify';
-import _URL from '@babel/runtime-corejs3/core-js-stable/url';
+import _startsWithInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/starts-with';
 import url from 'url';
 import { getSession } from 'next-auth/react';
 import { getToken } from 'next-auth/jwt';
@@ -13,61 +13,12 @@ import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/insta
 import { graphql } from '@keystone-6/core';
 
 const template$1 = `
-const Path = require('path');
-// @ts-ignore
-const withPreconstruct = require('@preconstruct/next');
-
-module.exports = withPreconstruct({
-  typescript: {
-    ignoreBuildErrors: true,
-  },
-  env: {
-    NEXTAUTH_URL: process.env.NEXTAUTH_URL || 'http://localhost:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/auth',
-  },
-  eslint: {
-    ignoreDuringBuilds: true,
-  },
-  webpack(config, { isServer }) {
-    config.resolve.alias = {
-      ...config.resolve.alias,
-      react: Path.dirname(require.resolve('react/package.json')),
-      'react-dom': Path.dirname(require.resolve('react-dom/package.json')),
-      '@keystone-6/core': Path.dirname(
-        require.resolve('@keystone-6/core/package.json')
-      ),
-    };
-    if (isServer) {
-      config.externals = [
-        ...config.externals, 
-        /@keystone-6\\/core(?!\\/___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:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/__keystone_api_build',
-        basePath: false
-      }
-    ];
-  },
-  <% }%>
-  basePath: '<%= keystonePath || '' %>'
-  <% } %>
-});
-`;
+const keystoneConfig = require('@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/next-config').config;
+
+module.exports = {
+    ...keystoneConfig,
+    basePath: '<%= keystonePath || '' %>'
+};`;
 const nextConfigTemplate = _ref => {
   let {
     keystonePath
@@ -212,7 +163,7 @@ function createAuth(_ref) {
    *  - to the signin page when no valid session is present
    */
 
-  const pageMiddleware = async _ref2 => {
+  const authMiddleware = async _ref2 => {
     let {
       context,
       isValidSession
@@ -224,13 +175,6 @@ function createAuth(_ref) {
     const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin` || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn)) {
-        return {
-          kind: 'redirect',
-          to: `${customPath}`
-        };
-      }
-
       if (customPath !== '' && pathname === '/') {
         return {
           kind: 'redirect',
@@ -241,10 +185,6 @@ function createAuth(_ref) {
       return;
     }
 
-    if (_includesInstanceProperty(pathname).call(pathname, '/_next/') || _includesInstanceProperty(pathname).call(pathname, '/api/auth/') || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
-      return;
-    }
-
     if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
@@ -253,7 +193,7 @@ function createAuth(_ref) {
     }
   };
   /**
-   * getAdditionalFiles
+   * authGetAdditionalFiles
    *
    * This function adds files to be generated into the Admin UI build. Must be added to the
    * ui.getAdditionalFiles config.
@@ -262,7 +202,7 @@ function createAuth(_ref) {
    */
 
 
-  const getAdditionalFiles = () => {
+  const authGetAdditionalFiles = () => {
     const filesToWrite = [{
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
@@ -289,13 +229,13 @@ function createAuth(_ref) {
    */
 
 
-  const publicPages = [`${customPath}/api/__keystone_api_build`, `${customPath}/api/auth/csrf`, `${customPath}/api/auth/signin`, `${customPath}/api/auth/callback`, `${customPath}/api/auth/session`, `${customPath}/api/auth/providers`, `${customPath}/api/auth/signout`, `${customPath}/api/auth/error`]; // TODO: Add Provider Types
+  const authPublicPages = [`${customPath}/api/auth/csrf`, `${customPath}/api/auth/signin`, `${customPath}/api/auth/callback`, `${customPath}/api/auth/session`, `${customPath}/api/auth/providers`, `${customPath}/api/auth/signout`, `${customPath}/api/auth/error`]; // TODO: Add Provider Types
   // @ts-ignore
 
   function addPages(provider) {
     const name = provider.id;
-    publicPages.push(`${customPath}/api/auth/signin/${name}`);
-    publicPages.push(`${customPath}/api/auth/callback/${name}`);
+    authPublicPages.push(`${customPath}/api/auth/signin/${name}`);
+    authPublicPages.push(`${customPath}/api/auth/callback/${name}`);
   }
 
   _mapInstanceProperty(providers).call(providers, addPages);
@@ -361,23 +301,24 @@ function createAuth(_ref) {
         var _req$headers, _req$headers$authoriz;
 
         let {
-          req,
-          createContext
+          context
         } = _ref3;
+        const {
+          req
+        } = context;
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
+        if (!req) return;
 
         if (_includesInstanceProperty(pathname).call(pathname, '/api/auth')) {
           return;
         }
 
-        const sudoContext = createContext({
-          sudo: true
-        });
+        const sudoContext = context.sudo();
 
         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 getToken({
-            req,
+            req: req,
             secret: sessionSecret
           });
         } else {
@@ -397,8 +338,7 @@ function createAuth(_ref) {
           data: nextSession.data
         };
         const userSession = await get({
-          req: reqWithUser,
-          createContext
+          context
         });
         return _objectSpread(_objectSpread(_objectSpread({}, userSession), nextSession), {}, {
           data: nextSession.data,
@@ -408,16 +348,17 @@ function createAuth(_ref) {
       },
       end: async _ref4 => {
         let {
-          res,
-          req,
-          createContext
+          context
         } = _ref4;
         await end({
-          res,
-          req,
-          createContext
+          context
         });
         const TOKEN_NAME = process.env.NODE_ENV === 'production' ? '__Secure-next-auth.session-token' : 'next-auth.session-token';
+        const {
+          req,
+          res
+        } = context;
+        if (!req || !res) return;
         res.setHeader('Set-Cookie', cookie.serialize(TOKEN_NAME, '', {
           maxAge: 0,
           expires: new Date(),
@@ -431,6 +372,13 @@ function createAuth(_ref) {
       }
     });
   };
+
+  function defaultIsAccessAllowed(_ref5) {
+    let {
+      session
+    } = _ref5;
+    return session !== undefined;
+  }
   /**
    * withAuth
    *
@@ -444,40 +392,38 @@ function createAuth(_ref) {
 
 
   const withAuth = keystoneConfig => {
+    var _ui;
+
     validateConfig(keystoneConfig);
     let {
       ui
     } = keystoneConfig;
 
-    if (keystoneConfig.ui) {
-      var _keystoneConfig$ui;
-
-      ui = _objectSpread(_objectSpread({}, keystoneConfig.ui), {}, {
-        publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
-        getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
-        pageMiddleware: async args => {
-          var _keystoneConfig$ui2, _keystoneConfig$ui2$p;
-
-          return (await pageMiddleware(args)) ?? (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));
-        },
+    if (!((_ui = ui) !== null && _ui !== void 0 && _ui.isDisabled)) {
+      const {
+        getAdditionalFiles = [],
+        isAccessAllowed = defaultIsAccessAllowed,
+        pageMiddleware,
+        publicPages = []
+      } = ui || {};
+      ui = _objectSpread(_objectSpread({}, ui), {}, {
+        publicPages: [...publicPages, ...authPublicPages],
         isAccessAllowed: async context => {
-          var _context$req, _keystoneConfig$ui3;
-
-          const {
-            req
-          } = context;
-          const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
-
-          if (_includesInstanceProperty(pathname).call(pathname, '/_next/')) {
-            return true;
-          } // Allow keystone to access /api/__keystone_api_build for hot reloading
+          var _context$req;
 
+          const pathname = url.parse((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url).pathname;
 
-          if (process.env.NODE_ENV !== 'production' && ((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url) !== undefined && new _URL(context.req.url, 'http://example.com').pathname === `${customPath}/api/__keystone_api_build`) {
+          if (_startsWithInstanceProperty(pathname).call(pathname, `${customPath}/_next`) || _startsWithInstanceProperty(pathname).call(pathname, `${customPath}/__next`) || _startsWithInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`) || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
             return true;
           }
 
-          return (_keystoneConfig$ui3 = keystoneConfig.ui) !== null && _keystoneConfig$ui3 !== void 0 && _keystoneConfig$ui3.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined;
+          return await isAccessAllowed(context);
+        },
+        getAdditionalFiles: [...getAdditionalFiles, authGetAdditionalFiles],
+        pageMiddleware: async args => {
+          const shouldRedirect = await authMiddleware(args);
+          if (shouldRedirect) return shouldRedirect;
+          return pageMiddleware === null || pageMiddleware === void 0 ? void 0 : pageMiddleware(args);
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "25.0.0",
+  "version": "26.0.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -13,14 +13,14 @@
     "cross-fetch": "^3.1.5",
     "ejs": "^3.1.8",
     "fast-deep-equal": "^3.1.3",
-    "next-auth": "^4.14.0"
+    "next-auth": "^4.18.0"
   },
   "devDependencies": {
-    "@keystone-6/core": "3.0.0",
+    "@keystone-6/core": "4.0.1",
     "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "3.0.0",
+    "@keystone-6/core": "4.0.1",
     "react": "^18.2.0"
   },
   "publishConfig": {

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

@@ -168,9 +168,7 @@ function NextAuthPage(props) {
         let returnSession = session;
 
         if (!token.itemId) {
-          return {
-            expires: '0'
-          };
+          return session;
         } else {
           returnSession = _objectSpread(_objectSpread({}, session), {}, {
             data: token.data,
@@ -188,10 +186,15 @@ function NextAuthPage(props) {
           token
         } = _ref4;
         const identity = token.sub;
+
+        if (!identity) {
+          return token;
+        }
+
         const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 
         if (!result.success) {
-          token.itemId = null;
+          token.itemId = undefined;
         } else {
           token.itemId = result.item.id;
           const data = await query[listKey].findOne({

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

@@ -168,9 +168,7 @@ function NextAuthPage(props) {
         let returnSession = session;
 
         if (!token.itemId) {
-          return {
-            expires: '0'
-          };
+          return session;
         } else {
           returnSession = _objectSpread(_objectSpread({}, session), {}, {
             data: token.data,
@@ -188,10 +186,15 @@ function NextAuthPage(props) {
           token
         } = _ref4;
         const identity = token.sub;
+
+        if (!identity) {
+          return token;
+        }
+
         const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 
         if (!result.success) {
-          token.itemId = null;
+          token.itemId = undefined;
         } else {
           token.itemId = result.item.id;
           const data = await query[listKey].findOne({