@opensaas/keystone-nextjs-auth 26.0.0 → 27.1.0

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "26.0.0",
+  "version": "27.1.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.18.0"
+    "next-auth": "^4.19.2"
   },
   "devDependencies": {
-    "@keystone-6/core": "4.0.1",
+    "@keystone-6/core": "5.0.0",
     "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "4.0.1",
+    "@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,21 +139,18 @@ 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 session;
         } else {
@@ -177,22 +161,17 @@ 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 = undefined;
         } else {
@@ -205,15 +184,12 @@ function NextAuthPage(props) {
           });
           token.data = data;
         }
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
           subject: token.sub,
           listKey
         });
-
         return returnToken;
       }
-
     }
   });
 }

package/pages/NextAuthPage/dist/opensaas-keystone-nextjs-auth-pages-NextAuthPage.cjs.prod.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,21 +139,18 @@ 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 session;
         } else {
@@ -177,22 +161,17 @@ 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 = undefined;
         } else {
@@ -205,15 +184,12 @@ function NextAuthPage(props) {
           });
           token.data = data;
         }
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
           subject: token.sub,
           listKey
         });
-
         return returnToken;
       }
-
     }
   });
 }

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

@@ -6,21 +6,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
@@ -32,14 +29,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'
@@ -61,17 +56,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({
@@ -89,7 +81,6 @@ function NextAuthPage(props) {
           profile
         } = _ref;
         let identity;
-
         if (typeof user.id === 'string') {
           identity = user.id;
         } else if (typeof user.id === 'number') {
@@ -97,23 +88,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 => {
@@ -127,7 +115,6 @@ function NextAuthPage(props) {
           });
           return createUser.success;
         }
-
         const updateUser = await list.updateOne({
           where: {
             id: result.item.id
@@ -144,21 +131,18 @@ 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 session;
         } else {
@@ -169,22 +153,17 @@ 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 = undefined;
         } else {
@@ -197,15 +176,12 @@ function NextAuthPage(props) {
           });
           token.data = data;
         }
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
           subject: token.sub,
           listKey
         });
-
         return returnToken;
       }
-
     }
   });
 }

package/src/index.ts

@@ -1,4 +1,5 @@
 import url from 'url';
+import path from 'path';
 import {
   AdminFileToWrite,
   BaseListTypeInfo,
@@ -61,18 +62,18 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    */
   const authMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] = async ({
     context,
-    isValidSession,
+    wasAccessAllowed,
   }) => {
-    const { req, session } = context;
+    const { req } = context;
     const pathname = url.parse(req?.url!).pathname!;
 
-    if (isValidSession) {
+    if (wasAccessAllowed) {
       if (customPath !== '' && pathname === '/') {
         return { kind: 'redirect', to: `${customPath}` };
       }
       return;
     }
-    if (!session && !pathname.includes(`${customPath}/api/auth/`)) {
+    if (!wasAccessAllowed && !pathname.includes(`${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
         to: pages?.signIn || `${customPath}/api/auth/signin`,
@@ -88,7 +89,10 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    *
    * The signin page is always included, and the init page is included when initFirstItem is set
    */
-  const authGetAdditionalFiles = () => {
+  const authGetAdditionalFiles = (config: KeystoneConfig) => {
+    const prismaClientPath = config.db.prismaClientPath
+      ? path.join('../../../../../', config.db.prismaClientPath)
+      : '@prisma/client';
     const filesToWrite: AdminFileToWrite[] = [
       {
         mode: 'write',
@@ -99,6 +103,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
           listKey,
           sessionData,
           sessionSecret,
+          prismaClientPath,
         }),
       },
       {

package/src/pages/NextAuthPage.tsx

@@ -10,6 +10,7 @@ export type NextAuthTemplateProps = {
   listKey: string;
   sessionData: string | undefined;
   sessionSecret: string;
+  prismaClientPath: string;
 };
 
 export type CoreNextAuthPageProps = {

package/src/templates/auth.ts

@@ -5,7 +5,7 @@ const template = `
 import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import keystoneConfig from '../../../../../keystone';
-import * as PrismaModule from '.prisma/client';
+import * as PrismaModule from '<%= prismaClientPath %>';
 
 const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
@@ -30,6 +30,7 @@ export const authTemplate = ({
   listKey,
   sessionData,
   sessionSecret,
+  prismaClientPath,
 }: NextAuthTemplateProps) => {
   const authOut = ejs.render(template, {
     identityField,
@@ -37,6 +38,7 @@ export const authTemplate = ({
     listKey,
     autoCreate,
     sessionSecret,
+    prismaClientPath,
   });
   return authOut;
 };