@opensaas/keystone-nextjs-auth 17.0.0 → 19.1.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @opensaas-keystone/nextjs-auth
 
+## 19.1.0
+
+### Minor Changes
+
+- fa61bd9: Allow custom port to be defined by env `PORT` as well as a custom path
+
+## 19.0.0
+
+### Major Changes
+
+- 5ac88ef: Upgrade to `keystone-6/core` for more information see https://keystonejs.com/releases/2021-12-01
+
+## 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

package/dist/declarations/src/gql/getBaseAuthSchema.d.ts

@@ -1,5 +1,5 @@
-import type { ItemRootValue } from '@keystone-next/keystone/types';
-import { graphql } from '@keystone-next/keystone';
+import type { BaseItem } from '@keystone-6/core/types';
+import { graphql } from '@keystone-6/core';
 import { AuthGqlNames } from '../types';
 export declare function getBaseAuthSchema({ listKey, gqlNames, base, }: {
     listKey: string;
@@ -8,7 +8,7 @@ export declare function getBaseAuthSchema({ listKey, gqlNames, base, }: {
 }): {
     extension: {
         query: {
-            authenticatedItem: import("@graphql-ts/schema").Field<unknown, {}, import("@graphql-ts/schema").UnionType<ItemRootValue, import("@keystone-next/keystone/types").KeystoneContext>, string, import("@keystone-next/keystone/types").KeystoneContext>;
+            authenticatedItem: import("@graphql-ts/schema").Field<unknown, {}, import("@graphql-ts/schema").UnionType<BaseItem, graphql.Context>, string, graphql.Context>;
         };
     };
 };

package/dist/declarations/src/index.d.ts

@@ -1,4 +1,4 @@
-import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-next/keystone/types';
+import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-6/core/types';
 import { AuthConfig, KeystoneAuthConfig } from './types';
 export declare const nextAuthProviders: import("next-auth/providers").BuiltInProviders;
 /**

package/dist/declarations/src/lib/validateNextAuth.d.ts

@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
+import type { KeystoneListsAPI } from '@keystone-6/core/types';
 import { NextAuthErrorCode } from '../types';
 export declare function validateNextAuth(list: any, identityField: string, identity: string | number, protectIdentities: boolean, itemAPI: KeystoneListsAPI<any>[string]): Promise<{
     success: false;

package/dist/declarations/src/pages/NextAuthPage.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from 'next-auth/providers';
-import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
+import type { KeystoneListsAPI } from '@keystone-6/core/types';
 declare type NextAuthPageProps = {
     identityField: string;
     mutationName: string;

package/dist/declarations/src/schema.d.ts

@@ -1,4 +1,4 @@
-import { ExtendGraphqlSchema } from '@keystone-next/keystone/types';
+import { ExtendGraphqlSchema } from '@keystone-6/core/types';
 import { AuthGqlNames } from './types';
 export declare const getSchemaExtension: ({ identityField, listKey, gqlNames, }: {
     identityField: string;

package/dist/declarations/src/types.d.ts

@@ -1,4 +1,4 @@
-import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-next/keystone/types';
+import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
 import { Provider } from 'next-auth/providers';
 export declare type AuthGqlNames = {
     CreateInitialInput: string;
@@ -18,7 +18,7 @@ declare type KeytoneAuthProviders = {
     providers: NextAuthProviders;
 };
 export declare type KeystoneAuthConfig = KeystoneConfig & KeytoneAuthProviders;
-export declare type AuthConfig<GeneratedListTypes extends BaseGeneratedListTypes> = {
+export declare type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
     /** The key of the list to authenticate users with */
     listKey: GeneratedListTypes['key'];
     /** The path of the field the identity is stored in; must be text-ish */

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

@@ -15,7 +15,7 @@ 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 }; }
 
@@ -64,14 +64,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 +90,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 +116,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 +154,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`));
@@ -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

@@ -15,7 +15,7 @@ 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 }; }
 
@@ -64,14 +64,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 +90,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 +116,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 +154,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`));
@@ -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

