@opensaas/keystone-nextjs-auth 13.0.2 → 14.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @opensaas-keystone/nextjs-auth
 
+## 14.0.0
+
+### Major Changes
+
+- 5a64376: Upgrade to keystone-next version 26
+
 ## 13.0.2
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ declare type NextAuthPageProps = {
     identityField: string;
     mutationName: string;
     providers: Provider[];
-    lists: KeystoneListsAPI<any>;
+    query: KeystoneListsAPI<any>;
     sessionData: string;
     listKey: string;
     autoCreate: boolean;

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

@@ -1,4 +1,4 @@
-import { BaseGeneratedListTypes, KeystoneContext, KeystoneConfig } from '@keystone-next/types';
+import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-next/keystone/types';
 import { Provider } from 'next-auth/providers';
 export declare type AuthGqlNames = {
     CreateInitialInput: string;
@@ -8,18 +8,6 @@ export declare type AuthGqlNames = {
     ItemAuthenticationWithPasswordSuccess: string;
     ItemAuthenticationWithPasswordFailure: string;
 };
-export declare type SendTokenFn = (args: {
-    itemId: string | number;
-    identity: string;
-    token: string;
-    context: KeystoneContext;
-}) => Promise<void> | void;
-export declare type AuthTokenTypeConfig = {
-    /** Called when a user should be sent the magic signin token they requested */
-    sendToken: SendTokenFn;
-    /** How long do tokens stay valid for from time of issue, in minutes * */
-    tokensValidForMins?: number;
-};
 export declare type NextAuthSession = {
     listKey: string;
     itemId: string;

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

@@ -164,7 +164,7 @@ const getSchemaExtension = ({
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -177,7 +177,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 const authTemplate = ({
@@ -448,7 +448,7 @@ function createAuth({
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.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().lists[listKey].count({})) === 0;
+          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;
           return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });

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

@@ -164,7 +164,7 @@ const getSchemaExtension = ({
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -177,7 +177,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 const authTemplate = ({
@@ -448,7 +448,7 @@ function createAuth({
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.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().lists[listKey].count({})) === 0;
+          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;
           return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });

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

@@ -127,7 +127,7 @@ const getSchemaExtension = ({
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -140,7 +140,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 const authTemplate = ({
@@ -411,7 +411,7 @@ function createAuth({
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.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().lists[listKey].count({})) === 0;
+          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;
           return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "13.0.2",
+  "version": "14.0.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -10,21 +10,19 @@
     "@babel/runtime-corejs3": "^7.15.3",
     "@graphql-tools/merge": "^6.2.14",
     "@keystone-next/admin-ui-utils": "^6.0.0",
-    "@keystone-next/fields": "^15.0.0",
-    "@keystone-next/types": "^25.0.0",
     "@types/ejs": "^3.0.6",
     "cookie": "^0.4.1",
     "cross-fetch": "^3.1.4",
     "ejs": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
-    "next-auth": "^3.28.0"
+    "next-auth": "^3.29.0"
   },
   "devDependencies": {
-    "@keystone-next/keystone": "^25.0.0",
+    "@keystone-next/keystone": "^26.0.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^25.0.0",
+    "@keystone-next/keystone": "^26.0.0",
     "react": "^17.0.2"
   },
   "engines": {

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

@@ -62,7 +62,7 @@ async function validateNextAuth(list, identityField, identity, protectIdentities
 function NextAuthPage(props) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -71,15 +71,15 @@ function NextAuthPage(props) {
     accountMap,
     profileMap
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default['default']({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
         const identity = user.id;
-        const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+        const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
         const data = {}; // eslint-disable-next-line no-restricted-syntax
 
         for (const key in userMap) {
@@ -146,13 +146,13 @@ function NextAuthPage(props) {
         const identity = token.sub;
 
         if (!token.itemId) {
-          const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+          const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: {
               id: result.item.id
             },

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

@@ -62,7 +62,7 @@ async function validateNextAuth(list, identityField, identity, protectIdentities
 function NextAuthPage(props) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -71,15 +71,15 @@ function NextAuthPage(props) {
     accountMap,
     profileMap
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default['default']({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
         const identity = user.id;
-        const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+        const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
         const data = {}; // eslint-disable-next-line no-restricted-syntax
 
         for (const key in userMap) {
@@ -146,13 +146,13 @@ function NextAuthPage(props) {
         const identity = token.sub;
 
         if (!token.itemId) {
-          const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+          const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: {
               id: result.item.id
             },

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

@@ -54,7 +54,7 @@ async function validateNextAuth(list, identityField, identity, protectIdentities
 function NextAuthPage(props) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -63,15 +63,15 @@ function NextAuthPage(props) {
     accountMap,
     profileMap
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
         const identity = user.id;
-        const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+        const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
         const data = {}; // eslint-disable-next-line no-restricted-syntax
 
         for (const key in userMap) {
@@ -138,13 +138,13 @@ function NextAuthPage(props) {
         const identity = token.sub;
 
         if (!token.itemId) {
-          const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+          const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: {
               id: result.item.id
             },

package/src/index.ts

@@ -256,7 +256,7 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
           const accessingInitPage =
             thisUrl?.pathname === '/init' &&
             thisUrl?.host === host &&
-            (await context.sudo().lists[listKey].count({})) === 0;
+            (await context.sudo().query[listKey].count({})) === 0;
           return (
             accessingInitPage ||
             (keystoneConfig.ui?.isAccessAllowed

package/src/pages/NextAuthPage.tsx

@@ -8,7 +8,7 @@ type NextAuthPageProps = {
   identityField: string;
   mutationName: string;
   providers: Provider[];
-  lists: KeystoneListsAPI<any>;
+  query: KeystoneListsAPI<any>;
   sessionData: string;
   listKey: string;
   autoCreate: boolean;
@@ -20,7 +20,7 @@ type NextAuthPageProps = {
 export default function NextAuthPage(props: NextAuthPageProps) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -29,8 +29,8 @@ export default function NextAuthPage(props: NextAuthPageProps) {
     accountMap,
     profileMap,
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
 
   return NextAuth({
@@ -43,7 +43,7 @@ export default function NextAuthPage(props: NextAuthPageProps) {
           identityField,
           identity,
           protectIdentities,
-          itemAPI
+          queryAPI
         );
         const data = {};
         // eslint-disable-next-line no-restricted-syntax
@@ -113,14 +113,14 @@ export default function NextAuthPage(props: NextAuthPageProps) {
             identityField,
             identity,
             protectIdentities,
-            itemAPI
+            queryAPI
           );
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: { id: result.item.id },
             query: sessionData || 'id',
           });

package/src/templates/auth.ts

@@ -4,7 +4,7 @@ import { AuthGqlNames } from '../types';
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -17,7 +17,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 

package/src/types.ts

@@ -1,8 +1,7 @@
 import {
   BaseGeneratedListTypes,
-  KeystoneContext,
   KeystoneConfig,
-} from '@keystone-next/types';
+} from '@keystone-next/keystone/types';
 import { Provider } from 'next-auth/providers';
 
 export type AuthGqlNames = {
@@ -14,20 +13,6 @@ export type AuthGqlNames = {
   ItemAuthenticationWithPasswordFailure: string;
 };
 
-export type SendTokenFn = (args: {
-  itemId: string | number;
-  identity: string;
-  token: string;
-  context: KeystoneContext;
-}) => Promise<void> | void;
-
-export type AuthTokenTypeConfig = {
-  /** Called when a user should be sent the magic signin token they requested */
-  sendToken: SendTokenFn;
-  /** How long do tokens stay valid for from time of issue, in minutes * */
-  tokensValidForMins?: number;
-};
-
 export type NextAuthSession = { listKey: string; itemId: string; data: any };
 
 export type NextAuthProviders = [Provider];