@opensaas/keystone-nextjs-auth 22.0.0 → 22.1.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @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

package/dist/declarations/src/{types.d.ts → types/index.d.ts}

@@ -21,11 +21,6 @@ export declare type AuthSessionStrategy<StoredSessionData> = {
         createContext: CreateContext;
     }) => Promise<StoredSessionData | undefined>;
 };
-export declare type NextAuthSession = {
-    listKey: string;
-    itemId: string;
-    data: any;
-};
 export declare type NextAuthProviders = Provider[];
 declare type KeytoneOAuthOptions = {
     providers: NextAuthProviders;

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

@@ -242,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}`
@@ -375,36 +375,41 @@ function createAuth({
         return 'false';
       },
       get: async ({
-        req
+        req,
+        createContext
       }) => {
         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 = 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({
+          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

@@ -241,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}`
@@ -374,36 +374,41 @@ function createAuth({
         return 'false';
       },
       get: async ({
-        req
+        req,
+        createContext
       }) => {
         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 = 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({
+          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

@@ -209,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}`
@@ -342,36 +342,41 @@ function createAuth({
         return 'false';
       },
       get: async ({
-        req
+        req,
+        createContext
       }) => {
         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 = 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({
+          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": "22.0.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"

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

@@ -167,13 +167,22 @@ function NextAuthPage(props) {
         session,
         token
       }) {
-        const returnSession = _objectSpread(_objectSpread({}, session), {}, {
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId
-        });
+        let returnSession = session;
+
+        if (!token.itemId) {
+          return {
+            expires: '0'
+          };
+        } else {
+          returnSession = _objectSpread(_objectSpread({}, session), {}, {
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey,
+            itemId: token.itemId
+          });
+        }
 
+        console.log('Session', returnSession);
         return returnSession;
       },
 
@@ -181,26 +190,22 @@ function NextAuthPage(props) {
         token
       }) {
         const identity = token.sub;
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
-        if (!token.itemId) {
-          const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-
-          if (!result.success) {
-            return token;
-          }
-
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: {
+              id: token.itemId
+            },
+            query: sessionData || 'id'
+          });
+          token.data = data;
         }
 
-        const data = await query[listKey].findOne({
-          where: {
-            id: token.itemId
-          },
-          query: sessionData || 'id'
-        });
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-          data,
           subject: token.sub,
           listKey
         });

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

@@ -167,13 +167,22 @@ function NextAuthPage(props) {
         session,
         token
       }) {
-        const returnSession = _objectSpread(_objectSpread({}, session), {}, {
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId
-        });
+        let returnSession = session;
+
+        if (!token.itemId) {
+          return {
+            expires: '0'
+          };
+        } else {
+          returnSession = _objectSpread(_objectSpread({}, session), {}, {
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey,
+            itemId: token.itemId
+          });
+        }
 
+        console.log('Session', returnSession);
         return returnSession;
       },
 
@@ -181,26 +190,22 @@ function NextAuthPage(props) {
         token
       }) {
         const identity = token.sub;
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
-        if (!token.itemId) {
-          const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-
-          if (!result.success) {
-            return token;
-          }
-
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: {
+              id: token.itemId
+            },
+            query: sessionData || 'id'
+          });
+          token.data = data;
         }
 
-        const data = await query[listKey].findOne({
-          where: {
-            id: token.itemId
-          },
-          query: sessionData || 'id'
-        });
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-          data,
           subject: token.sub,
           listKey
         });

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

@@ -159,13 +159,22 @@ function NextAuthPage(props) {
         session,
         token
       }) {
-        const returnSession = _objectSpread(_objectSpread({}, session), {}, {
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId
-        });
+        let returnSession = session;
+
+        if (!token.itemId) {
+          return {
+            expires: '0'
+          };
+        } else {
+          returnSession = _objectSpread(_objectSpread({}, session), {}, {
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey,
+            itemId: token.itemId
+          });
+        }
 
+        console.log('Session', returnSession);
         return returnSession;
       },
 
@@ -173,26 +182,22 @@ function NextAuthPage(props) {
         token
       }) {
         const identity = token.sub;
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
-        if (!token.itemId) {
-          const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
-
-          if (!result.success) {
-            return token;
-          }
-
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: {
+              id: token.itemId
+            },
+            query: sessionData || 'id'
+          });
+          token.data = data;
         }
 
-        const data = await query[listKey].findOne({
-          where: {
-            id: token.itemId
-          },
-          query: sessionData || 'id'
-        });
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-          data,
           subject: token.sub,
           listKey
         });

package/src/index.ts

@@ -14,10 +14,11 @@ import { Provider } from 'next-auth/providers';
 
 import * as cookie from 'cookie';
 
+import { Session } from 'next-auth';
 import { nextConfigTemplate } from './templates/next-config';
 // import * as Path from 'path';
 
-import { AuthConfig, KeystoneOAuthConfig, NextAuthSession, AuthSessionStrategy } from './types';
+import { AuthConfig, KeystoneOAuthConfig, AuthSessionStrategy } from './types';
 import { getSchemaExtension } from './schema';
 import { authTemplate } from './templates/auth';
 
@@ -64,7 +65,10 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
     const pathname = url.parse(req?.url!).pathname!;
 
     if (isValidSession) {
-      if (pathname === `${customPath}/api/auth/signin`) {
+      if (
+        pathname === `${customPath}/api/auth/signin` ||
+        (pages?.signIn && pathname.includes(pages?.signIn))
+      ) {
         return { kind: 'redirect', to: `${customPath}` };
       }
       if (customPath !== '' && pathname === '/') {
@@ -189,33 +193,45 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
 */
   const withItemData = (
     _sessionStrategy: AuthSessionStrategy<Record<string, any>>
-  ): AuthSessionStrategy<NextAuthSession | never> => {
+  ): AuthSessionStrategy<{ listKey: string; itemId: string; data: any }> => {
     const { get, ...sessionStrategy } = _sessionStrategy;
     return {
       ...sessionStrategy,
       start: async () => {
         return 'false';
       },
-      get: async ({ req }) => {
+      get: async ({ req, createContext }) => {
+        const sudoContext = createContext({ sudo: true });
         const pathname = url.parse(req?.url!).pathname!;
+        let nextSession: Session;
         if (pathname.includes('/api/auth')) {
           return;
         }
         if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
-          const token = (await getToken({
+          nextSession = (await getToken({
             req,
             secret: sessionSecret,
-          })) as NextAuthSession;
-
-          if (token?.data?.id) {
-            return token;
-          }
+          })) as Session;
+        } else {
+          nextSession = (await getSession({ req })) as Session;
         }
-        const nextSession: unknown = await getSession({ req });
 
-        if (nextSession) {
-          return nextSession as NextAuthSession;
+        if (
+          !nextSession ||
+          !nextSession.listKey ||
+          nextSession.listKey !== listKey ||
+          !nextSession.itemId ||
+          !sudoContext.query[listKey] ||
+          !nextSession.itemId
+        ) {
+          return;
         }
+        return {
+          ...nextSession,
+          data: nextSession.data,
+          listKey: nextSession.listKey,
+          itemId: nextSession.itemId,
+        };
       },
       end: async ({ res, req }) => {
         const TOKEN_NAME =

package/src/pages/NextAuthPage.tsx

@@ -119,37 +119,38 @@ export default function NextAuthPage(props: NextAuthPageProps) {
         return url;
       },
       async session({ session, token }) {
-        const returnSession = {
-          ...session,
-          data: token.data,
-          subject: token.sub,
-          listKey: token.listKey,
-          itemId: token.itemId,
-        };
+        let returnSession = session;
+        if (!token.itemId) {
+          return { expires: '0' };
+        } else {
+          returnSession = {
+            ...session,
+            data: token.data,
+            subject: token.sub,
+            listKey: token.listKey as string,
+            itemId: token.itemId as string,
+          };
+        }
+        console.log('Session', returnSession);
+
         return returnSession;
       },
       async jwt({ token }) {
         const identity = token.sub as number | string;
-        if (!token.itemId) {
-          const result = await validateNextAuth(
-            identityField,
-            identity,
-            protectIdentities,
-            queryAPI
-          );
-
-          if (!result.success) {
-            return token;
-          }
+        const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
+
+        if (!result.success) {
+          token.itemId = null;
+        } else {
           token.itemId = result.item.id;
+          const data = await query[listKey].findOne({
+            where: { id: token.itemId },
+            query: sessionData || 'id',
+          });
+          token.data = data;
         }
-        const data = await query[listKey].findOne({
-          where: { id: token.itemId },
-          query: sessionData || 'id',
-        });
         const returnToken = {
           ...token,
-          data,
           subject: token.sub,
           listKey,
         };

package/src/{types.ts → types/index.ts}

@@ -23,8 +23,6 @@ export declare type AuthSessionStrategy<StoredSessionData> = {
   }) => Promise<StoredSessionData | undefined>;
 };
 
-export type NextAuthSession = { listKey: string; itemId: string; data: any };
-
 export type NextAuthProviders = Provider[];
 
 type KeytoneOAuthOptions = {

package/src/types/next-auth.d.ts

@@ -0,0 +1,19 @@
+import NextAuth from 'next-auth';
+import { JWT } from 'next-auth/jwt';
+
+declare module 'next-auth' {
+  interface JWT {
+    data?: any | undefined;
+    subject?: string | undefined;
+    listKey?: string;
+    itemId?: string | undefined;
+    name?: string | null | undefined;
+    email?: string | null | undefined;
+    picture?: string | null | undefined;
+    sub?: string | null | undefined;
+    expires?: string | null | undefined;
+  }
+  interface Session extends JWT {
+    user?: any;
+  }
+}