@opensaas/keystone-nextjs-auth 21.1.0 → 22.1.0

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({
@@ -155,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;
       },
 
@@ -169,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

@@ -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({
@@ -155,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;
       },
 
@@ -169,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

@@ -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({
@@ -146,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;
       },
 
@@ -160,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/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';
@@ -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 } from './types';
+import { AuthConfig, KeystoneOAuthConfig, AuthSessionStrategy } from './types';
 import { getSchemaExtension } from './schema';
 import { authTemplate } from './templates/auth';
 
@@ -56,31 +57,41 @@ 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 (
-        !session &&
-        !pathname.includes(`${customPath}/api/auth/`) &&
-        !(Object.values(pages).indexOf(pathname) > -1)
+        pathname === `${customPath}/api/auth/signin` ||
+        (pages?.signIn && pathname.includes(pages?.signIn))
       ) {
-        return { kind: 'redirect', to: `${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/') ||
+      (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,37 +192,46 @@ 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<{ listKey: string; itemId: string; data: any }> => {
+    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 }) => {
+      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({
+        if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
+          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 =
@@ -252,13 +272,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 +302,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 +322,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 },
   });