@opensaas/keystone-nextjs-auth 24.0.0 → 24.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @opensaas-keystone/nextjs-auth
 
+## 24.1.0
+
+### Minor Changes
+
+- ae15a2c: Update dependency @keystone-6/core to ^2.2.0
+- b730bff: Update react monorepo (minor)
+
+### Patch Changes
+
+- 0a7d339: Update patch dependencies (patch)
+- 7d40c8b: Fix keystone `onConnect` running on next-auth initialisation
+
 ## 24.0.0
 
 ### Major Changes

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

@@ -101,19 +101,21 @@ module.exports = withPreconstruct({
   <% } %>
 });
 `;
-const nextConfigTemplate = ({
-  keystonePath
-}) => {
+const nextConfigTemplate = _ref => {
+  let {
+    keystonePath
+  } = _ref;
   const nextConfigOut = ejs__default["default"].render(template$1, {
     keystonePath
   });
   return nextConfigOut;
 };
 
-function getBaseAuthSchema({
-  listKey,
-  base
-}) {
+function getBaseAuthSchema(_ref) {
+  let {
+    listKey,
+    base
+  } = _ref;
   const extension = {
     query: {
       authenticatedItem: core.graphql.field({
@@ -127,10 +129,12 @@ function getBaseAuthSchema({
           }
         }),
 
-        resolve(root, args, {
-          session,
-          db
-        }) {
+        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: {
@@ -150,17 +154,20 @@ function getBaseAuthSchema({
   };
 }
 
-const getSchemaExtension = ({
-  listKey
-}) => core.graphql.extend(base => {
-  var _context;
+const getSchemaExtension = _ref => {
+  let {
+    listKey
+  } = _ref;
+  return core.graphql.extend(base => {
+    var _context;
 
-  const baseSchema = getBaseAuthSchema({
-    listKey,
-    base
+    const baseSchema = getBaseAuthSchema({
+      listKey,
+      base
+    });
+    return _filterInstanceProperty__default["default"](_context = [baseSchema.extension]).call(_context, x => x !== undefined);
   });
-  return _filterInstanceProperty__default["default"](_context = [baseSchema.extension]).call(_context, x => x !== undefined);
-});
+};
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
@@ -168,7 +175,16 @@ 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 keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
+const cleanConfig = (config) => {
+  const { db, ...rest } = config;
+  if (db) {
+    const { onConnect, ...restDB } = db;
+    return { ...rest, db: restDB };
+  }
+  return rest;
+};
+
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
@@ -184,13 +200,14 @@ export default getNextAuthPage({
         sessionSecret: '<%= sessionSecret %>',
     });
   `;
