@opensaas/keystone-nextjs-auth 18.0.0 → 20.0.0

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

@@ -9,13 +9,12 @@ var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instan
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
 var url = require('url');
-var client = require('next-auth/client');
-var Providers = require('next-auth/providers');
+var react = require('next-auth/react');
 var cookie = require('cookie');
 var ejs = require('ejs');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var graphql = require('graphql');
-var keystone = require('@keystone-next/keystone');
+var core = require('@keystone-6/core');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -42,7 +41,6 @@ var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstancePro
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
 var url__default = /*#__PURE__*/_interopDefault(url);
-var Providers__default = /*#__PURE__*/_interopDefault(Providers);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
 var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
@@ -64,14 +62,14 @@ module.exports = withPreconstruct({
       ...config.resolve.alias,
       react: Path.dirname(require.resolve('react/package.json')),
       'react-dom': Path.dirname(require.resolve('react-dom/package.json')),
-      '@keystone-next/keystone': Path.dirname(
-        require.resolve('@keystone-next/keystone/package.json')
+      '@keystone-6/core': Path.dirname(
+        require.resolve('@keystone-6/core/package.json')
       ),
     };
     if (isServer) {
       config.externals = [
         ...config.externals, 
-        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
+        /@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
@@ -90,7 +88,7 @@ module.exports = withPreconstruct({
     return [
       {
         source: '/api/__keystone_api_build',
-        destination: 'http://localhost:3000<%= keystonePath || '' %>/api/__keystone_api_build',
+        destination: 'http://localhost:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/__keystone_api_build',
         basePath: false
       }
     ];
@@ -116,8 +114,8 @@ function getBaseAuthSchema({
 }) {
   const extension = {
     query: {
-      authenticatedItem: keystone.graphql.field({
-        type: keystone.graphql.union({
+      authenticatedItem: core.graphql.field({
+        type: core.graphql.union({
           name: 'AuthenticatedItem',
           types: [base.object(listKey)],
           resolveType: (root, context) => {
@@ -154,7 +152,7 @@ const getSchemaExtension = ({
   identityField,
   listKey,
   gqlNames
-}) => keystone.graphql.extend(base => {
+}) => core.graphql.extend(base => {
   var _context;
 
   const uniqueWhereInputType = graphql.assertInputObjectType(base.schema.getType(`${listKey}WhereUniqueInput`));
@@ -185,6 +183,7 @@ export default getNextAuthPage({
         accountMap: <%- JSON.stringify(accountMap) %>,
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
+        sessionSecret: '<%= sessionSecret %>',
         providers: keystoneConfig.providers,
         query,
     });
@@ -197,7 +196,8 @@ const authTemplate = ({
   autoCreate,
   userMap,
   accountMap,
-  profileMap
+  profileMap,
+  sessionSecret
 }) => {
   const authOut = ejs__default["default"].render(template, {
     gqlNames,
@@ -207,13 +207,13 @@ const authTemplate = ({
     autoCreate,
     userMap,
     accountMap,
-    profileMap
+    profileMap,
+    sessionSecret
   });
   return authOut;
 };
 
 const _excluded = ["get"];
-const nextAuthProviders = Providers__default["default"];
 /**
  * createAuth function
  *
@@ -229,7 +229,8 @@ function createAuth({
   accountMap,
   profileMap,
   keystonePath,
-  providers
+  providers,
+  sessionSecret
 }) {
   // 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)
@@ -267,6 +268,10 @@ function createAuth({
     } = context;
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
+    if (pathname === `${customPath}/api/__keystone_api_build`) {
+      return;
+    }
+
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
         return {
@@ -275,6 +280,13 @@ function createAuth({
         };
       }
 
+      if (customPath !== '' && pathname === '/') {
+        return {
+          kind: 'redirect',
+          to: `${customPath}`
+        };
+      }
+
       return;
     }
 
@@ -307,7 +319,8 @@ function createAuth({
         autoCreate,
         userMap,
         accountMap,
-        profileMap
+        profileMap,
+        sessionSecret
       })
     }, {
       mode: 'write',
@@ -396,7 +409,7 @@ function createAuth({
           return;
         }
 
-        const nextSession = await client.getSession({
+        const nextSession = await react.getSession({
           req
         });
 
@@ -452,11 +465,11 @@ function createAuth({
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {
-          var _context$req, _keystoneConfig$ui3;
-
-          // Allow access to the adminMeta data from the /init path to correctly render that page
+          var _context$req2, _keystoneConfig$ui3;
           // even if the user isn't logged in (which should always be the case if they're seeing /init)
-          const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.headers;
+
+
+          const headers = (_context$req2 = context.req) === null || _context$req2 === void 0 ? void 0 : _context$req2.headers;
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
           const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL__default["default"](headers.referer) : undefined;
           const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
@@ -490,4 +503,3 @@ function createAuth({
 }
 
 exports.createAuth = createAuth;
-exports.nextAuthProviders = nextAuthProviders;

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

@@ -5,13 +5,12 @@ import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance
 import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringify';
 import _URL from '@babel/runtime-corejs3/core-js-stable/url';
 import url from 'url';
-import { getSession } from 'next-auth/client';
-import Providers from 'next-auth/providers';
+import { getSession } from 'next-auth/react';
 import * as cookie from 'cookie';
 import ejs from 'ejs';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
 import { assertInputObjectType, GraphQLString, GraphQLID } from 'graphql';
-import { graphql } from '@keystone-next/keystone';
+import { graphql } from '@keystone-6/core';
 
 const template$1 = `
 const Path = require('path');
@@ -30,14 +29,14 @@ module.exports = withPreconstruct({
       ...config.resolve.alias,
       react: Path.dirname(require.resolve('react/package.json')),
       'react-dom': Path.dirname(require.resolve('react-dom/package.json')),
-      '@keystone-next/keystone': Path.dirname(
-        require.resolve('@keystone-next/keystone/package.json')
+      '@keystone-6/core': Path.dirname(
+        require.resolve('@keystone-6/core/package.json')
       ),
     };
     if (isServer) {
       config.externals = [
         ...config.externals, 
-        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
+        /@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
@@ -56,7 +55,7 @@ module.exports = withPreconstruct({
     return [
       {
         source: '/api/__keystone_api_build',
-        destination: 'http://localhost:3000<%= keystonePath || '' %>/api/__keystone_api_build',
+        destination: 'http://localhost:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/__keystone_api_build',
         basePath: false
       }
     ];
@@ -151,6 +150,7 @@ export default getNextAuthPage({
         accountMap: <%- JSON.stringify(accountMap) %>,
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
+        sessionSecret: '<%= sessionSecret %>',
         providers: keystoneConfig.providers,
         query,
     });
@@ -163,7 +163,8 @@ const authTemplate = ({
   autoCreate,
   userMap,
   accountMap,
-  profileMap
+  profileMap,
+  sessionSecret
 }) => {
   const authOut = ejs.render(template, {
     gqlNames,
@@ -173,13 +174,13 @@ const authTemplate = ({
     autoCreate,
     userMap,
     accountMap,
-    profileMap
+    profileMap,
+    sessionSecret
   });
   return authOut;
 };
 
 const _excluded = ["get"];
-const nextAuthProviders = Providers;
 /**
  * createAuth function
  *
@@ -195,7 +196,8 @@ function createAuth({
   accountMap,
   profileMap,
   keystonePath,
-  providers
+  providers,
+  sessionSecret
 }) {
   // 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)
@@ -233,6 +235,10 @@ function createAuth({
     } = context;
     const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
+    if (pathname === `${customPath}/api/__keystone_api_build`) {
+      return;
+    }
+
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
         return {
@@ -241,6 +247,13 @@ function createAuth({
         };
       }
 
+      if (customPath !== '' && pathname === '/') {
+        return {
+          kind: 'redirect',
+          to: `${customPath}`
+        };
+      }
+
       return;
     }
 
@@ -273,7 +286,8 @@ function createAuth({
         autoCreate,
         userMap,
         accountMap,
-        profileMap
+        profileMap,
+        sessionSecret
       })
     }, {
       mode: 'write',
@@ -418,11 +432,15 @@ function createAuth({
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {
-          var _context$req, _keystoneConfig$ui3;
+          var _context$req, _context$req2, _keystoneConfig$ui3;
 
-          // Allow access to the adminMeta data from the /init path to correctly render that page
+          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;
+          } // Allow access to the adminMeta data from the /init path to correctly render that page
           // even if the user isn't logged in (which should always be the case if they're seeing /init)
-          const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.headers;
+
+
+          const headers = (_context$req2 = context.req) === null || _context$req2 === void 0 ? void 0 : _context$req2.headers;
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
           const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL(headers.referer) : undefined;
           const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
@@ -455,4 +473,4 @@ function createAuth({
   };
 }
 
-export { createAuth, nextAuthProviders };
+export { createAuth };

package/package.json

@@ -1,28 +1,27 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "18.0.0",
+  "version": "20.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.15.8",
-    "@babel/runtime-corejs3": "^7.15.4",
-    "@keystone-next/admin-ui-utils": "^6.0.0",
+    "@babel/runtime": "^7.16.3",
+    "@babel/runtime-corejs3": "^7.16.3",
     "@types/ejs": "^3.1.0",
     "cookie": "^0.4.1",
     "cross-fetch": "^3.1.4",
     "ejs": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
-    "graphql": "^15.6.1",
-    "next-auth": "^3.29.0"
+    "graphql": "^15.7.2",
+    "next-auth": "^4.0.5"
   },
   "devDependencies": {
-    "@keystone-next/keystone": "^29.0.0",
+    "@keystone-6/core": "^1.0.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^29.0.0",
+    "@keystone-6/core": "^1.0.0",
     "react": "^17.0.2"
   },
   "engines": {
@@ -34,6 +33,7 @@
   "preconstruct": {
     "entrypoints": [
       "index.ts",
+      "providers/*.ts",
       "pages/*.tsx"
     ]
   }

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

@@ -64,15 +64,21 @@ function NextAuthPage(props) {
     autoCreate,
     userMap,
     accountMap,
-    profileMap
+    profileMap,
+    sessionSecret
   } = props;
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
+    secret: sessionSecret,
     providers,
     callbacks: {
-      async signIn(user, account, profile) {
+      async signIn({
+        user,
+        account,
+        profile
+      }) {
         let identity;
 
         if (typeof user.id === 'string') {
@@ -126,11 +132,16 @@ function NextAuthPage(props) {
         }
       },
 
-      async redirect(url) {
+      async redirect({
+        url
+      }) {
         return url;
       },
 
-      async session(session, token) {
+      async session({
+        session,
+        token
+      }) {
         const returnSession = _objectSpread(_objectSpread({}, session), {}, {
           data: token.data,
           subject: token.sub,
@@ -141,7 +152,9 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt(token) {
+      async jwt({
+        token
+      }) {
         const identity = token.sub;
 
         if (!token.itemId) {

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

@@ -64,15 +64,21 @@ function NextAuthPage(props) {
     autoCreate,
     userMap,
     accountMap,
-    profileMap
+    profileMap,
+    sessionSecret
   } = props;
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
+    secret: sessionSecret,
     providers,
     callbacks: {
-      async signIn(user, account, profile) {
+      async signIn({
+        user,
+        account,
+        profile
+      }) {
         let identity;
 
         if (typeof user.id === 'string') {
@@ -126,11 +132,16 @@ function NextAuthPage(props) {
         }
       },
 
-      async redirect(url) {
+      async redirect({
+        url
+      }) {
         return url;
       },
 
-      async session(session, token) {
+      async session({
+        session,
+        token
+      }) {
         const returnSession = _objectSpread(_objectSpread({}, session), {}, {
           data: token.data,
           subject: token.sub,
@@ -141,7 +152,9 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt(token) {
+      async jwt({
+        token
+      }) {
         const identity = token.sub;
 
         if (!token.itemId) {

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

@@ -56,15 +56,21 @@ function NextAuthPage(props) {
     autoCreate,
     userMap,
     accountMap,
-    profileMap
+    profileMap,
+    sessionSecret
   } = props;
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth({
+    secret: sessionSecret,
     providers,
     callbacks: {
-      async signIn(user, account, profile) {
+      async signIn({
+        user,
+        account,
+        profile
+      }) {
         let identity;
 
         if (typeof user.id === 'string') {
@@ -118,11 +124,16 @@ function NextAuthPage(props) {
         }
       },
 
-      async redirect(url) {
+      async redirect({
+        url
+      }) {
         return url;
       },
 
-      async session(session, token) {
+      async session({
+        session,
+        token
+      }) {
         const returnSession = _objectSpread(_objectSpread({}, session), {}, {
           data: token.data,
           subject: token.sub,
@@ -133,7 +144,9 @@ function NextAuthPage(props) {
         return returnSession;
       },
 
-      async jwt(token) {
+      async jwt({
+        token
+      }) {
         const identity = token.sub;
 
         if (!token.itemId) {

package/providers/42-school/dist/opensaas-keystone-nextjs-auth-providers-42-school.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "../../../dist/declarations/src/providers/42-school";
+export { default } from "../../../dist/declarations/src/providers/42-school";

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

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _42School = require('next-auth/providers/42-school');
+
+
+
+Object.defineProperty(exports, 'default', {
+	enumerable: true,
+	get: function () { return _42School__namespace["default"]; }
+});
+Object.keys(_42School).forEach(function (k) {
+	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return _42School[k]; }
+	});
+});

package/providers/42-school/dist/opensaas-keystone-nextjs-auth-providers-42-school.cjs.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./opensaas-keystone-nextjs-auth-providers-42-school.cjs.prod.js");
+} else {
+  module.exports = require("./opensaas-keystone-nextjs-auth-providers-42-school.cjs.dev.js");
+}

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

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _42School = require('next-auth/providers/42-school');
+
+
+
+Object.defineProperty(exports, 'default', {
+	enumerable: true,
+	get: function () { return _42School__namespace["default"]; }
+});
+Object.keys(_42School).forEach(function (k) {
+	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return _42School[k]; }
+	});
+});

package/providers/42-school/dist/opensaas-keystone-nextjs-auth-providers-42-school.esm.js

@@ -0,0 +1,2 @@
+export * from 'next-auth/providers/42-school';
+export { default } from 'next-auth/providers/42-school';

package/providers/42-school/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/opensaas-keystone-nextjs-auth-providers-42-school.cjs.js",
+  "module": "dist/opensaas-keystone-nextjs-auth-providers-42-school.esm.js"
+}

package/providers/apple/dist/opensaas-keystone-nextjs-auth-providers-apple.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "../../../dist/declarations/src/providers/apple";
+export { default } from "../../../dist/declarations/src/providers/apple";

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

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var apple = require('next-auth/providers/apple');
+
+
+
+Object.defineProperty(exports, 'default', {
+	enumerable: true,
+	get: function () { return apple__namespace["default"]; }
+});
+Object.keys(apple).forEach(function (k) {
+	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return apple[k]; }
+	});
+});

package/providers/apple/dist/opensaas-keystone-nextjs-auth-providers-apple.cjs.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./opensaas-keystone-nextjs-auth-providers-apple.cjs.prod.js");
+} else {
+  module.exports = require("./opensaas-keystone-nextjs-auth-providers-apple.cjs.dev.js");
+}

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

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var apple = require('next-auth/providers/apple');
+
+
+
+Object.defineProperty(exports, 'default', {
+	enumerable: true,
+	get: function () { return apple__namespace["default"]; }
+});
+Object.keys(apple).forEach(function (k) {
+	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return apple[k]; }
+	});
+});

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

@@ -0,0 +1,2 @@
+export * from 'next-auth/providers/apple';
+export { default } from 'next-auth/providers/apple';

package/providers/apple/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/opensaas-keystone-nextjs-auth-providers-apple.cjs.js",
+  "module": "dist/opensaas-keystone-nextjs-auth-providers-apple.esm.js"
+}

package/providers/atlassian/dist/opensaas-keystone-nextjs-auth-providers-atlassian.cjs.d.ts

@@ -0,0 +1,2 @@
+export * from "../../../dist/declarations/src/providers/atlassian";
+export { default } from "../../../dist/declarations/src/providers/atlassian";

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

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var atlassian = require('next-auth/providers/atlassian');
+
+
+
+Object.defineProperty(exports, 'default', {
+	enumerable: true,
+	get: function () { return atlassian__namespace["default"]; }
+});
+Object.keys(atlassian).forEach(function (k) {
+	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return atlassian[k]; }
+	});
+});