@opensaas/keystone-nextjs-auth 20.3.0 → 21.0.0

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

@@ -1,15 +1,17 @@
 import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutProperties';
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
+import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
+import _Object$values from '@babel/runtime-corejs3/core-js-stable/object/values';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 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/react';
+import { getToken } from 'next-auth/jwt';
 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-6/core';
 
 const template$1 = `
@@ -21,6 +23,9 @@ module.exports = withPreconstruct({
   typescript: {
     ignoreBuildErrors: true,
   },
+  env: {
+    NEXTAUTH_URL: process.env.NEXTAUTH_URL || 'http://localhost:<%= process.env.PORT || 3000 %><%= keystonePath || '' %>/api/auth',
+  },
   eslint: {
     ignoreDuringBuilds: true,
   },
@@ -76,7 +81,6 @@ const nextConfigTemplate = ({
 
 function getBaseAuthSchema({
   listKey,
-  gqlNames,
   base
 }) {
   const extension = {
@@ -116,22 +120,12 @@ function getBaseAuthSchema({
 }
 
 const getSchemaExtension = ({
-  identityField,
-  listKey,
-  gqlNames
+  listKey
 }) => graphql.extend(base => {
   var _context;
 
-  const uniqueWhereInputType = assertInputObjectType(base.schema.getType(`${listKey}WhereUniqueInput`));
-  const identityFieldOnUniqueWhere = uniqueWhereInputType.getFields()[identityField];
-
-  if ((identityFieldOnUniqueWhere === null || identityFieldOnUniqueWhere === void 0 ? void 0 : identityFieldOnUniqueWhere.type) !== GraphQLString && (identityFieldOnUniqueWhere === null || identityFieldOnUniqueWhere === void 0 ? void 0 : identityFieldOnUniqueWhere.type) !== GraphQLID) {
-    throw new Error(`createAuth was called with an identityField of ${identityField} on the list ${listKey} ` + `but that field doesn't allow being searched uniquely with a String or ID. ` + `You should likely add \`isIndexed: 'unique'\` ` + `to the field at ${listKey}.${identityField}`);
-  }
-
   const baseSchema = getBaseAuthSchema({
     listKey,
-    gqlNames,
     base
   });
   return _filterInstanceProperty(_context = [baseSchema.extension]).call(_context, x => x !== undefined);
@@ -143,44 +137,35 @@ import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
+        autoCreate: <%= autoCreate %>,
         identityField: '<%= identityField %>',
-        sessionData: '<%= sessionData %>',
         listKey: '<%= listKey %>',
-        userMap: <%- JSON.stringify(userMap) %>,
-        accountMap: <%- JSON.stringify(accountMap) %>,
-        profileMap: <%- JSON.stringify(profileMap) %>,
-        autoCreate: <%= autoCreate %>,
-        sessionSecret: '<%= sessionSecret %>',
+        pages: keystoneConfig.pages,
         providers: keystoneConfig.providers,
         query,