-const authTemplate = ({
-  autoCreate,
-  identityField,
-  listKey,
-  sessionData,
-  sessionSecret
-}) => {
+const authTemplate = _ref => {
+  let {
+    autoCreate,
+    identityField,
+    listKey,
+    sessionData,
+    sessionSecret
+  } = _ref;
   const authOut = ejs__default["default"].render(template, {
     identityField,
     sessionData,
@@ -208,18 +225,19 @@ const _excluded = ["get", "end"];
  * Generates config for Keystone to implement standard auth features.
  */
 
-function createAuth({
-  autoCreate,
-  cookies,
-  identityField,
-  listKey,
-  keystonePath,
-  pages,
-  resolver,
-  providers,
-  sessionData,
-  sessionSecret
-}) {
+function createAuth(_ref) {
+  let {
+    autoCreate,
+    cookies,
+    identityField,
+    listKey,
+    keystonePath,
+    pages,
+    resolver,
+    providers,
+    sessionData,
+    sessionSecret
+  } = _ref;
   // The protectIdentities flag is currently under review to see whether it should be
   // 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
@@ -236,10 +254,11 @@ function createAuth({
    *  - to the signin page when no valid session is present
    */
 
-  const pageMiddleware = async ({
-    context,
-    isValidSession
-  }) => {
+  const pageMiddleware = async _ref2 => {
+    let {
+      context,
+      isValidSession
+    } = _ref2;
     const {
       req,
       session
@@ -380,12 +399,13 @@ function createAuth({
           sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      get: async ({
-        req,
-        createContext
-      }) => {
+      get: async _ref3 => {
         var _req$headers, _req$headers$authoriz;
 
+        let {
+          req,
+          createContext
+        } = _ref3;
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
 
@@ -428,11 +448,12 @@ function createAuth({
           itemId: nextSession.itemId
         });
       },
-      end: async ({
-        res,
-        req,
-        createContext
-      }) => {
+      end: async _ref4 => {
+        let {
+          res,
+          req,
+          createContext
+        } = _ref4;
         await end({
           res,
           req,

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

@@ -100,19 +100,21 @@ module.exports = withPreconstruct({
   <% } %>
 });
 `;
-const nextConfigTemplate = ({
-  keystonePath
-}) => {
+const nextConfigTemplate = _ref => {
+  let {
+    keystonePath
+  } = _ref;
   const nextConfigOut = ejs__default["default"].render(template$1, {
     keystonePath
   });
   return nextConfigOut;
 };
 
-function getBaseAuthSchema({
-  listKey,
-  base
-}) {
+function getBaseAuthSchema(_ref) {
+  let {
+    listKey,
+    base
+  } = _ref;
   const extension = {
     query: {
       authenticatedItem: core.graphql.field({
@@ -126,10 +128,12 @@ function getBaseAuthSchema({
           }
         }),
 
-        resolve(root, args, {
-          session,
-          db
-        }) {
+        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: {
@@ -149,17 +153,20 @@ function getBaseAuthSchema({
   };
 }
 
-const getSchemaExtension = ({
-  listKey
-}) => core.graphql.extend(base => {
-  var _context;
+const getSchemaExtension = _ref => {
+  let {
+    listKey
+  } = _ref;
+  return core.graphql.extend(base => {
+    var _context;
 
-  const baseSchema = getBaseAuthSchema({
-    listKey,
-    base
+    const baseSchema = getBaseAuthSchema({
+      listKey,
+      base
+    });
+    return _filterInstanceProperty__default["default"](_context = [baseSchema.extension]).call(_context, x => x !== undefined);
   });
-  return _filterInstanceProperty__default["default"](_context = [baseSchema.extension]).call(_context, x => x !== undefined);
-});
+};
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
@@ -167,7 +174,16 @@ 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 keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
+const cleanConfig = (config) => {
+  const { db, ...rest } = config;
+  if (db) {
+    const { onConnect, ...restDB } = db;
+    return { ...rest, db: restDB };
+  }
+  return rest;
+};
+
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
@@ -183,13 +199,14 @@ export default getNextAuthPage({
         sessionSecret: '<%= sessionSecret %>',
     });
   `;
-const authTemplate = ({
-  autoCreate,
-  identityField,
-  listKey,
-  sessionData,
-  sessionSecret
-}) => {
+const authTemplate = _ref => {
+  let {
+    autoCreate,
+    identityField,
+    listKey,
+    sessionData,
+    sessionSecret
+  } = _ref;
   const authOut = ejs__default["default"].render(template, {
     identityField,
     sessionData,
@@ -207,18 +224,19 @@ const _excluded = ["get", "end"];
  * Generates config for Keystone to implement standard auth features.
  */
 
-function createAuth({
-  autoCreate,
-  cookies,
-  identityField,
-  listKey,
-  keystonePath,
-  pages,
-  resolver,
-  providers,
-  sessionData,
-  sessionSecret
-}) {
+function createAuth(_ref) {
+  let {
+    autoCreate,
+    cookies,
+    identityField,
+    listKey,
+    keystonePath,
+    pages,
+    resolver,
+    providers,
+    sessionData,
+    sessionSecret
+  } = _ref;
   // The protectIdentities flag is currently under review to see whether it should be
   // 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
@@ -235,10 +253,11 @@ function createAuth({
    *  - to the signin page when no valid session is present
    */
 
-  const pageMiddleware = async ({
-    context,
-    isValidSession
-  }) => {
+  const pageMiddleware = async _ref2 => {
+    let {
+      context,
+      isValidSession
+    } = _ref2;
     const {
       req,
       session
@@ -379,12 +398,13 @@ function createAuth({
           sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      get: async ({
-        req,
-        createContext
-      }) => {
+      get: async _ref3 => {
         var _req$headers, _req$headers$authoriz;
 
+        let {
+          req,
+          createContext
+        } = _ref3;
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
 
@@ -427,11 +447,12 @@ function createAuth({
           itemId: nextSession.itemId
         });
       },
-      end: async ({
-        res,
-        req,
-        createContext
-      }) => {
+      end: async _ref4 => {
+        let {
+          res,
+          req,
+          createContext
+        } = _ref4;
         await end({
           res,
           req,

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

@@ -68,19 +68,21 @@ module.exports = withPreconstruct({
   <% } %>
 });
 `;
-const nextConfigTemplate = ({
-  keystonePath
-}) => {
+const nextConfigTemplate = _ref => {
+  let {
+    keystonePath
+  } = _ref;
   const nextConfigOut = ejs.render(template$1, {
     keystonePath
   });
   return nextConfigOut;
 };
 
-function getBaseAuthSchema({
-  listKey,
-  base
-}) {
+function getBaseAuthSchema(_ref) {
+  let {
+    listKey,
+    base
+  } = _ref;
   const extension = {
     query: {
       authenticatedItem: graphql.field({
@@ -94,10 +96,12 @@ function getBaseAuthSchema({
           }
         }),
 
-        resolve(root, args, {
-          session,
-          db
-        }) {
+        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: {
@@ -117,17 +121,20 @@ function getBaseAuthSchema({
   };
 }
 
-const getSchemaExtension = ({
-  listKey
-}) => graphql.extend(base => {
-  var _context;
+const getSchemaExtension = _ref => {
+  let {
+    listKey
+  } = _ref;
+  return graphql.extend(base => {
+    var _context;
 
-  const baseSchema = getBaseAuthSchema({
-    listKey,
-    base
+    const baseSchema = getBaseAuthSchema({
+      listKey,
+      base
+    });
+    return _filterInstanceProperty(_context = [baseSchema.extension]).call(_context, x => x !== undefined);
   });
-  return _filterInstanceProperty(_context = [baseSchema.extension]).call(_context, x => x !== undefined);
-});
+};
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
@@ -135,7 +142,16 @@ 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 keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
+const cleanConfig = (config) => {
+  const { db, ...rest } = config;
+  if (db) {
+    const { onConnect, ...restDB } = db;
+    return { ...rest, db: restDB };
+  }
+  return rest;
+};
+
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
@@ -151,13 +167,14 @@ export default getNextAuthPage({
         sessionSecret: '<%= sessionSecret %>',
     });
   `;
-const authTemplate = ({
-  autoCreate,
-  identityField,
-  listKey,
-  sessionData,
-  sessionSecret
-}) => {
+const authTemplate = _ref => {
+  let {
+    autoCreate,
+    identityField,
+    listKey,
+    sessionData,
+    sessionSecret
+  } = _ref;
   const authOut = ejs.render(template, {
     identityField,
     sessionData,
@@ -175,18 +192,19 @@ const _excluded = ["get", "end"];
  * Generates config for Keystone to implement standard auth features.
  */
 
-function createAuth({
-  autoCreate,
-  cookies,
-  identityField,
-  listKey,
-  keystonePath,
-  pages,
-  resolver,
-  providers,
-  sessionData,
-  sessionSecret
-}) {
+function createAuth(_ref) {
+  let {
+    autoCreate,
+    cookies,
+    identityField,
+    listKey,
+    keystonePath,
+    pages,
+    resolver,
+    providers,
+    sessionData,
+    sessionSecret
+  } = _ref;
   // The protectIdentities flag is currently under review to see whether it should be
   // 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
@@ -203,10 +221,11 @@ function createAuth({
    *  - to the signin page when no valid session is present
    */
 
-  const pageMiddleware = async ({
-    context,
-    isValidSession
-  }) => {
+  const pageMiddleware = async _ref2 => {
+    let {
+      context,
+      isValidSession
+    } = _ref2;
     const {
       req,
       session
@@ -347,12 +366,13 @@ function createAuth({
           sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      get: async ({
-        req,
-        createContext
-      }) => {
+      get: async _ref3 => {
         var _req$headers, _req$headers$authoriz;
 
+        let {
+          req,
+          createContext
+        } = _ref3;
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
 
@@ -395,11 +415,12 @@ function createAuth({
           itemId: nextSession.itemId
         });
       },
-      end: async ({
-        res,
-        req,
-        createContext
-      }) => {
+      end: async _ref4 => {
+        let {
+          res,
+          req,
+          createContext
+        } = _ref4;
         await end({
           res,
           req,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "24.0.0",
+  "version": "24.1.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -13,15 +13,15 @@
     "cross-fetch": "^3.1.5",
     "ejs": "^3.1.8",
     "fast-deep-equal": "^3.1.3",
-    "next-auth": "^4.10.2"
+    "next-auth": "^4.10.3"
   },
   "devDependencies": {
-    "@keystone-6/core": "^2.1.0",
-    "react": "^18.1.0"
+    "@keystone-6/core": "^2.2.0",
+    "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "^2.1.0",
-    "react": "^18.1.0"
+    "@keystone-6/core": "^2.2.0",
+    "react": "^18.2.0"
   },
   "engines": {
     "node": "^14.13 || >= 16.13"

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

@@ -90,11 +90,12 @@ function NextAuthPage(props) {
     jwt: jwt || {},
     secret: sessionSecret,
     callbacks: {
-      async signIn({
-        user,
-        account,
-        profile
-      }) {
+      async signIn(_ref) {
+        let {
+          user,
+          account,
+          profile
+        } = _ref;
         let identity;
 
         if (typeof user.id === 'string') {
@@ -152,16 +153,18 @@ function NextAuthPage(props) {
         return updateUser.success;
       },
 
-      async redirect({
-        url
-      }) {
+      async redirect(_ref2) {
+        let {
+          url
+        } = _ref2;
         return url;
       },
 
-      async session({
-        session,
-        token
-      }) {
+      async session(_ref3) {
+        let {
+          session,
+          token
+        } = _ref3;
         let returnSession = session;
 
         if (!token.itemId) {
@@ -180,9 +183,10 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt({
-        token
-      }) {
+      async jwt(_ref4) {
+        let {
+          token
+        } = _ref4;
         const identity = token.sub;
         const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 

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

@@ -90,11 +90,12 @@ function NextAuthPage(props) {
     jwt: jwt || {},
     secret: sessionSecret,
     callbacks: {
-      async signIn({
-        user,
-        account,
-        profile
-      }) {
+      async signIn(_ref) {
+        let {
+          user,
+          account,
+          profile
+        } = _ref;
         let identity;
 
         if (typeof user.id === 'string') {
@@ -152,16 +153,18 @@ function NextAuthPage(props) {
         return updateUser.success;
       },
 
-      async redirect({
-        url
-      }) {
+      async redirect(_ref2) {
+        let {
+          url
+        } = _ref2;
         return url;
       },
 
-      async session({
-        session,
-        token
-      }) {
+      async session(_ref3) {
+        let {
+          session,
+          token
+        } = _ref3;
         let returnSession = session;
 
         if (!token.itemId) {
@@ -180,9 +183,10 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt({
-        token
-      }) {
+      async jwt(_ref4) {
+        let {
+          token
+        } = _ref4;
         const identity = token.sub;
         const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 

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

@@ -82,11 +82,12 @@ function NextAuthPage(props) {
     jwt: jwt || {},
     secret: sessionSecret,
     callbacks: {
-      async signIn({
-        user,
-        account,
-        profile
-      }) {
+      async signIn(_ref) {
+        let {
+          user,
+          account,
+          profile
+        } = _ref;
         let identity;
 
         if (typeof user.id === 'string') {
@@ -144,16 +145,18 @@ function NextAuthPage(props) {
         return updateUser.success;
       },
 
-      async redirect({
-        url
-      }) {
+      async redirect(_ref2) {
+        let {
+          url
+        } = _ref2;
         return url;
       },
 
-      async session({
-        session,
-        token
-      }) {
+      async session(_ref3) {
+        let {
+          session,
+          token
+        } = _ref3;
         let returnSession = session;
 
         if (!token.itemId) {
@@ -172,9 +175,10 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt({
-        token
-      }) {
+      async jwt(_ref4) {
+        let {
+          token
+        } = _ref4;
         const identity = token.sub;
         const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 

package/src/templates/auth.ts

@@ -7,7 +7,16 @@ 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 keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
+const cleanConfig = (config) => {
+  const { db, ...rest } = config;
+  if (db) {
+    const { onConnect, ...restDB } = db;
+    return { ...rest, db: restDB };
+  }
+  return rest;
+};
+
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI