@opensaas/keystone-nextjs-auth 21.1.0 → 22.1.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @opensaas-keystone/nextjs-auth
 
+## 22.1.0
+
+### Minor Changes
+
+- b89f4e7: Invalidate user when deleted from database
+
+### Patch Changes
+
+- b89f4e7: signin pages error fix
+
+## 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

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 → types/index.d.ts}

@@ -1,10 +1,25 @@
-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';
-export declare type NextAuthSession = {
-    listKey: string;
-    itemId: string;
-    data: any;
+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 NextAuthProviders = Provider[];
 declare type KeytoneOAuthOptions = {
@@ -27,11 +42,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
@@ -248,7 +242,7 @@ function createAuth({
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      if (pathname === `${customPath}/api/auth/signin` || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn)) {
         return {
           kind: 'redirect',
           to: `${customPath}`
@@ -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,53 +368,48 @@ 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
+        req,
+        createContext
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
+        const sudoContext = createContext({
+          sudo: true
+        });
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        let nextSession;
 
         if (_includesInstanceProperty__default["default"](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 jwt.getToken({
+        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') {
+          nextSession = await jwt.getToken({
             req,
             secret: sessionSecret
           });
+        } else {
+          nextSession = await react.getSession({
+            req
+          });
+        }
 
-          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
-            return token;
-          }
+        if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
+          return;
         }
 
-        const nextSession = await react.getSession({
-          req
+        return _objectSpread(_objectSpread({}, nextSession), {}, {
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId
         });
-
-        if (nextSession) {
-          return nextSession;
-        }
       },
       end: async ({
         res,

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
@@ -247,7 +241,7 @@ function createAuth({
     const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      if (pathname === `${customPath}/api/auth/signin` || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty__default["default"](pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn)) {
         return {
           kind: 'redirect',
           to: `${customPath}`
@@ -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,53 +367,48 @@ 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
+        req,
+        createContext
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
+        const sudoContext = createContext({
+          sudo: true
+        });
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        let nextSession;
 
         if (_includesInstanceProperty__default["default"](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 jwt.getToken({
+        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') {
+          nextSession = await jwt.getToken({
             req,
             secret: sessionSecret
           });
+        } else {
+          nextSession = await react.getSession({
+            req
+          });
+        }
 
-          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
-            return token;
-          }
+        if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
+          return;
         }
 
-        const nextSession = await react.getSession({
-          req
+        return _objectSpread(_objectSpread({}, nextSession), {}, {
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId
         });
-
-        if (nextSession) {
-          return nextSession;
-        }
       },
       end: async ({
         res,

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
@@ -213,7 +209,7 @@ function createAuth({
     const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      if (pathname === `${customPath}/api/auth/signin` || pages !== null && pages !== void 0 && pages.signIn && _includesInstanceProperty(pathname).call(pathname, pages === null || pages === void 0 ? void 0 : pages.signIn)) {
         return {
           kind: 'redirect',
           to: `${customPath}`
@@ -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,53 +335,48 @@ 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
+        req,
+        createContext
       }) => {
-        var _req$headers$authoriz;
+        var _req$headers, _req$headers$authoriz;
 
+        const sudoContext = createContext({
+          sudo: true
+        });
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
+        let nextSession;
 
         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({
+        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') {
+          nextSession = await getToken({
             req,
             secret: sessionSecret
           });
+        } else {
+          nextSession = await getSession({
+            req
+          });
+        }
 
-          if (token !== null && token !== void 0 && (_token$data = token.data) !== null && _token$data !== void 0 && _token$data.id) {
-            return token;
-          }
+        if (!nextSession || !nextSession.listKey || nextSession.listKey !== listKey || !nextSession.itemId || !sudoContext.query[listKey] || !nextSession.itemId) {
+          return;
         }
 
-        const nextSession = await getSession({
-          req
+        return _objectSpread(_objectSpread({}, nextSession), {}, {
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId
         });
-
-        if (nextSession) {
-          return nextSession;
-        }
       },
       end: async ({
         res,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "21.1.0",
+  "version": "22.1.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -17,16 +17,14 @@
   },
   "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": {
-    "node": "^12.20 || >= 14.13"
+    "node": "^14.13 || >= 16.13"
   },
   "publishConfig": {
     "access": "public"