@opensaas/keystone-nextjs-auth 24.1.0 → 25.0.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @opensaas-keystone/nextjs-auth
 
+## 25.0.0
+
+### Major Changes
+
+- a759195: Upgrade to keystone-6@3.0.0
+
+### Minor Changes
+
+- 44031fa: Update `next-auth` to `4.14`
+
 ## 24.1.0
 
 ### Minor Changes

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

@@ -6,7 +6,7 @@ export declare function getBaseAuthSchema({ listKey, base, }: {
 }): {
     extension: {
         query: {
-            authenticatedItem: import("@graphql-ts/schema").Field<unknown, {}, import("@graphql-ts/schema").UnionType<BaseItem, graphql.Context>, string, graphql.Context>;
+            authenticatedItem: import("@graphql-ts/schema").Field<unknown, {}, import("@graphql-ts/schema").UnionType<BaseItem, graphql.Context>, string, import("@keystone-6/core/types").KeystoneContext<import("@keystone-6/core/types").BaseKeystoneTypeInfo>>;
         };
     };
 };

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

@@ -170,21 +170,12 @@ const getSchemaExtension = _ref => {
 };
 
 const template = `
+import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 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 cleanConfig = (config) => {
-  const { db, ...rest } = config;
-  if (db) {
-    const { onConnect, ...restDB } = db;
-    return { ...rest, db: restDB };
-  }
-  return rest;
-};
+import * as PrismaModule from '.prisma/client';
 
-const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
+const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
@@ -502,7 +493,6 @@ function createAuth(_ref) {
 
           return (await pageMiddleware(args)) ?? (keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args));
         },
-        enableSessionItem: true,
         isAccessAllowed: async context => {
           var _context$req, _keystoneConfig$ui3;
 
@@ -536,9 +526,6 @@ function createAuth(_ref) {
       resolver,
       session,
       lists: _objectSpread({}, keystoneConfig.lists),
-      experimental: _objectSpread(_objectSpread({}, keystoneConfig.experimental), {}, {
-        generateNodeAPI: true
-      }),
       extendGraphqlSchema: existingExtendGraphQLSchema ? schema => existingExtendGraphQLSchema(extendGraphqlSchema(schema)) : extendGraphqlSchema
     });
   };

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

@@ -169,21 +169,12 @@ const getSchemaExtension = _ref => {
 };
 
 const template = `
+import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 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 cleanConfig = (config) => {
-  const { db, ...rest } = config;
-  if (db) {
-    const { onConnect, ...restDB } = db;
-    return { ...rest, db: restDB };
-  }
-  return rest;
-};
+import * as PrismaModule from '.prisma/client';
 
-const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
+const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
@@ -501,7 +492,6 @@ function createAuth(_ref) {
 
           return (await pageMiddleware(args)) ?? (keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args));
         },
-        enableSessionItem: true,
         isAccessAllowed: async context => {
           var _keystoneConfig$ui3;
 
@@ -530,9 +520,6 @@ function createAuth(_ref) {
       resolver,
       session,
       lists: _objectSpread({}, keystoneConfig.lists),
-      experimental: _objectSpread(_objectSpread({}, keystoneConfig.experimental), {}, {
-        generateNodeAPI: true
-      }),
       extendGraphqlSchema: existingExtendGraphQLSchema ? schema => existingExtendGraphQLSchema(extendGraphqlSchema(schema)) : extendGraphqlSchema
     });
   };

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

