@opensaas/keystone-nextjs-auth 22.2.1 → 22.2.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @opensaas-keystone/nextjs-auth
 
+## 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,14 @@ function createAuth({
           return;
         }
 
+        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({
             req,
@@ -415,11 +416,11 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread({}, nextSession), {}, {
+        return _objectSpread(_objectSpread(_objectSpread({}, session), nextSession), {}, {
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId
-        }, session);
+        });
       },
       end: async ({
         res,

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,14 @@ function createAuth({
           return;
         }
 
+        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({
             req,
@@ -414,11 +415,11 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread({}, nextSession), {}, {
+        return _objectSpread(_objectSpread(_objectSpread({}, session), nextSession), {}, {
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId
-        }, session);
+        });
       },
       end: async ({
         res,

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,14 @@ function createAuth({
           return;
         }
 
+        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({
             req,
@@ -382,11 +383,11 @@ function createAuth({
           return;
         }
 
-        return _objectSpread(_objectSpread({}, nextSession), {}, {
+        return _objectSpread(_objectSpread(_objectSpread({}, session), nextSession), {}, {
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId
-        }, session);
+        });
       },
       end: async ({
         res,

package/package.json

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

package/src/index.ts

@@ -198,13 +198,14 @@ 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 });
+
+        const session = await get({ req, createContext });
         if (req.headers?.authorization?.split(' ')[0] === 'Bearer') {
           nextSession = (await getToken({
             req,
@@ -225,11 +226,11 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
           return;
         }
         return {
+          ...session,
           ...nextSession,
           data: nextSession.data,
           listKey: nextSession.listKey,
           itemId: nextSession.itemId,
-          ...session,
         };
       },
       end: async ({ res, req, createContext }) => {