@opensaas/keystone-nextjs-auth 16.0.0 → 18.0.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @opensaas-keystone/nextjs-auth
 
+## 18.0.1
+
+### Patch Changes
+
+- 9b6052a: Fix access issue to allow `/api/__keystone_api_build`
+
+## 18.0.0
+
+### Major Changes
+
+- cff5031: Upgrade to `"@keystone-next/keystone": "^29.0.0"` see https://keystonejs.com/releases/2021-11-24 for more information
+
+## 17.0.0
+
+### Major Changes
+
+- c619df8: Upgrade to `"@keystone-next/keystone": "28.0.0"`
+
+## 16.0.1
+
+### Patch Changes
+
+- 2e3ae54: Fix Nullish coalescing operator in next-config for older versions of node
+
 ## 16.0.0
 
 ### Major Changes

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

@@ -78,7 +78,7 @@ module.exports = withPreconstruct({
     // 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 = config.node) !== null && _config$node !== void 0 ? _config$node : config.node = {};
     config.node.__dirname = true;
     config.node.__filename = true;
     }
@@ -267,6 +267,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 {
@@ -452,11 +456,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__default["default"](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__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;

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

@@ -78,7 +78,7 @@ module.exports = withPreconstruct({
     // 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 = config.node) !== null && _config$node !== void 0 ? _config$node : config.node = {};
     config.node.__dirname = true;
     config.node.__filename = true;
     }
@@ -267,6 +267,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 {
@@ -452,11 +456,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;

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

@@ -44,7 +44,7 @@ module.exports = withPreconstruct({
     // 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 = config.node) !== null && _config$node !== void 0 ? _config$node : config.node = {};
     config.node.__dirname = true;
     config.node.__filename = true;
     }
@@ -233,6 +233,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 {
@@ -418,11 +422,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "16.0.0",
+  "version": "18.0.1",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -9,7 +9,7 @@
     "@babel/runtime": "^7.15.8",
     "@babel/runtime-corejs3": "^7.15.4",
     "@keystone-next/admin-ui-utils": "^6.0.0",
-    "@types/ejs": "^3.0.6",
+    "@types/ejs": "^3.1.0",
     "cookie": "^0.4.1",
     "cross-fetch": "^3.1.4",
     "ejs": "^3.1.6",
@@ -18,11 +18,11 @@
     "next-auth": "^3.29.0"
   },
   "devDependencies": {
-    "@keystone-next/keystone": "^27.0.1",
+    "@keystone-next/keystone": "^29.0.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^27.0.1",
+    "@keystone-next/keystone": "^29.0.0",
     "react": "^17.0.2"
   },
   "engines": {

package/src/index.ts

@@ -73,7 +73,9 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
   }) => {
     const { req, session } = context;
     const pathname = url.parse(req?.url!).pathname!;
-
+    if (pathname === `${customPath}/api/__keystone_api_build`) {
+      return;
+    }
     if (isValidSession) {
       if (pathname === `${customPath}/api/auth/signin`) {
         return { kind: 'redirect', to: `${customPath}` };
@@ -244,6 +246,14 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
           keystoneConfig?.ui?.pageMiddleware?.(args),
         enableSessionItem: true,
         isAccessAllowed: async (context: KeystoneContext) => {
+          if (
+            process.env.NODE_ENV !== 'production' &&
+            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?.headers;

package/src/templates/next-config.ts

@@ -31,7 +31,7 @@ module.exports = withPreconstruct({
     // 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 = config.node) !== null && _config$node !== void 0 ? _config$node : config.node = {};
     config.node.__dirname = true;
     config.node.__filename = true;
     }