@opensaas/keystone-nextjs-auth 21.1.1 → 22.2.0

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

@@ -131,8 +131,17 @@ const getSchemaExtension = ({
 
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
-import { query } from '.keystone/api';
 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 prisma = global.prisma || PrismaClient
+
+if (process.env.NODE_ENV !== 'production') global.prisma = prisma
+
+const query = global.query || createQueryAPI(keystoneConfig, prisma);
+
+if (process.env.NODE_ENV !== 'production') global.query = query
 
 export default getNextAuthPage({
         autoCreate: <%= autoCreate %>,
@@ -163,7 +172,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get", "start"];
+const _excluded = ["get", "end"];
 /**
  * createAuth function
  *
@@ -186,7 +195,7 @@ function createAuth({
   // 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;
+  const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
   /**
    * pageMiddleware
    *
@@ -209,16 +218,16 @@ function createAuth({
     const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      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",
+          kind: 'redirect',
           to: `${customPath}`
         };
       }
 
-      if (customPath !== "" && pathname === "/") {
+      if (customPath !== '' && pathname === '/') {
         return {
-          kind: "redirect",
+          kind: 'redirect',
           to: `${customPath}`
         };
       }
@@ -226,13 +235,13 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty(pathname).call(pathname, "/_next/") || _includesInstanceProperty(pathname).call(pathname, "/api/auth/") || _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
+    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",
+        kind: 'redirect',
         to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
@@ -249,8 +258,8 @@ function createAuth({
 
   const getAdditionalFiles = () => {
     const filesToWrite = [{
-      mode: "write",
-      outputPath: "pages/api/auth/[...nextauth].js",
+      mode: 'write',
+      outputPath: 'pages/api/auth/[...nextauth].js',
       src: authTemplate({
         autoCreate,
         identityField,
@@ -259,8 +268,8 @@ function createAuth({
         sessionSecret
       })
     }, {
-      mode: "write",
-      outputPath: "next.config.js",
+      mode: 'write',
+      outputPath: 'next.config.js',
       src: nextConfigTemplate({
         keystonePath: customPath
       })
@@ -337,64 +346,70 @@ function createAuth({
   const withItemData = _sessionStrategy => {
     const {
       get,
-      start
+      end
     } = _sessionStrategy,
           sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      start: async ({
-        res
-      }) => {
-        console.log("start");
-        const session = await start({
-          res
-        });
-        return session;
-      },
       get: async ({
-        req
+        req,
+        createContext
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
+        const session = await get({
+          req,
+          createContext
+        });
+        const sudoContext = createContext({
+          sudo: true
+        });
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        let nextSession;
 
-        if (_includesInstanceProperty(pathname).call(pathname, "/api/auth")) {
+        if (_includesInstanceProperty(pathname).call(pathname, '/api/auth')) {
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(" ")[0]) === "Bearer") {
-          var _token$data;
-
-          const token = await getToken({
+        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,
             secret: sessionSecret
           });
-
-          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
-            return token;
-          }
+        } else {
+          nextSession = await getSession({
+            req
+          });
         }
 
-        const nextSession = await getSession({
-          req
-        });
-
-        if (nextSession) {
-          return nextSession;
+        if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
+          return;
         }
+
+        return _objectSpread(_objectSpread({}, nextSession), {}, {
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId
+        }, session);
       },
       end: async ({
         res,
-        req
+        req,
+        createContext
       }) => {
-        const TOKEN_NAME = process.env.NODE_ENV === "production" ? "__Secure-next-auth.session-token" : "next-auth.session-token";
-        res.setHeader("Set-Cookie", cookie.serialize(TOKEN_NAME, "", {
+        await end({
+          res,
+          req,
+          createContext
+        });
+        const TOKEN_NAME = process.env.NODE_ENV === 'production' ? '__Secure-next-auth.session-token' : 'next-auth.session-token';
+        res.setHeader('Set-Cookie', cookie.serialize(TOKEN_NAME, '', {
           maxAge: 0,
           expires: new Date(),
           httpOnly: true,
-          secure: process.env.NODE_ENV === "production",
-          path: "/",
-          sameSite: "lax",
+          secure: process.env.NODE_ENV === 'production',
+          path: '/',
+          sameSite: 'lax',
           // TODO: Update parse to URL
           domain: url.parse(req.url).hostname
         }));
@@ -439,12 +454,12 @@ function createAuth({
           } = 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/")) {
+          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`) {
+          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`) {
             return true;
           }
 
@@ -453,7 +468,7 @@ function createAuth({
       });
     }
 
-    if (!keystoneConfig.session) throw new TypeError("Missing .session configuration");
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
     const session = withItemData(keystoneConfig.session);
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "21.1.1",
+  "version": "22.2.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -17,16 +17,14 @@
   },
   "devDependencies": {
     "@keystone-6/core": "^1.1.0",
-    "next": "12.1.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
     "@keystone-6/core": "^1.1.0",
-    "next": "12.1.0",
     "react": "^17.0.2"
   },
   "engines": {
-    "node": "^12.20 || >= 14.13"
+    "node": "^14.13 || >= 16.13"
   },
   "publishConfig": {
     "access": "public"

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

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var NextAuth = require('next-auth');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
-var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var NextAuth__default = /*#__PURE__*/_interopDefault(NextAuth);
 
 async function findMatchingIdentity(identityField, identity, queryAPI) {
@@ -70,9 +68,7 @@ function NextAuthPage(props) {
     resolver,
     sessionData,
     sessionSecret
-  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
-
-  console.log('NextAuthPages... ', pages);
+  } = props;
 
   if (!query) {
     console.error('NextAuthPage got no query.');
@@ -85,7 +81,6 @@ function NextAuthPage(props) {
   }
 
   const list = query[listKey];
-  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
     cookies,
@@ -115,7 +110,7 @@ function NextAuthPage(props) {
           account,
           profile
         }) : {};
-        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI); // ID
+        const result = await validateNextAuth(identityField, identity, protectIdentities, list); // ID
 
         const data = _objectSpread({
           [identityField]: identity
@@ -123,26 +118,38 @@ function NextAuthPage(props) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log('`autoCreate` if set to `false`, skipping user auto-creation');
             return false;
           }
 
-          console.log('`autoCreate` if set to `true`, auto-creating a new user');
           const createUser = await list.createOne({
             data
           }).then(returned => {
-            console.log('User Created', _JSON$stringify__default["default"](returned));
-            return true;
+            return {
+              success: true,
+              user: returned
+            };
           }).catch(error => {
-            console.log(error);
+            console.error(error);
             throw new Error(error);
           });
-          console.log('Created User', createUser);
-          return createUser;
-        } // await list.updateOne({where: {id: result.item.id}, data});
-
+          return createUser.success;
+        }
 
-        return result.success;
+        const updateUser = await list.updateOne({
+          where: {
+            id: result.item.id
+          },
+          data
+        }).then(returned => {
+          return {
+            success: true,
+            user: returned
+          };
+        }).catch(error => {
+          console.error(error);
+          throw new Error(error);
+        });
+        return updateUser.success;
       },
 
       async redirect({
@@ -155,12 +162,20 @@ function NextAuthPage(props) {
         session,
         token
       }) {
-        const returnSession = _objectSpread(_objectSpread({}, session), {}, {
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId
-        });
+        let returnSession = session;
+
+        if (!token.itemId) {
+          return {
+            expires: '0'
+          };
+        } else {
+          returnSession = _objectSpread(_objectSpread({}, session), {}, {
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey,
+            itemId: token.itemId
+          });
+        }
 
         return returnSession;
       },
@@ -169,26 +184,22 @@ function NextAuthPage(props) {
         token
       }) {
         const identity = token.sub;
+        const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 
-        if (!token.itemId) {
-          const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-
-          if (!result.success) {
-            return token;
-          }
-
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: {
+              id: token.itemId
+            },
+            query: sessionData || 'id'
+          });
+          token.data = data;
         }
 
-        const data = await query[listKey].findOne({
-          where: {
-            id: token.itemId
-          },
-          query: sessionData || 'id'
-        });
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-          data,
           subject: token.sub,
           listKey
         });

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

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var NextAuth = require('next-auth');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
-var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var NextAuth__default = /*#__PURE__*/_interopDefault(NextAuth);
 
 async function findMatchingIdentity(identityField, identity, queryAPI) {
@@ -70,9 +68,7 @@ function NextAuthPage(props) {
     resolver,
     sessionData,
     sessionSecret
-  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
-
-  console.log('NextAuthPages... ', pages);
+  } = props;
 
   if (!query) {
     console.error('NextAuthPage got no query.');
@@ -85,7 +81,6 @@ function NextAuthPage(props) {
   }
 
   const list = query[listKey];
-  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
     cookies,
@@ -115,7 +110,7 @@ function NextAuthPage(props) {
           account,
           profile
         }) : {};
-        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI); // ID
+        const result = await validateNextAuth(identityField, identity, protectIdentities, list); // ID
 
         const data = _objectSpread({
           [identityField]: identity
@@ -123,26 +118,38 @@ function NextAuthPage(props) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log('`autoCreate` if set to `false`, skipping user auto-creation');
             return false;
           }
 
-          console.log('`autoCreate` if set to `true`, auto-creating a new user');
           const createUser = await list.createOne({
             data
           }).then(returned => {
-            console.log('User Created', _JSON$stringify__default["default"](returned));
-            return true;
+            return {
+              success: true,
+              user: returned
+            };
           }).catch(error => {
-            console.log(error);
+            console.error(error);
             throw new Error(error);
           });
-          console.log('Created User', createUser);
-          return createUser;
-        } // await list.updateOne({where: {id: result.item.id}, data});
-
+          return createUser.success;
+        }
 
