@opensaas/keystone-nextjs-auth 22.2.1 → 23.0.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @opensaas-keystone/nextjs-auth
 
+## 23.0.0
+
+### Major Changes
+
+- cedcb30: Upgrade to `@keystone-6/core@2.0.0`
+
+## 22.2.3
+
+### Patch Changes
+
+- 415a15d: Fix the session user input so get is used correctly
+
+## 22.2.2
+
+### Patch Changes
+
+- 544ffd8: fix session order
+
 ## 22.2.1
 
 ### Patch Changes

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

@@ -386,13 +386,6 @@ function createAuth({
       }) => {
         var _req$headers, _req$headers$authoriz;
 
-        const session = await get({
-          req,
-          createContext
-        });
-        const sudoContext = createContext({
-          sudo: true
-        });
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
 
@@ -400,6 +393,10 @@ function createAuth({
           return;
         }
 
+        const sudoContext = createContext({
+          sudo: true
+        });
+
         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,
@@ -415,11 +412,21 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread({}, nextSession), {}, {
+        const reqWithUser = req;
+        reqWithUser.user = {
+          istKey: nextSession.listKey,
+          itemId: nextSession.itemId,
+          data: nextSession.data
+        };
+        const userSession = await get({
+          req: reqWithUser,
+          createContext
+        });
+        return _objectSpread(_objectSpread(_objectSpread({}, userSession), nextSession), {}, {
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId
-        }, session);
+        });
       },
       end: async ({
         res,
@@ -470,9 +477,9 @@ function createAuth({
         publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
         getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
         pageMiddleware: async args => {
-          var _await$pageMiddleware, _keystoneConfig$ui2, _keystoneConfig$ui2$p;
+          var _keystoneConfig$ui2, _keystoneConfig$ui2$p;
 
-          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args);
+          return (await pageMiddleware(args)) ?? (keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args));
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {

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

@@ -385,13 +385,6 @@ function createAuth({
       }) => {
         var _req$headers, _req$headers$authoriz;
 
-        const session = await get({
-          req,
-          createContext
-        });
-        const sudoContext = createContext({
-          sudo: true
-        });
         const pathname = url__default["default"].parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
 
@@ -399,6 +392,10 @@ function createAuth({
           return;
         }
 
+        const sudoContext = createContext({
+          sudo: true
+        });
+
         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,
@@ -414,11 +411,21 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread({}, nextSession), {}, {
+        const reqWithUser = req;
+        reqWithUser.user = {
+          istKey: nextSession.listKey,
+          itemId: nextSession.itemId,
+          data: nextSession.data
+        };
+        const userSession = await get({
+          req: reqWithUser,
+          createContext
+        });
+        return _objectSpread(_objectSpread(_objectSpread({}, userSession), nextSession), {}, {
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId
-        }, session);
+        });
       },
       end: async ({
         res,
@@ -469,9 +476,9 @@ function createAuth({
         publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
         getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
         pageMiddleware: async args => {
-          var _await$pageMiddleware, _keystoneConfig$ui2, _keystoneConfig$ui2$p;
+          var _keystoneConfig$ui2, _keystoneConfig$ui2$p;
 
-          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args);
+          return (await pageMiddleware(args)) ?? (keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args));
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {

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

@@ -353,13 +353,6 @@ function createAuth({
       }) => {
         var _req$headers, _req$headers$authoriz;
 
-        const session = await get({
-          req,
-          createContext
-        });
-        const sudoContext = createContext({
-          sudo: true
-        });
         const pathname = url.parse(req === null || req === void 0 ? void 0 : req.url).pathname;
         let nextSession;
 
@@ -367,6 +360,10 @@ function createAuth({
           return;
         }
 
+        const sudoContext = createContext({
+          sudo: true
+        });
+
         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,
@@ -382,11 +379,21 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread({}, nextSession), {}, {
+        const reqWithUser = req;
+        reqWithUser.user = {
+          istKey: nextSession.listKey,
+          itemId: nextSession.itemId,
+          data: nextSession.data
+        };
+        const userSession = await get({
+          req: reqWithUser,
+          createContext
+        });
+        return _objectSpread(_objectSpread(_objectSpread({}, userSession), nextSession), {}, {
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId
-        }, session);
+        });
       },
       end: async ({
         res,
@@ -437,9 +444,9 @@ function createAuth({
         publicPages: [...(keystoneConfig.ui.publicPages || []), ...publicPages],
         getAdditionalFiles: [...(((_keystoneConfig$ui = keystoneConfig.ui) === null || _keystoneConfig$ui === void 0 ? void 0 : _keystoneConfig$ui.getAdditionalFiles) || []), getAdditionalFiles],
         pageMiddleware: async args => {
-          var _await$pageMiddleware, _keystoneConfig$ui2, _keystoneConfig$ui2$p;
+          var _keystoneConfig$ui2, _keystoneConfig$ui2$p;
 
-          return (_await$pageMiddleware = await pageMiddleware(args)) !== null && _await$pageMiddleware !== void 0 ? _await$pageMiddleware : keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args);
+          return (await pageMiddleware(args)) ?? (keystoneConfig === null || keystoneConfig === void 0 ? void 0 : (_keystoneConfig$ui2 = keystoneConfig.ui) === null || _keystoneConfig$ui2 === void 0 ? void 0 : (_keystoneConfig$ui2$p = _keystoneConfig$ui2.pageMiddleware) === null || _keystoneConfig$ui2$p === void 0 ? void 0 : _keystoneConfig$ui2$p.call(_keystoneConfig$ui2, args));
         },
         enableSessionItem: true,
         isAccessAllowed: async context => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "22.2.1",
+  "version": "23.0.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
@@ -16,12 +16,12 @@
     "next-auth": "^4.3.4"
   },
   "devDependencies": {
-    "@keystone-6/core": "^1.1.0",
-    "react": "^17.0.2"
+    "@keystone-6/core": "^2.0.0",
+    "react": "^18.1.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "^1.1.0",
-    "react": "^17.0.2"
+    "@keystone-6/core": "^2.0.0",
+    "react": "^18.1.0"
   },
   "engines": {
     "node": "^14.13 || >= 16.13"

package/src/index.ts

@@ -198,13 +198,13 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
     return {
       ...sessionStrategy,
       get: async ({ req, createContext }) => {
-        const session = await get({ req, createContext });
-        const sudoContext = createContext({ sudo: true });
         const pathname = url.parse(req?.url!).pathname!;
         let nextSession: Session;
         if (pathname.includes('/api/auth')) {
           return;
         }
+        const sudoContext = createContext({ sudo: true });
+
         if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
           nextSession = (await getToken({
             req,
@@ -224,12 +224,21 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
         ) {
           return;
         }
+        const reqWithUser = req as any;
+        reqWithUser.user = {
+          istKey: nextSession.listKey,
+          itemId: nextSession.itemId,
+          data: nextSession.data,
+        };
+
+        const userSession = await get({ req: reqWithUser, createContext });
+
         return {
+          ...userSession,
           ...nextSession,
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId,
-          ...session,
         };
       },
       end: async ({ res, req, createContext }) => {