+        resolver: keystoneConfig.resolver,
+        sessionData: '<%= sessionData %>',
+        sessionSecret: '<%= sessionSecret %>',
     });
   `;
 const authTemplate = ({
-  gqlNames,
+  autoCreate,
   identityField,
-  sessionData,
   listKey,
-  autoCreate,
-  userMap,
-  accountMap,
-  profileMap,
+  sessionData,
   sessionSecret
 }) => {
   const authOut = ejs.render(template, {
-    gqlNames,
     identityField,
     sessionData,
     listKey,
     autoCreate,
-    userMap,
-    accountMap,
-    profileMap,
     sessionSecret
   });
   return authOut;
 };
 
-const _excluded = ["get"];
+const _excluded = ["get", "start"];
 /**
  * createAuth function
  *
@@ -188,31 +173,21 @@ const _excluded = ["get"];
  */
 
 function createAuth({
-  listKey,
-  identityField,
-  sessionData,
   autoCreate,
-  userMap,
-  accountMap,
-  profileMap,
+  cookies,
+  identityField,
+  listKey,
   keystonePath,
+  pages,
+  resolver,
   providers,
+  sessionData,
   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)
   // or whether always being true is what we want, in which case we can refactor our code
   // to match this. -TL
-  const gqlNames = {
-    // Core
-    authenticateItemWithPassword: `authenticate${listKey}WithPassword`,
-    ItemAuthenticationWithPasswordResult: `${listKey}AuthenticationWithPasswordResult`,
-    ItemAuthenticationWithPasswordSuccess: `${listKey}AuthenticationWithPasswordSuccess`,
-    ItemAuthenticationWithPasswordFailure: `${listKey}AuthenticationWithPasswordFailure`,
-    // Initial data
-    CreateInitialInput: `CreateInitial${listKey}Input`,
-    createInitialItem: `createInitial${listKey}`
-  };
   const customPath = !keystonePath || keystonePath === '/' ? '' : keystonePath;
   /**
    * pageMiddleware
@@ -229,16 +204,14 @@ function createAuth({
     context,
     isValidSession
   }) => {
+    var _context;
+
     const {
       req,
       session
     } = 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 {
@@ -257,7 +230,11 @@ function createAuth({
       return;
     }
 
-    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`)) {
+    if (_includesInstanceProperty(pathname).call(pathname, '/_next/') || _includesInstanceProperty(pathname).call(pathname, '/api/auth/')) {
+      return;
+    }
+
+    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty(_context = _Object$values(pages)).call(_context, pathname) > -1)) {
       return {
         kind: 'redirect',
         to: `${customPath}/api/auth/signin`
@@ -279,14 +256,10 @@ function createAuth({
       mode: 'write',
       outputPath: 'pages/api/auth/[...nextauth].js',
       src: authTemplate({
-        gqlNames,
+        autoCreate,
         identityField,
-        sessionData,
         listKey,
-        autoCreate,
-        userMap,
-        accountMap,
-        profileMap,
+        sessionData,
         sessionSecret
       })
     }, {
@@ -305,7 +278,8 @@ function createAuth({
    */
 
 
-  const publicPages = [`${customPath}/api/auth/csrf`, `${customPath}/api/auth/signin`, `${customPath}/api/auth/callback`, `${customPath}/api/auth/session`, `${customPath}/api/auth/providers`, `${customPath}/api/auth/signout`];
+  const publicPages = [`${customPath}/api/__keystone_api_build`, `${customPath}/api/auth/csrf`, `${customPath}/api/auth/signin`, `${customPath}/api/auth/callback`, `${customPath}/api/auth/session`, `${customPath}/api/auth/providers`, `${customPath}/api/auth/signout`, `${customPath}/api/auth/error`]; // TODO: Add Provider Types
+  // @ts-ignore
 
   function addPages(provider) {
     const name = provider.id;
@@ -323,8 +297,7 @@ function createAuth({
 
   const extendGraphqlSchema = getSchemaExtension({
     identityField,
-    listKey,
-    gqlNames
+    listKey
   });
   /**
    * validateConfig
@@ -338,7 +311,9 @@ function createAuth({
     if (listConfig === undefined) {
       const msg = `A createAuth() invocation specifies the list "${listKey}" but no list with that key has been defined.`;
       throw new Error(msg);
-    } // TODO: Check for String-like typing for identityField? How?
+    } // TODO: Check if providers
+    // TODO: Check other required commands/data
+    // TODO: Check for String-like typing for identityField? How?
     // TODO: Validate that the identifyField is unique.
     // TODO: If this field isn't required, what happens if I try to log in as `null`?
 
@@ -346,9 +321,9 @@ function createAuth({
     const identityFieldConfig = listConfig.fields[identityField];
 
     if (identityFieldConfig === undefined) {
-      const i = _JSON$stringify(identityField);
+      const identityFieldName = _JSON$stringify(identityField);
 
-      const msg = `A createAuth() invocation for the "${listKey}" list specifies ${i} as its identityField but no field with that key exists on the list.`;
+      const msg = `A createAuth() invocation for the "${listKey}" list specifies ${identityFieldName} as its identityField but no field with that key exists on the list.`;
       throw new Error(msg);
     }
   };
@@ -364,18 +339,46 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const {
+      get,
+      start
+    } = _sessionStrategy,
+          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
+      start: async ({
+        res
+      }) => {
+        console.log('start');
+        const session = await start({
+          res
+        });
+        return session;
+      },
       get: async ({
         req
       }) => {
+        var _req$headers$authoriz;
+
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
         if (_includesInstanceProperty(pathname).call(pathname, '/api/auth')) {
           return;
         }
 
+        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+          var _token$data;
+
+          const token = await getToken({
+            req,
+            secret: sessionSecret
+          });
+
+          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
+            return token;
+          }
+        }
+
         const nextSession = await getSession({
           req
         });
@@ -396,6 +399,7 @@ function createAuth({
           secure: process.env.NODE_ENV === 'production',
           path: '/',
           sameSite: 'lax',
+          // TODO: Update parse to URL
           domain: url.parse(req.url).hostname
         }));
       }
@@ -432,19 +436,23 @@ function createAuth({
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {
-          var _context$req, _context$req2, _keystoneConfig$ui3;
+          var _context$req, _keystoneConfig$ui3;
 
-          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`) {
+          const {
+            req
+          } = context;
+          const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname; // Allow nextjs scripts and static files to be accessed without auth
+
+          if (_includesInstanceProperty(pathname).call(pathname, '/_next/')) {
             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)
+          } // Allow keystone to access /api/__keystone_api_build for hot reloading
 
 
-          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;
-          return accessingInitPage || ((_keystoneConfig$ui3 = keystoneConfig.ui) !== null && _keystoneConfig$ui3 !== void 0 && _keystoneConfig$ui3.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
+          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;
+          }
+
+          return (_keystoneConfig$ui3 = keystoneConfig.ui) !== null && _keystoneConfig$ui3 !== void 0 && _keystoneConfig$ui3.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined;
         }
       });
     }
@@ -454,8 +462,11 @@ function createAuth({
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return _objectSpread(_objectSpread({}, keystoneConfig), {}, {
       ui,
-      session,
+      cookies,
       providers,
+      pages,
+      resolver,
+      session,
       lists: _objectSpread({}, keystoneConfig.lists),
       experimental: _objectSpread(_objectSpread({}, keystoneConfig.experimental), {}, {
         generateNodeAPI: true

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "20.3.0",
+  "version": "21.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.16.7",
-    "@babel/runtime-corejs3": "^7.16.8",
+    "@babel/runtime": "^7.17.8",
+    "@babel/runtime-corejs3": "^7.17.8",
     "@types/ejs": "^3.1.0",
-    "cookie": "^0.4.1",
+    "cookie": "^0.4.2",
     "cross-fetch": "^3.1.5",
     "ejs": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
     "graphql": "^15.8.0",
-    "next-auth": "^4.1.2"
+    "next-auth": "^4.3.1"
   },
   "devDependencies": {
-    "@keystone-6/core": "^1.0.1",
+    "@keystone-6/core": "^1.1.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-6/core": "^1.0.1",
+    "@keystone-6/core": "^1.1.0",
     "react": "^17.0.2"
   },
   "engines": {

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

@@ -58,23 +58,42 @@ async function validateNextAuth(identityField, identity, protectIdentities, item
 
 function NextAuthPage(props) {
   const {
+    autoCreate,
+    cookies,
+    events,
+    identityField,
+    jwt,
+    listKey,
+    pages,
     providers,
     query,
-    identityField,
+    resolver,
     sessionData,
-    listKey,
-    autoCreate,
-    userMap,
-    accountMap,
-    profileMap,
     sessionSecret
-  } = props;
+  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
+
+  console.log('NextAuthPages... ', pages);
+
+  if (!query) {
+    console.error('NextAuthPage got no query.');
+    return null;
+  }
+
+  if (!providers || !providers.length) {
+    console.error('You need to provide at least one provider.');
+    return null;
+  }
+
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
-    secret: sessionSecret,
+    cookies,
     providers,
+    pages: pages || {},
+    events: events || {},
+    jwt: jwt || {},
+    secret: sessionSecret,
     callbacks: {
       async signIn({
         user,
@@ -91,28 +110,16 @@ function NextAuthPage(props) {
           identity = 0;
         }
 
-        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-        const data = {}; // eslint-disable-next-line no-restricted-syntax
-
-        for (const key in userMap) {
-          if (Object.prototype.hasOwnProperty.call(userMap, key)) {
-            data[key] = user[userMap[key]];
-          }
-        } // eslint-disable-next-line no-restricted-syntax
-
+        const userInput = resolver ? await resolver({
+          user,
+          account,
+          profile
+        }) : {};
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI); // ID
 
-        for (const key in accountMap) {
-          if (Object.prototype.hasOwnProperty.call(accountMap, key)) {
-            data[key] = account[accountMap[key]];
-          }
-        } // eslint-disable-next-line no-restricted-syntax
-
-
-        for (const key in profileMap) {
-          if (Object.prototype.hasOwnProperty.call(profileMap, key)) {
-            data[key] = profile[profileMap[key]];
-          }
-        }
+        const data = _objectSpread({
+          [identityField]: identity
+        }, userInput);
 
         if (!result.success) {
           if (!autoCreate) {

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

@@ -58,23 +58,42 @@ async function validateNextAuth(identityField, identity, protectIdentities, item
 
 function NextAuthPage(props) {
   const {
+    autoCreate,
+    cookies,
+    events,
+    identityField,
+    jwt,
+    listKey,
+    pages,
     providers,
     query,
-    identityField,
+    resolver,
     sessionData,
-    listKey,
-    autoCreate,
-    userMap,
-    accountMap,
-    profileMap,
     sessionSecret
-  } = props;
+  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
+
+  console.log('NextAuthPages... ', pages);
+
+  if (!query) {
+    console.error('NextAuthPage got no query.');
+    return null;
+  }
+
+  if (!providers || !providers.length) {
+    console.error('You need to provide at least one provider.');
+    return null;
+  }
+
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default["default"]({
-    secret: sessionSecret,
+    cookies,
     providers,
+    pages: pages || {},
+    events: events || {},
+    jwt: jwt || {},
+    secret: sessionSecret,
     callbacks: {
       async signIn({
         user,
@@ -91,28 +110,16 @@ function NextAuthPage(props) {
           identity = 0;
         }
 
-        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-        const data = {}; // eslint-disable-next-line no-restricted-syntax
-
-        for (const key in userMap) {
-          if (Object.prototype.hasOwnProperty.call(userMap, key)) {
-            data[key] = user[userMap[key]];
-          }
-        } // eslint-disable-next-line no-restricted-syntax
-
+        const userInput = resolver ? await resolver({
+          user,
+          account,
+          profile
+        }) : {};
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI); // ID
 
-        for (const key in accountMap) {
-          if (Object.prototype.hasOwnProperty.call(accountMap, key)) {
-            data[key] = account[accountMap[key]];
-          }
-        } // eslint-disable-next-line no-restricted-syntax
-
-
-        for (const key in profileMap) {
-          if (Object.prototype.hasOwnProperty.call(profileMap, key)) {
-            data[key] = profile[profileMap[key]];
-          }
-        }
+        const data = _objectSpread({
+          [identityField]: identity
+        }, userInput);
 
         if (!result.success) {
           if (!autoCreate) {

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

@@ -49,23 +49,42 @@ async function validateNextAuth(identityField, identity, protectIdentities, item
 
 function NextAuthPage(props) {
   const {
+    autoCreate,
+    cookies,
+    events,
+    identityField,
+    jwt,
+    listKey,
+    pages,
     providers,
     query,
-    identityField,
+    resolver,
     sessionData,
-    listKey,
-    autoCreate,
-    userMap,
-    accountMap,
-    profileMap,
     sessionSecret
-  } = props;
+  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
+
+  console.log('NextAuthPages... ', pages);
+
+  if (!query) {
+    console.error('NextAuthPage got no query.');
+    return null;
+  }
+
+  if (!providers || !providers.length) {
+    console.error('You need to provide at least one provider.');
+    return null;
+  }
+
   const list = query[listKey];
   const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth({
-    secret: sessionSecret,
+    cookies,
     providers,
+    pages: pages || {},
+    events: events || {},
+    jwt: jwt || {},
+    secret: sessionSecret,
     callbacks: {
       async signIn({
         user,
@@ -82,28 +101,16 @@ function NextAuthPage(props) {
           identity = 0;
         }
 
-        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-        const data = {}; // eslint-disable-next-line no-restricted-syntax
-
-        for (const key in userMap) {
-          if (Object.prototype.hasOwnProperty.call(userMap, key)) {
-            data[key] = user[userMap[key]];
-          }
-        } // eslint-disable-next-line no-restricted-syntax
-
+        const userInput = resolver ? await resolver({
+          user,
+          account,
+          profile
+        }) : {};
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI); // ID
 
-        for (const key in accountMap) {
-          if (Object.prototype.hasOwnProperty.call(accountMap, key)) {
-            data[key] = account[accountMap[key]];
-          }
-        } // eslint-disable-next-line no-restricted-syntax
-
-
-        for (const key in profileMap) {
-          if (Object.prototype.hasOwnProperty.call(profileMap, key)) {
-            data[key] = profile[profileMap[key]];
-          }
-        }
+        const data = _objectSpread({
+          [identityField]: identity
+        }, userInput);
 
         if (!result.success) {
           if (!autoCreate) {

package/src/gql/getBaseAuthSchema.ts

@@ -1,15 +1,11 @@
 import type { BaseItem } from '@keystone-6/core/types';
 import { graphql } from '@keystone-6/core';
 
-import { AuthGqlNames } from '../types';
-
 export function getBaseAuthSchema({
   listKey,
-  gqlNames,
   base,
 }: {
   listKey: string;
-  gqlNames: AuthGqlNames;
   base: graphql.BaseSchemaMeta;
 }) {
   const extension = {