-        return result.success;
+        const updateUser = await list.updateOne({
+          where: {
+            id: result.item.id
+          },
+          data
+        }).then(returned => {
+          return {
+            success: true,
+            user: returned
+          };
+        }).catch(error => {
+          console.error(error);
+          throw new Error(error);
+        });
+        return updateUser.success;
       },
 
       async redirect({
@@ -155,12 +162,20 @@ function NextAuthPage(props) {
         session,
         token
       }) {
-        const returnSession = _objectSpread(_objectSpread({}, session), {}, {
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId
-        });
+        let returnSession = session;
+
+        if (!token.itemId) {
+          return {
+            expires: '0'
+          };
+        } else {
+          returnSession = _objectSpread(_objectSpread({}, session), {}, {
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey,
+            itemId: token.itemId
+          });
+        }
 
         return returnSession;
       },
@@ -169,26 +184,22 @@ function NextAuthPage(props) {
         token
       }) {
         const identity = token.sub;
+        const result = await validateNextAuth(identityField, identity, protectIdentities, list);
 
-        if (!token.itemId) {
-          const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-
-          if (!result.success) {
-            return token;
-          }
-
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: {
+              id: token.itemId
+            },
+            query: sessionData || 'id'
+          });
+          token.data = data;
         }
 
-        const data = await query[listKey].findOne({
-          where: {
-            id: token.itemId
-          },
-          query: sessionData || 'id'
-        });
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-          data,
           subject: token.sub,
           listKey
         });