@opensaas/keystone-nextjs-auth 25.0.0 → 27.0.0

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');
+const keystoneConfig = require('@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/next-config').config;
 
-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 || '' %>'
-  <% } %>
-});
-`;
+module.exports = {
+    ...keystoneConfig,
+    basePath: '<%= keystonePath || '' %>'
+};`;
 const nextConfigTemplate = _ref => {
   let {
     keystonePath
@@ -91,17 +42,14 @@ function getBaseAuthSchema(_ref) {
           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, _ref2) {
           let {
             session,
             db
           } = _ref2;
-
           if (typeof (session === null || session === void 0 ? void 0 : session.itemId) === 'string' && typeof session.listKey === 'string') {
             return db[session.listKey].findOne({
               where: {
@@ -109,10 +57,8 @@ function getBaseAuthSchema(_ref) {
               }
             });
           }
-
           return null;
         }
-
       })
     }
   };
@@ -127,7 +73,6 @@ const getSchemaExtension = _ref => {
   } = _ref;
   return graphql.extend(base => {
     var _context;
-
     const baseSchema = getBaseAuthSchema({
       listKey,
       base
@@ -177,6 +122,7 @@ const authTemplate = _ref => {
 };
 
 const _excluded = ["get", "end"];
+
 /**
  * createAuth function
  *
@@ -200,6 +146,7 @@ function createAuth(_ref) {
   // 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;
   /**
    * pageMiddleware
@@ -211,40 +158,25 @@ function createAuth(_ref) {
    *  - to the init page when initFirstItem is configured, and there are no user in the database
    *  - to the signin page when no valid session is present
    */
-
-  const pageMiddleware = async _ref2 => {
+  const authMiddleware = async _ref2 => {
     let {
       context,
-      isValidSession
+      wasAccessAllowed
     } = _ref2;
     const {
       req,
       session
     } = context;
     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 (wasAccessAllowed) {
       if (customPath !== '' && pathname === '/') {
         return {
           kind: 'redirect',
           to: `${customPath}`
         };
       }
-
       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',
@@ -252,17 +184,16 @@ 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.
    *
    * The signin page is always included, and the init page is included when initFirstItem is set
    */
-
-
-  const getAdditionalFiles = () => {
+  const authGetAdditionalFiles = () => {
     const filesToWrite = [{
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
@@ -282,102 +213,91 @@ function createAuth(_ref) {
     }];
     return filesToWrite;
   };
+
   /**
    * publicAuthPages
    *
    * Must be added to the ui.publicPages config
    */
-
-
-  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);
+
   /**
    * extendGraphqlSchema
    *
    * Must be added to the extendGraphqlSchema config. Can be composed.
    */
-
-
   const extendGraphqlSchema = getSchemaExtension({
     identityField,
     listKey
   });
+
   /**
    * validateConfig
    *
    * Validates the provided auth config; optional step when integrating auth
    */
-
   const validateConfig = keystoneConfig => {
     const listConfig = keystoneConfig.lists[listKey];
-
     if (listConfig === undefined) {
       const msg = `A createAuth() invocation specifies the list "${listKey}" but no list with that key has been defined.`;
       throw new Error(msg);
-    } // TODO: Check if providers
+    }
+
+    // TODO: Check if providers
     // TODO: Check other required commands/data
+
     // TODO: Check for String-like typing for identityField? How?
     // TODO: Validate that the identifyField is unique.
     // TODO: If this field isn't required, what happens if I try to log in as `null`?
-
-
     const identityFieldConfig = listConfig.fields[identityField];
-
     if (identityFieldConfig === undefined) {
       const identityFieldName = _JSON$stringify(identityField);
-
       const msg = `A createAuth() invocation for the "${listKey}" list specifies ${identityFieldName} as its identityField but no field with that key exists on the list.`;
       throw new Error(msg);
     }
   };
+
   /**
    * withItemData
    *
    * Automatically injects a session.data value with the authenticated item
    */
-
   /* TODO:
   - [ ] We could support additional where input to validate item sessions (e.g an isEnabled boolean)
   */
-
-
   const withItemData = _sessionStrategy => {
     const {
-      get,
-      end
-    } = _sessionStrategy,
-          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
-
+        get,
+        end
+      } = _sessionStrategy,
+      sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
       get: async _ref3 => {
         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 {
@@ -385,11 +305,9 @@ function createAuth(_ref) {
             req
           });
         }
-
         if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
           return;
         }
-
         const reqWithUser = req;
         reqWithUser.user = {
           istKey: nextSession.listKey,
@@ -397,8 +315,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 +325,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 +349,12 @@ function createAuth(_ref) {
       }
     });
   };
+  function defaultIsAccessAllowed(_ref5) {
+    let {
+      session
+    } = _ref5;
+    return session !== undefined;
+  }
   /**
    * withAuth
    *
@@ -441,47 +365,37 @@ function createAuth(_ref) {
    * It validates the auth config against the provided keystone config, and preserves existing
    * config by composing existing extendGraphqlSchema functions and ui config.
    */
-
-
   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
-
-
-          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`) {
+          var _context$req;
+          const pathname = url.parse((_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.url).pathname;
+          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);
         }
       });
     }
-
     if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
@@ -496,16 +410,15 @@ function createAuth(_ref) {
       extendGraphqlSchema: existingExtendGraphQLSchema ? schema => existingExtendGraphQLSchema(extendGraphqlSchema(schema)) : extendGraphqlSchema
     });
   };
-
   return {
-    withAuth // In the future we may want to return the following so that developers can
+    withAuth
+    // In the future we may want to return the following so that developers can
     // roll their own. This is pending a review of the use cases this might be
     // appropriate for, along with documentation and testing.
     // ui: { enableSessionItem: true, pageMiddleware, getAdditionalFiles, publicPages },
     // fields,
     // extendGraphqlSchema,
     // validateConfig,
-
   };
 }
 

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "25.0.0",
+  "version": "27.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.17.9",
-    "@babel/runtime-corejs3": "^7.17.9",
-    "@types/ejs": "^3.1.1",
+    "@babel/runtime": "^7.21.0",
+    "@babel/runtime-corejs3": "^7.21.0",
+    "@types/ejs": "^3.1.2",
     "cookie": "^0.5.0",
     "cross-fetch": "^3.1.5",
     "ejs": "^3.1.8",
     "fast-deep-equal": "^3.1.3",
-    "next-auth": "^4.14.0"
+    "next-auth": "^4.19.2"
   },
   "devDependencies": {
-    "@keystone-6/core": "3.0.0",
+    "@keystone-6/core": "5.0.0",
     "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "3.0.0",
+    "@keystone-6/core": "5.0.0",
     "react": "^18.2.0"
   },
   "publishConfig": {

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

@@ -14,21 +14,18 @@ async function findMatchingIdentity(identityField, identity, queryAPI) {
     where: {
       [identityField]: identity
     }
-  }); // Identity failures with helpful errors
-
+  });
+  // Identity failures with helpful errors
   let code;
-
   if (!item) {
     code = 'IDENTITY_NOT_FOUND';
   }
-
   if (code) {
     return {
       success: false,
       code
     };
   }
-
   return {
     success: true,
     item
@@ -40,14 +37,12 @@ async function validateNextAuth(identityField, identity, protectIdentities, item
   const {
     item
   } = match;
-
   if (item) {
     return {
       success: true,
       item
     };
   }
-
   return {
     success: false,
     code: protectIdentities ? 'FAILURE' : 'SUBJECT_NOT_FOUND'
@@ -69,17 +64,14 @@ function NextAuthPage(props) {
     sessionData,
     sessionSecret
   } = props;
-
   if (!query) {
     console.error('NextAuthPage got no query.');
     return null;
   }
-
   if (!providers || !providers.length) {
     console.error('You need to provide at least one provider.');
     return null;
   }
-
   const list = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
@@ -97,7 +89,6 @@ function NextAuthPage(props) {
           profile
         } = _ref;
         let identity;
-
         if (typeof user.id === 'string') {
           identity = user.id;
         } else if (typeof user.id === 'number') {
@@ -105,23 +96,20 @@ function NextAuthPage(props) {
         } else {
           identity = 0;
         }
-
         const userInput = resolver ? await resolver({
           user,
           account,
           profile
         }) : {};
-        const result = await validateNextAuth(identityField, identity, protectIdentities, list); // ID
-
+        const result = await validateNextAuth(identityField, identity, protectIdentities, list);
+        // ID
         const data = _objectSpread({
           [identityField]: identity
         }, userInput);
-
         if (!result.success) {
           if (!autoCreate) {
             return false;
           }
-
           const createUser = await list.createOne({
             data
           }).then(returned => {
@@ -135,7 +123,6 @@ function NextAuthPage(props) {
           });
           return createUser.success;
         }
-
         const updateUser = await list.updateOne({
           where: {
             id: result.item.id
@@ -152,25 +139,20 @@ function NextAuthPage(props) {
         });
         return updateUser.success;
       },
-
       async redirect(_ref2) {
         let {
           url
         } = _ref2;
         return url;
       },
-
       async session(_ref3) {
         let {
           session,
           token
         } = _ref3;
         let returnSession = session;
-
         if (!token.itemId) {
-          return {
-            expires: '0'
-          };
+          return session;
         } else {
           returnSession = _objectSpread(_objectSpread({}, session), {}, {
             data: token.data,
@@ -179,19 +161,19 @@ function NextAuthPage(props) {
             itemId: token.itemId
           });
         }
-
         return returnSession;
       },
-
       async jwt(_ref4) {
         let {
           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({
@@ -202,15 +184,12 @@ function NextAuthPage(props) {
           });
           token.data = data;
         }
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
           subject: token.sub,
           listKey
         });
-
         return returnToken;
       }
-
     }
   });
 }