@opensaas/keystone-nextjs-auth 26.0.0 → 27.0.0

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

@@ -6,21 +6,18 @@ async function findMatchingIdentity(identityField, identity, queryAPI) {
     where: {
       [identityField]: identity
     }
-  }); // Identity failures with helpful errors
-
+  });
+  // Identity failures with helpful errors
   let code;
-
   if (!item) {
     code = 'IDENTITY_NOT_FOUND';
   }
-
   if (code) {
     return {
       success: false,
       code
     };
   }
-
   return {
     success: true,
     item
@@ -32,14 +29,12 @@ async function validateNextAuth(identityField, identity, protectIdentities, item
   const {
     item
   } = match;
-
   if (item) {
     return {
       success: true,
       item
     };
   }
-
   return {
     success: false,
     code: protectIdentities ? 'FAILURE' : 'SUBJECT_NOT_FOUND'
@@ -61,17 +56,14 @@ function NextAuthPage(props) {
     sessionData,
     sessionSecret
   } = props;
-
   if (!query) {
     console.error('NextAuthPage got no query.');
     return null;
   }
-
   if (!providers || !providers.length) {
     console.error('You need to provide at least one provider.');
     return null;
   }
-
   const list = query[listKey];
   const protectIdentities = true;
   return NextAuth({
@@ -89,7 +81,6 @@ function NextAuthPage(props) {
           profile
         } = _ref;
         let identity;
-
         if (typeof user.id === 'string') {
           identity = user.id;
         } else if (typeof user.id === 'number') {
@@ -97,23 +88,20 @@ function NextAuthPage(props) {
         } else {
           identity = 0;
         }
-
         const userInput = resolver ? await resolver({
           user,
           account,
           profile
         }) : {};
-        const result = await validateNextAuth(identityField, identity, protectIdentities, list); // ID
-
+        const result = await validateNextAuth(identityField, identity, protectIdentities, list);
+        // ID
         const data = _objectSpread({
           [identityField]: identity
         }, userInput);
-
         if (!result.success) {
           if (!autoCreate) {
             return false;
           }
-
           const createUser = await list.createOne({
             data
           }).then(returned => {
@@ -127,7 +115,6 @@ function NextAuthPage(props) {
           });
           return createUser.success;
         }
-
         const updateUser = await list.updateOne({
           where: {
             id: result.item.id
@@ -144,21 +131,18 @@ function NextAuthPage(props) {
         });
         return updateUser.success;
       },
-
       async redirect(_ref2) {
         let {
           url
         } = _ref2;
         return url;
       },
-
       async session(_ref3) {
         let {
           session,
           token
         } = _ref3;
         let returnSession = session;
-
         if (!token.itemId) {
           return session;
         } else {
@@ -169,22 +153,17 @@ function NextAuthPage(props) {
             itemId: token.itemId
           });
         }
-
         return returnSession;
       },
-
       async jwt(_ref4) {
         let {
           token
         } = _ref4;
         const identity = token.sub;
-
         if (!identity) {
           return token;
         }
-
         const result = await validateNextAuth(identityField, identity, protectIdentities, list);
-
         if (!result.success) {
           token.itemId = undefined;
         } else {
@@ -197,15 +176,12 @@ function NextAuthPage(props) {
           });
           token.data = data;
         }
-
         const returnToken = _objectSpread(_objectSpread({}, token), {}, {
           subject: token.sub,
           listKey
         });
-
         return returnToken;
       }
-
     }
   });
 }

package/src/index.ts

@@ -61,12 +61,12 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    */
   const authMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] = async ({
     context,
-    isValidSession,
+    wasAccessAllowed,
   }) => {
     const { req, session } = context;
     const pathname = url.parse(req?.url!).pathname!;
 
-    if (isValidSession) {
+    if (wasAccessAllowed) {
       if (customPath !== '' && pathname === '/') {
         return { kind: 'redirect', to: `${customPath}` };
       }