@@ -137,21 +137,12 @@ const getSchemaExtension = _ref => {
 };
 
 const template = `
+import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 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 cleanConfig = (config) => {
-  const { db, ...rest } = config;
-  if (db) {
-    const { onConnect, ...restDB } = db;
-    return { ...rest, db: restDB };
-  }
-  return rest;
-};
+import * as PrismaModule from '.prisma/client';
 
-const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
+const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
@@ -469,7 +460,6 @@ function createAuth(_ref) {
 
           return (await pageMiddleware(args)) ?? (keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args));
         },
-        enableSessionItem: true,
         isAccessAllowed: async context => {
           var _context$req, _keystoneConfig$ui3;
 
@@ -503,9 +493,6 @@ function createAuth(_ref) {
       resolver,
       session,
       lists: _objectSpread({}, keystoneConfig.lists),
-      experimental: _objectSpread(_objectSpread({}, keystoneConfig.experimental), {}, {
-        generateNodeAPI: true
-      }),
       extendGraphqlSchema: existingExtendGraphQLSchema ? schema => existingExtendGraphQLSchema(extendGraphqlSchema(schema)) : extendGraphqlSchema
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "24.1.0",
+  "version": "25.0.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -13,19 +13,16 @@
     "cross-fetch": "^3.1.5",
     "ejs": "^3.1.8",
     "fast-deep-equal": "^3.1.3",
-    "next-auth": "^4.10.3"
+    "next-auth": "^4.14.0"
   },
   "devDependencies": {
-    "@keystone-6/core": "^2.2.0",
+    "@keystone-6/core": "3.0.0",
     "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "^2.2.0",
+    "@keystone-6/core": "3.0.0",
     "react": "^18.2.0"
   },
-  "engines": {
-    "node": "^14.13 || >= 16.13"
-  },
   "publishConfig": {
     "access": "public"
   },

package/src/index.ts

@@ -14,7 +14,7 @@ import { Provider } from 'next-auth/providers';
 
 import * as cookie from 'cookie';
 
-import { Session } from 'next-auth';
+import { JWT, Session } from 'next-auth';
 import { nextConfigTemplate } from './templates/next-config';
 // import * as Path from 'path';
 
@@ -199,17 +199,17 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
       ...sessionStrategy,
       get: async ({ req, createContext }) => {
         const pathname = url.parse(req?.url!).pathname!;
-        let nextSession: Session;
+        let nextSession: Session | JWT | null;
         if (pathname.includes('/api/auth')) {
           return;
         }
         const sudoContext = createContext({ sudo: true });
 
         if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
-          nextSession = (await getToken({
+          nextSession = await getToken({
             req,
             secret: sessionSecret,
-          })) as Session;
+          });
         } else {
           nextSession = (await getSession({ req })) as Session;
         }
@@ -284,7 +284,6 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
         getAdditionalFiles: [...(keystoneConfig.ui?.getAdditionalFiles || []), getAdditionalFiles],
         pageMiddleware: async args =>
           (await pageMiddleware(args)) ?? keystoneConfig?.ui?.pageMiddleware?.(args),
-        enableSessionItem: true,
         isAccessAllowed: async (context: KeystoneContext) => {
           const { req } = context;
           const pathname = url.parse(req?.url!).pathname!;
@@ -326,10 +325,6 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
       lists: {
         ...keystoneConfig.lists,
       },
-      experimental: {
-        ...keystoneConfig.experimental,
-        generateNodeAPI: true,
-      },
       extendGraphqlSchema: existingExtendGraphQLSchema
         ? schema => existingExtendGraphQLSchema(extendGraphqlSchema(schema))
         : extendGraphqlSchema,

package/src/templates/auth.ejs

@@ -1,16 +1,20 @@
-import getNextAuthPage from '@opensaas-keystone/nextjs-auth/pages/NextAuthPage';
-import { nextAuthProviders as Providers } from '@opensaas-keystone/nextjs-auth';
+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';
+
+const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
+
+if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
 export default getNextAuthPage({
+        autoCreate: <%= autoCreate %>,
         identityField: '<%= identityField %>',
-        mutationName: '<%= gqlNames.authenticateItemWithPassword %>',
-        providers:[ <% providers.forEach(provider => { %>
-            Providers.<%= provider.name %>({
-                <% const providerConf = provider.config;
-                for (const key in providerConf) { %>
-                    <%= key %>: '<%= providerConf[key] %>',
-                <%}%>
-                }),
-        <% }) %>
-        ],
+        listKey: '<%= listKey %>',
+        pages: keystoneConfig.pages,
+        providers: keystoneConfig.providers,
+        query: keystoneQueryAPI,
+        resolver: keystoneConfig.resolver,
+        sessionData: '<%= sessionData %>',
+        sessionSecret: '<%= sessionSecret %>',
     });

package/src/templates/auth.ts

@@ -2,21 +2,12 @@ import ejs from 'ejs';
 import { NextAuthTemplateProps } from '../pages/NextAuthPage';
 
 const template = `
+import { getContext } from '@keystone-6/core/context';
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 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';
+import * as PrismaModule from '.prisma/client';
 
-const cleanConfig = (config) => {
-  const { db, ...rest } = config;
-  if (db) {
-    const { onConnect, ...restDB } = db;
-    return { ...rest, db: restDB };
-  }
-  return rest;
-};
-
-const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(cleanConfig(keystoneConfig), PrismaClient);
+const keystoneQueryAPI = global.keystoneQueryAPI || getContext(keystoneConfig, PrismaModule).sudo().query;
 
 if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI