@opensaas/keystone-nextjs-auth 21.0.0 → 22.0.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @opensaas-keystone/nextjs-auth
 
+## 22.0.0
+
+### Major Changes
+
+- 059d0cc: type fixes and and update user on login
+
+## 21.1.1
+
+### Patch Changes
+
+- e48cb6c: Fix signin redirect error
+
+## 21.1.0
+
+### Minor Changes
+
+- 9d35d01: Patch dependancies
+- 4a593d7: dependancy updates
+
 ## 21.0.0
 
 ### Major Changes

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

@@ -11,7 +11,13 @@ declare type CoreNextAuthPageProps = {
     listKey: string;
     pages?: Partial<PagesOptions>;
     providers?: Provider[];
-    resolver?: Function | undefined;
+    resolver?: (args: {
+        user: any;
+        profile: any;
+        account: any;
+    }) => {
+        [key: string]: boolean | string | number;
+    };
     sessionData: string | undefined;
     sessionSecret: string;
 };

package/dist/declarations/src/templates/next-config.d.ts

@@ -1,3 +1,3 @@
-export declare const nextConfigTemplate: ({ keystonePath, }: {
+export declare const nextConfigTemplate: ({ keystonePath }: {
     keystonePath: string;
 }) => string;

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

@@ -1,6 +1,26 @@
-import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
-import { CookiesOptions, PagesOptions } from 'next-auth';
+/// <reference types="node" />
+import type { ServerResponse, IncomingMessage } from 'http';
+import type { NextRequest } from 'next/server';
 import { Provider } from 'next-auth/providers';
+import { CookiesOptions, PagesOptions } from 'next-auth';
+import { BaseListTypeInfo, KeystoneConfig, CreateContext } from '@keystone-6/core/types';
+declare type NextAuthResponse = IncomingMessage & NextRequest;
+export declare type AuthSessionStrategy<StoredSessionData> = {
+    start: (args: {
+        res: ServerResponse;
+        data: any;
+        createContext: CreateContext;
+    }) => Promise<string>;
+    end: (args: {
+        req: IncomingMessage;
+        res: ServerResponse;
+        createContext: CreateContext;
+    }) => Promise<void>;
+    get: (args: {
+        req: NextAuthResponse;
+        createContext: CreateContext;
+    }) => Promise<StoredSessionData | undefined>;
+};
 export declare type NextAuthSession = {
     listKey: string;
     itemId: string;
@@ -27,11 +47,17 @@ export declare type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
     identityField: GeneratedListTypes['fields'];
     /** Path for Keystone interface */
     keystonePath?: string;
-    pages?: any;
+    pages?: Partial<PagesOptions>;
     /** Providers for Next Auth */
     providers: NextAuthProviders;
     /** Resolver for user to define their profile */
-    resolver?: Function | undefined;
+    resolver?: (args: {
+        user: any;
+        profile: any;
+        account: any;
+    }) => Promise<{
+        [key: string]: boolean | string | number;
+    }>;
     /** Session data population */
     sessionData?: string | undefined;
     /** Next-Auth Session Secret */

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var _Object$values = require('@babel/runtime-corejs3/core-js-stable/object/values');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
@@ -39,8 +37,6 @@ function _interopNamespace(e) {
 }
 
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
-var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
-var _Object$values__default = /*#__PURE__*/_interopDefault(_Object$values);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
@@ -200,7 +196,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get", "start"];
+const _excluded = ["get"];
 /**
  * createAuth function
  *
@@ -239,8 +235,6 @@ function createAuth({
     context,
     isValidSession
   }) => {
-    var _context;
-
     const {
       req,
       session
@@ -265,14 +259,14 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/')) {
+    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/') || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
-    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty__default["default"](_context = _Object$values__default["default"](pages)).call(_context, pathname) > -1)) {
+    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
-        to: `${customPath}/api/auth/signin`
+        to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
   };
@@ -374,26 +368,16 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const {
-      get,
-      start
-    } = _sessionStrategy,
-          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      start: async ({
-        res
-      }) => {
-        console.log('start');
-        const session = await start({
-          res
-        });
-        return session;
+      start: async () => {
+        return 'false';
       },
       get: async ({
         req
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
@@ -401,7 +385,7 @@ function createAuth({
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+        if (((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : (_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 jwt.getToken({

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var _Object$values = require('@babel/runtime-corejs3/core-js-stable/object/values');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 require('@babel/runtime-corejs3/core-js-stable/url');
@@ -39,8 +37,6 @@ function _interopNamespace(e) {
 }
 
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
-var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
-var _Object$values__default = /*#__PURE__*/_interopDefault(_Object$values);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var url__default = /*#__PURE__*/_interopDefault(url);
@@ -199,7 +195,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get", "start"];
+const _excluded = ["get"];
 /**
  * createAuth function
  *
@@ -238,8 +234,6 @@ function createAuth({
     context,
     isValidSession
   }) => {
-    var _context;
-
     const {
       req,
       session
@@ -264,14 +258,14 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/')) {
+    if (_includesInstanceProperty__default["default"](pathname).call(pathname, '/_next/') || _includesInstanceProperty__default["default"](pathname).call(pathname, '/api/auth/') || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
-    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty__default["default"](_context = _Object$values__default["default"](pages)).call(_context, pathname) > -1)) {
+    if (!session && !_includesInstanceProperty__default["default"](pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
-        to: `${customPath}/api/auth/signin`
+        to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
   };
@@ -373,26 +367,16 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const {
-      get,
-      start
-    } = _sessionStrategy,
-          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      start: async ({
-        res
-      }) => {
-        console.log('start');
-        const session = await start({
-          res
-        });
-        return session;
+      start: async () => {
+        return 'false';
       },
       get: async ({
         req
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
@@ -400,7 +384,7 @@ function createAuth({
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+        if (((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : (_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 jwt.getToken({

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

@@ -1,8 +1,6 @@
 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';
@@ -165,7 +163,7 @@ const authTemplate = ({
   return authOut;
 };
 
-const _excluded = ["get", "start"];
+const _excluded = ["get"];
 /**
  * createAuth function
  *
@@ -204,8 +202,6 @@ function createAuth({
     context,
     isValidSession
   }) => {
-    var _context;
-
     const {
       req,
       session
@@ -230,14 +226,14 @@ function createAuth({
       return;
     }
 
-    if (_includesInstanceProperty(pathname).call(pathname, '/_next/') || _includesInstanceProperty(pathname).call(pathname, '/api/auth/')) {
+    if (_includesInstanceProperty(pathname).call(pathname, '/_next/') || _includesInstanceProperty(pathname).call(pathname, '/api/auth/') || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn) || pages !== null && pages !== void 0 && pages.error && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.error) || pages !== null && pages !== void 0 && pages.signOut && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signOut)) {
       return;
     }
 
-    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`) && !(_indexOfInstanceProperty(_context = _Object$values(pages)).call(_context, pathname) > -1)) {
+    if (!session && !_includesInstanceProperty(pathname).call(pathname, `${customPath}/api/auth/`)) {
       return {
         kind: 'redirect',
-        to: `${customPath}/api/auth/signin`
+        to: (pages === null || pages === void 0 ? void 0 : pages.signIn) || `${customPath}/api/auth/signin`
       };
     }
   };
@@ -339,26 +335,16 @@ function createAuth({
 
 
   const withItemData = _sessionStrategy => {
-    const {
-      get,
-      start
-    } = _sessionStrategy,
-          sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
+    const sessionStrategy = _objectWithoutProperties(_sessionStrategy, _excluded);
 
     return _objectSpread(_objectSpread({}, sessionStrategy), {}, {
-      start: async ({
-        res
-      }) => {
-        console.log('start');
-        const session = await start({
-          res
-        });
-        return session;
+      start: async () => {
+        return 'false';
       },
       get: async ({
         req
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
@@ -366,7 +352,7 @@ function createAuth({
           return;
         }
 
-        if (((_req$headers$authoriz = req.headers.authorization) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.split(' ')[0]) === 'Bearer') {
+        if (((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : (_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({

package/package.json

@@ -1,27 +1,28 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "21.0.0",
+  "version": "22.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.17.8",
-    "@babel/runtime-corejs3": "^7.17.8",
+    "@babel/runtime": "^7.17.9",
+    "@babel/runtime-corejs3": "^7.17.9",
     "@types/ejs": "^3.1.0",
-    "cookie": "^0.4.2",
+    "cookie": "^0.5.0",
     "cross-fetch": "^3.1.5",
-    "ejs": "^3.1.6",
+    "ejs": "^3.1.7",
     "fast-deep-equal": "^3.1.3",
-    "graphql": "^15.8.0",
-    "next-auth": "^4.3.1"
+    "next-auth": "^4.3.4"
   },
   "devDependencies": {
     "@keystone-6/core": "^1.1.0",
+    "next": "12.1.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
     "@keystone-6/core": "^1.1.0",
+    "next": "12.1.0",
     "react": "^17.0.2"
   },
   "engines": {

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

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var NextAuth = require('next-auth');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
-var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var NextAuth__default = /*#__PURE__*/_interopDefault(NextAuth);
 
 async function findMatchingIdentity(identityField, identity, queryAPI) {
@@ -70,9 +68,7 @@ function NextAuthPage(props) {
     resolver,
     sessionData,
     sessionSecret
-  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
-
-  console.log('NextAuthPages... ', pages);
+  } = props;
 
   if (!query) {
     console.error('NextAuthPage got no query.');
@@ -123,26 +119,42 @@ function NextAuthPage(props) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log('`autoCreate` if set to `false`, skipping user auto-creation');
+            console.log('`autoCreate` is set to `false`, skipping user auto-creation');
             return false;
           }
 
-          console.log('`autoCreate` if set to `true`, auto-creating a new user');
+          console.log('`autoCreate` is set to `true`, auto-creating a new user');
           const createUser = await list.createOne({
             data
           }).then(returned => {
-            console.log('User Created', _JSON$stringify__default["default"](returned));
-            return true;
+            return {
+              success: true,
+              user: returned
+            };
           }).catch(error => {
             console.log(error);
             throw new Error(error);
           });
           console.log('Created User', createUser);
-          return createUser;
-        } // await list.updateOne({where: {id: result.item.id}, data});
-
+          return createUser.success;
+        }
 
-        return result.success;
+        console.log('Data', data);
+        const updateUser = await list.updateOne({
+          where: {
+            id: result.item.id
+          },
+          data
+        }).then(returned => {
+          return {
+            success: true,
+            user: returned
+          };
+        }).catch(error => {
+          console.log(error);
+          throw new Error(error);
+        });
+        return updateUser.success;
       },
 
       async redirect({

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

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var NextAuth = require('next-auth');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
-var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var NextAuth__default = /*#__PURE__*/_interopDefault(NextAuth);
 
 async function findMatchingIdentity(identityField, identity, queryAPI) {
@@ -70,9 +68,7 @@ function NextAuthPage(props) {
     resolver,
     sessionData,
     sessionSecret
-  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
-
-  console.log('NextAuthPages... ', pages);
+  } = props;
 
   if (!query) {
     console.error('NextAuthPage got no query.');
@@ -123,26 +119,42 @@ function NextAuthPage(props) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log('`autoCreate` if set to `false`, skipping user auto-creation');
+            console.log('`autoCreate` is set to `false`, skipping user auto-creation');
             return false;
           }
 
-          console.log('`autoCreate` if set to `true`, auto-creating a new user');
+          console.log('`autoCreate` is set to `true`, auto-creating a new user');
           const createUser = await list.createOne({
             data
           }).then(returned => {
-            console.log('User Created', _JSON$stringify__default["default"](returned));
-            return true;
+            return {
+              success: true,
+              user: returned
+            };
           }).catch(error => {
             console.log(error);
             throw new Error(error);
           });
           console.log('Created User', createUser);
-          return createUser;
-        } // await list.updateOne({where: {id: result.item.id}, data});
-
+          return createUser.success;
+        }
 
-        return result.success;
+        console.log('Data', data);
+        const updateUser = await list.updateOne({
+          where: {
+            id: result.item.id
+          },
+          data
+        }).then(returned => {
+          return {
+            success: true,
+            user: returned
+          };
+        }).catch(error => {
+          console.log(error);
+          throw new Error(error);
+        });
+        return updateUser.success;
       },
 
       async redirect({

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

@@ -1,5 +1,4 @@
 import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
-import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringify';
 import NextAuth from 'next-auth';
 
 async function findMatchingIdentity(identityField, identity, queryAPI) {
@@ -61,9 +60,7 @@ function NextAuthPage(props) {
     resolver,
     sessionData,
     sessionSecret
-  } = props; // TODO: (v1.1). https://github.com/ijsto/keystone-6-oauth/projects/1#card-78602004
-
-  console.log('NextAuthPages... ', pages);
+  } = props;
 
   if (!query) {
     console.error('NextAuthPage got no query.');
@@ -114,26 +111,42 @@ function NextAuthPage(props) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log('`autoCreate` if set to `false`, skipping user auto-creation');
+            console.log('`autoCreate` is set to `false`, skipping user auto-creation');
             return false;
           }
 
-          console.log('`autoCreate` if set to `true`, auto-creating a new user');
+          console.log('`autoCreate` is set to `true`, auto-creating a new user');
           const createUser = await list.createOne({
             data
           }).then(returned => {
-            console.log('User Created', _JSON$stringify(returned));
-            return true;
+            return {
+              success: true,
+              user: returned
+            };
           }).catch(error => {
             console.log(error);
             throw new Error(error);
           });
           console.log('Created User', createUser);
-          return createUser;
-        } // await list.updateOne({where: {id: result.item.id}, data});
-
+          return createUser.success;
+        }
 
-        return result.success;
+        console.log('Data', data);
+        const updateUser = await list.updateOne({
+          where: {
+            id: result.item.id
+          },
+          data
+        }).then(returned => {
+          return {
+            success: true,
+            user: returned
+          };
+        }).catch(error => {
+          console.log(error);
+          throw new Error(error);
+        });
+        return updateUser.success;
       },
 
       async redirect({

package/src/gql/getBaseAuthSchema.ts

@@ -17,10 +17,7 @@ export function getBaseAuthSchema({
           resolveType: (root, context) => context.session?.listKey,
         }),
         resolve(root, args, { session, db }) {
-          if (
-            typeof session?.itemId === 'string' &&
-            typeof session.listKey === 'string'
-          ) {
+          if (typeof session?.itemId === 'string' && typeof session.listKey === 'string') {
             return db[session.listKey].findOne({
               where: { id: session.itemId },
             });

package/src/index.ts

@@ -5,8 +5,8 @@ import {
   KeystoneConfig,
   KeystoneContext,
   AdminUIConfig,
-  SessionStrategy,
   BaseKeystoneTypeInfo,
+  SessionStrategy,
 } from '@keystone-6/core/types';
 import { getSession } from 'next-auth/react';
 import { getToken } from 'next-auth/jwt';
@@ -17,7 +17,7 @@ import * as cookie from 'cookie';
 import { nextConfigTemplate } from './templates/next-config';
 // import * as Path from 'path';
 
-import { AuthConfig, KeystoneOAuthConfig, NextAuthSession } from './types';
+import { AuthConfig, KeystoneOAuthConfig, NextAuthSession, AuthSessionStrategy } from './types';
 import { getSchemaExtension } from './schema';
 import { authTemplate } from './templates/auth';
 
@@ -56,31 +56,38 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    *  - to the init page when initFirstItem is configured, and there are no user in the database
    *  - to the signin page when no valid session is present
    */
-  const pageMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] =
-    async ({ context, isValidSession }) => {
-      const { req, session } = context;
-      const pathname = url.parse(req?.url!).pathname!;
+  const pageMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] = async ({
+    context,
+    isValidSession,
+  }) => {
+    const { req, session } = context;
+    const pathname = url.parse(req?.url!).pathname!;
 
-      if (isValidSession) {
-        if (pathname === `${customPath}/api/auth/signin`) {
-          return { kind: 'redirect', to: `${customPath}` };
-        }
-        if (customPath !== '' && pathname === '/') {
-          return { kind: 'redirect', to: `${customPath}` };
-        }
-        return;
-      }
-      if (pathname.includes('/_next/') || pathname.includes('/api/auth/')) {
-        return;
+    if (isValidSession) {
+      if (pathname === `${customPath}/api/auth/signin`) {
+        return { kind: 'redirect', to: `${customPath}` };
       }
-      if (
-        !session &&
-        !pathname.includes(`${customPath}/api/auth/`) &&
-        !(Object.values(pages).indexOf(pathname) > -1)
-      ) {
-        return { kind: 'redirect', to: `${customPath}/api/auth/signin` };
+      if (customPath !== '' && pathname === '/') {
+        return { kind: 'redirect', to: `${customPath}` };
       }
-    };
+      return;
+    }
+    if (
+      pathname.includes('/_next/') ||
+      pathname.includes('/api/auth/') ||
+      (pages?.signIn && pathname.includes(pages?.signIn)) ||
+      (pages?.error && pathname.includes(pages?.error)) ||
+      (pages?.signOut && pathname.includes(pages?.signOut))
+    ) {
+      return;
+    }
+    if (!session && !pathname.includes(`${customPath}/api/auth/`)) {
+      return {
+        kind: 'redirect',
+        to: pages?.signIn || `${customPath}/api/auth/signin`,
+      };
+    }
+  };
 
   /**
    * getAdditionalFiles
@@ -181,23 +188,20 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
   - [ ] We could support additional where input to validate item sessions (e.g an isEnabled boolean)
 */
   const withItemData = (
-    _sessionStrategy: SessionStrategy<Record<string, any>>
-  ): SessionStrategy<NextAuthSession | undefined> => {
-    const { get, start, ...sessionStrategy } = _sessionStrategy;
+    _sessionStrategy: AuthSessionStrategy<Record<string, any>>
+  ): AuthSessionStrategy<NextAuthSession | never> => {
+    const { get, ...sessionStrategy } = _sessionStrategy;
     return {
       ...sessionStrategy,
-      start: async ({ res }) => {
-        console.log('start');
-
-        const session = await start({ res });
-        return session;
+      start: async () => {
+        return 'false';
       },
       get: async ({ req }) => {
         const pathname = url.parse(req?.url!).pathname!;
         if (pathname.includes('/api/auth')) {
           return;
         }
-        if (req.headers.authorization?.split(' ')[0] === 'Bearer') {
+        if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
           const token = (await getToken({
             req,
             secret: sessionSecret,
@@ -252,13 +256,9 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
       ui = {
         ...keystoneConfig.ui,
         publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
-        getAdditionalFiles: [
-          ...(keystoneConfig.ui?.getAdditionalFiles || []),
-          getAdditionalFiles,
-        ],
-        pageMiddleware: async (args) =>
-          (await pageMiddleware(args)) ??
-          keystoneConfig?.ui?.pageMiddleware?.(args),
+        getAdditionalFiles: [...(keystoneConfig.ui?.getAdditionalFiles || []), getAdditionalFiles],
+        pageMiddleware: async args =>
+          (await pageMiddleware(args)) ?? keystoneConfig?.ui?.pageMiddleware?.(args),
         enableSessionItem: true,
         isAccessAllowed: async (context: KeystoneContext) => {
           const { req } = context;
@@ -286,9 +286,8 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
       };
     }
 
-    if (!keystoneConfig.session)
-      throw new TypeError('Missing .session configuration');
-    const session = withItemData(keystoneConfig.session);
+    if (!keystoneConfig.session) throw new TypeError('Missing .session configuration');
+    const session = withItemData(keystoneConfig.session) as SessionStrategy<any>;
 
     const existingExtendGraphQLSchema = keystoneConfig.extendGraphqlSchema;
     return {
@@ -307,7 +306,7 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
         generateNodeAPI: true,
       },
       extendGraphqlSchema: existingExtendGraphQLSchema
-        ? (schema) => existingExtendGraphQLSchema(extendGraphqlSchema(schema))
+        ? schema => existingExtendGraphQLSchema(extendGraphqlSchema(schema))
         : extendGraphqlSchema,
     };
   };

package/src/lib/findMatchingIdentity.ts

@@ -4,10 +4,7 @@ export async function findMatchingIdentity(
   identityField: string,
   identity: string | number,
   queryAPI: any
-): Promise<
-  | { success: false; code: AuthTokenRequestErrorCode }
-  | { success: true; item: any }
-> {
+): Promise<{ success: false; code: AuthTokenRequestErrorCode } | { success: true; item: any }> {
   const item = await queryAPI.findOne({
     where: { [identityField]: identity },
   });

package/src/pages/NextAuthPage.tsx

@@ -1,14 +1,9 @@
-import NextAuth, {
-  CookiesOptions,
-  EventCallbacks,
-  PagesOptions,
-} from 'next-auth';
+import NextAuth, { CookiesOptions, EventCallbacks, PagesOptions } from 'next-auth';
 import type { KeystoneListsAPI } from '@keystone-6/core/types';
 import { Provider } from 'next-auth/providers';
 import { JWTOptions } from 'next-auth/jwt';
 import { validateNextAuth } from '../lib/validateNextAuth';
 
-// TODO: See if possible to merge with `type AuthConfig`
 type CoreNextAuthPageProps = {
   autoCreate: boolean;
   cookies?: Partial<CookiesOptions>;
@@ -18,7 +13,9 @@ type CoreNextAuthPageProps = {
   listKey: string;
   pages?: Partial<PagesOptions>;
   providers?: Provider[];
-  resolver?: Function | undefined;
+  resolver?: (args: { user: any; profile: any; account: any }) => {
+    [key: string]: boolean | string | number;
+  };
   sessionData: string | undefined;
   sessionSecret: string;
 };
@@ -45,8 +42,6 @@ export default function NextAuthPage(props: NextAuthPageProps) {
     sessionData,
     sessionSecret,
   } = 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.');
@@ -79,16 +74,9 @@ export default function NextAuthPage(props: NextAuthPageProps) {
         } else {
           identity = 0;
         }
-        const userInput = resolver
-          ? await resolver({ user, account, profile })
-          : {};
+        const userInput = resolver ? await resolver({ user, account, profile }) : {};
 
-        const result = await validateNextAuth(
-          identityField,
-          identity,
-          protectIdentities,
-          queryAPI
-        );
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
         // ID
         const data: any = {
           [identityField]: identity,
@@ -97,30 +85,35 @@ export default function NextAuthPage(props: NextAuthPageProps) {
 
         if (!result.success) {
           if (!autoCreate) {
-            console.log(
-              '`autoCreate` if set to `false`, skipping user auto-creation'
-            );
+            console.log('`autoCreate` is set to `false`, skipping user auto-creation');
             return false;
           }
-          console.log(
-            '`autoCreate` if set to `true`, auto-creating a new user'
-          );
+          console.log('`autoCreate` is set to `true`, auto-creating a new user');
 
           const createUser = await list
             .createOne({ data })
-            .then((returned) => {
-              console.log('User Created', JSON.stringify(returned));
-              return true;
+            .then(returned => {
+              return { success: true, user: returned };
             })
-            .catch((error) => {
+            .catch(error => {
               console.log(error);
               throw new Error(error);
             });
           console.log('Created User', createUser);
-          return createUser;
+          return createUser.success;
         }
-        // await list.updateOne({where: {id: result.item.id}, data});
-        return result.success;
+        console.log('Data', data);
+
+        const updateUser = await list
+          .updateOne({ where: { id: result.item.id }, data })
+          .then(returned => {
+            return { success: true, user: returned };
+          })
+          .catch(error => {
+            console.log(error);
+            throw new Error(error);
+          });
+        return updateUser.success;
       },
       async redirect({ url }) {
         return url;
@@ -167,5 +160,4 @@ export default function NextAuthPage(props: NextAuthPageProps) {
   });
 }
 
-export const getNextAuthPage = (props: NextAuthPageProps) => () =>
-  NextAuthPage({ ...props });
+export const getNextAuthPage = (props: NextAuthPageProps) => () => NextAuthPage({ ...props });

package/src/schema.ts

@@ -9,13 +9,11 @@ export const getSchemaExtension = ({
   identityField: string;
   listKey: string;
 }): ExtendGraphqlSchema =>
-  graphql.extend((base) => {
+  graphql.extend(base => {
     const baseSchema = getBaseAuthSchema({
       listKey,
       base,
     });
 
-    return [baseSchema.extension].filter(
-      (x): x is Exclude<typeof x, undefined> => x !== undefined
-    );
+    return [baseSchema.extension].filter((x): x is Exclude<typeof x, undefined> => x !== undefined);
   });

package/src/templates/next-config.ts

@@ -56,11 +56,7 @@ module.exports = withPreconstruct({
   <% } %>
 });
 `;
-export const nextConfigTemplate = ({
-  keystonePath,
-}: {
-  keystonePath: string;
-}) => {
+export const nextConfigTemplate = ({ keystonePath }: { keystonePath: string }) => {
   const nextConfigOut = ejs.render(template, { keystonePath });
 
   return nextConfigOut;

package/src/types.ts

@@ -1,6 +1,27 @@
-import { BaseListTypeInfo, KeystoneConfig } from '@keystone-6/core/types';
-import { CookiesOptions, PagesOptions } from 'next-auth';
+import type { ServerResponse, IncomingMessage } from 'http';
+import type { NextRequest } from 'next/server';
 import { Provider } from 'next-auth/providers';
+import { CookiesOptions, PagesOptions } from 'next-auth';
+import { BaseListTypeInfo, KeystoneConfig, CreateContext } from '@keystone-6/core/types';
+
+type NextAuthResponse = IncomingMessage & NextRequest;
+
+export declare type AuthSessionStrategy<StoredSessionData> = {
+  start: (args: {
+    res: ServerResponse;
+    data: any;
+    createContext: CreateContext;
+  }) => Promise<string>;
+  end: (args: {
+    req: IncomingMessage;
+    res: ServerResponse;
+    createContext: CreateContext;
+  }) => Promise<void>;
+  get: (args: {
+    req: NextAuthResponse;
+    createContext: CreateContext;
+  }) => Promise<StoredSessionData | undefined>;
+};
 
 export type NextAuthSession = { listKey: string; itemId: string; data: any };
 
@@ -15,9 +36,7 @@ type NextAuthOptions = {
   resolver: any;
 };
 
-export type KeystoneOAuthConfig = KeystoneConfig &
-  KeytoneOAuthOptions &
-  NextAuthOptions;
+export type KeystoneOAuthConfig = KeystoneConfig & KeytoneOAuthOptions & NextAuthOptions;
 
 export type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
   /** Auth Create users in Keystone DB from Auth Provider */
@@ -31,20 +50,20 @@ export type AuthConfig<GeneratedListTypes extends BaseListTypeInfo> = {
   /** Path for Keystone interface */
   keystonePath?: string;
   // Custom pages for different NextAuth events
-  pages?: any; // TODO: Fix types
+  pages?: Partial<PagesOptions>;
   /** Providers for Next Auth */
   providers: NextAuthProviders;
   /** Resolver for user to define their profile */
-  resolver?: Function | undefined;
+  resolver?: (args: { user: any; profile: any; account: any }) => Promise<{
+    [key: string]: boolean | string | number;
+  }>;
   /** Session data population */
   sessionData?: string | undefined;
   /** Next-Auth Session Secret */
   sessionSecret: string;
 };
 
-export type AuthTokenRequestErrorCode =
-  | 'IDENTITY_NOT_FOUND'
-  | 'MULTIPLE_IDENTITY_MATCHES';
+export type AuthTokenRequestErrorCode = 'IDENTITY_NOT_FOUND' | 'MULTIPLE_IDENTITY_MATCHES';
 
 export type PasswordAuthErrorCode =
   | AuthTokenRequestErrorCode