@opensaas/keystone-nextjs-auth 20.2.0 → 20.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @opensaas-keystone/nextjs-auth
 
+## 20.3.0
+
+### Minor Changes
+
+- 34e9932: Fix up stale next session - session is now refreshed on change of data
+
 ## 20.2.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "20.2.0",
+  "version": "20.3.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",

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

@@ -167,27 +167,26 @@ function NextAuthPage(props) {
           const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
-            return;
+            return token;
           }
 
-          const data = await query[listKey].findOne({
-            where: {
-              id: result.item.id
-            },
-            query: sessionData || 'id'
-          });
+          token.itemId = result.item.id;
+        }
 
-          const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString()
-          });
+        const data = await query[listKey].findOne({
+          where: {
+            id: token.itemId
+          },
+          query: sessionData || 'id'
+        });
 
-          return returnToken;
-        }
+        const returnToken = _objectSpread(_objectSpread({}, token), {}, {
+          data,
+          subject: token.sub,
+          listKey
+        });
 
-        return token;
+        return returnToken;
       }
 
     }

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

@@ -167,27 +167,26 @@ function NextAuthPage(props) {
           const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
-            return;
+            return token;
           }
 
-          const data = await query[listKey].findOne({
-            where: {
-              id: result.item.id
-            },
-            query: sessionData || 'id'
-          });
+          token.itemId = result.item.id;
+        }
 
-          const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString()
-          });
+        const data = await query[listKey].findOne({
+          where: {
+            id: token.itemId
+          },
+          query: sessionData || 'id'
+        });
 
-          return returnToken;
-        }
+        const returnToken = _objectSpread(_objectSpread({}, token), {}, {
+          data,
+          subject: token.sub,
+          listKey
+        });
 
-        return token;
+        return returnToken;
       }
 
     }

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

@@ -158,27 +158,26 @@ function NextAuthPage(props) {
           const result = await validateNextAuth(identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
-            return;
+            return token;
           }
 
-          const data = await query[listKey].findOne({
-            where: {
-              id: result.item.id
-            },
-            query: sessionData || 'id'
-          });
+          token.itemId = result.item.id;
+        }
 
-          const returnToken = _objectSpread(_objectSpread({}, token), {}, {
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString()
-          });
+        const data = await query[listKey].findOne({
+          where: {
+            id: token.itemId
+          },
+          query: sessionData || 'id'
+        });
 
-          return returnToken;
-        }
+        const returnToken = _objectSpread(_objectSpread({}, token), {}, {
+          data,
+          subject: token.sub,
+          listKey
+        });
 
-        return token;
+        return returnToken;
       }
 
     }

package/src/pages/NextAuthPage.tsx

@@ -125,24 +125,22 @@ export default function NextAuthPage(props: NextAuthPageProps) {
           );
 
           if (!result.success) {
-            return;
+            return token;
           }
-
-          const data = await query[listKey].findOne({
-            where: { id: result.item.id },
-            query: sessionData || 'id',
-          });
-          const returnToken = {
-            ...token,
-            data,
-            subject: token.sub,
-            listKey,
-            itemId: result.item.id.toString(),
-          };
-
-          return returnToken;
+          token.itemId = result.item.id;
         }
-        return token;
+        const data = await query[listKey].findOne({
+          where: { id: token.itemId },
+          query: sessionData || 'id',
+        });
+        const returnToken = {
+          ...token,
+          data,
+          subject: token.sub,
+          listKey,
+        };
+
+        return returnToken;
       },
     },
   });