@@ -11,7 +11,7 @@ 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 +30,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 +56,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
       }
     ];
@@ -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,28 +1,27 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "17.0.0",
+  "version": "19.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.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",
+    "graphql": "^15.7.2",
     "next-auth": "^3.29.0"
   },
   "devDependencies": {
-    "@keystone-next/keystone": "^28.0.0",
+    "@keystone-6/core": "^1.0.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^28.0.0",
+    "@keystone-6/core": "^1.0.0",
     "react": "^17.0.2"
   },
   "engines": {

package/src/gql/getBaseAuthSchema.ts

@@ -1,5 +1,5 @@
-import type { ItemRootValue } from '@keystone-next/keystone/types';
-import { graphql } from '@keystone-next/keystone';
+import type { BaseItem } from '@keystone-6/core/types';
+import { graphql } from '@keystone-6/core';
 
 import { AuthGqlNames } from '../types';
 
@@ -17,7 +17,7 @@ export function getBaseAuthSchema({
       authenticatedItem: graphql.field({
         type: graphql.union({
           name: 'AuthenticatedItem',
-          types: [base.object(listKey) as graphql.ObjectType<ItemRootValue>],
+          types: [base.object(listKey) as graphql.ObjectType<BaseItem>],
           resolveType: (root, context) => context.session?.listKey,
         }),
         resolve(root, args, { session, db }) {

package/src/gql/getInitFirstItemSchema.ts

@@ -1,7 +1,7 @@
 import type {
   GraphQLSchemaExtension,
   KeystoneContext,
-} from '@keystone-next/keystone/types';
+} from '@keystone-6/core/types';
 import {
   assertInputObjectType,
   GraphQLInputObjectType,

package/src/index.ts

@@ -6,7 +6,7 @@ import {
   KeystoneContext,
   AdminUIConfig,
   SessionStrategy,
-} from '@keystone-next/keystone/types';
+} from '@keystone-6/core/types';
 import { getSession } from 'next-auth/client';
 import Providers from 'next-auth/providers';
 import * as cookie from 'cookie';
@@ -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/lib/validateNextAuth.ts

@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
+import type { KeystoneListsAPI } from '@keystone-6/core/types';
 import { NextAuthErrorCode } from '../types';
 import { findMatchingIdentity } from './findMatchingIdentity';
 

package/src/pages/NextAuthPage.tsx

@@ -1,6 +1,6 @@
 import NextAuth from 'next-auth';
 import { Provider } from 'next-auth/providers';
-import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
+import type { KeystoneListsAPI } from '@keystone-6/core/types';
 import { validateNextAuth } from '../lib/validateNextAuth';
 
 // Need to bring in correct props

package/src/schema.ts

@@ -1,7 +1,7 @@
-import { ExtendGraphqlSchema } from '@keystone-next/keystone/types';
+import { ExtendGraphqlSchema } from '@keystone-6/core/types';
 
 import { assertInputObjectType, GraphQLString, GraphQLID } from 'graphql';
-import { graphql } from '@keystone-next/keystone';
+import { graphql } from '@keystone-6/core';
 import { AuthGqlNames } from './types';
 import { getBaseAuthSchema } from './gql/getBaseAuthSchema';
 

package/src/templates/next-config.ts

@@ -17,14 +17,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
@@ -43,7 +43,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
       }
     ];

package/src/types.ts

@@ -1,7 +1,4 @@
-import {
-  BaseGeneratedListTypes,
-  KeystoneConfig,
-} from '@keystone-next/keystone/types';
+import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
 import { Provider } from 'next-auth/providers';
 
 export type AuthGqlNames = {
@@ -23,7 +20,7 @@ type KeytoneAuthProviders = {
 
 export type KeystoneAuthConfig = KeystoneConfig & KeytoneAuthProviders;
 
-export type AuthConfig<GeneratedListTypes extends BaseGeneratedListTypes> = {
+export type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
   /** The key of the list to authenticate users with */
   listKey: GeneratedListTypes['key'];
   /** The path of the field the identity is stored in; must be text-ish */