@opensaas/keystone-nextjs-auth 22.2.2 → 22.2.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @opensaas-keystone/nextjs-auth
 
+## 22.2.3
+
+### Patch Changes
+
+- 415a15d: Fix the session user input so get is used correctly
+
 ## 22.2.2
 
 ### Patch Changes

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

@@ -396,10 +396,6 @@ function createAuth({
         const sudoContext = createContext({
           sudo: true
         });
-        const session = await get({
-          req,
-          createContext
-        });
 
         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({
@@ -416,7 +412,17 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread(_objectSpread({}, session), 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

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

@@ -395,10 +395,6 @@ function createAuth({
         const sudoContext = createContext({
           sudo: true
         });
-        const session = await get({
-          req,
-          createContext
-        });
 
         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({
@@ -415,7 +411,17 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread(_objectSpread({}, session), 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

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

@@ -363,10 +363,6 @@ function createAuth({
         const sudoContext = createContext({
           sudo: true
         });
-        const session = await get({
-          req,
-          createContext
-        });
 
         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({
@@ -383,7 +379,17 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread(_objectSpread({}, session), 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

package/package.json

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

package/src/index.ts

@@ -205,7 +205,6 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
         }
         const sudoContext = createContext({ sudo: true });
 
-        const session = await get({ req, createContext });
         if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
           nextSession = (await getToken({
             req,
@@ -225,8 +224,17 @@ 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 {
-          ...session,
+          ...userSession,
           ...nextSession,
           data: nextSession.data,
           listKey: nextSession.listKey,