@opensaas/keystone-nextjs-auth 22.2.0 → 22.2.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @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
+
+- 544ffd8: fix session order
+
+## 22.2.1
+
+### Patch Changes
+
+- 8599b89: remove global prisma client as it is not required
+
 ## 22.2.0
 
 ### Minor Changes

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

@@ -168,13 +168,9 @@ import keystoneConfig from '../../../../../keystone';
 import { PrismaClient } from '.prisma/client';
 import { createQueryAPI } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/node-api';
 
-const prisma = global.prisma || PrismaClient
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
 
-if (process.env.NODE_ENV !== 'production') global.prisma = prisma
-
-const query = global.query || createQueryAPI(keystoneConfig, prisma);
-
-if (process.env.NODE_ENV !== 'production') global.query = query
+if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
 export default getNextAuthPage({
         autoCreate: <%= autoCreate %>,
@@ -182,7 +178,7 @@ export default getNextAuthPage({
         listKey: '<%= listKey %>',
         pages: keystoneConfig.pages,
         providers: keystoneConfig.providers,
-        query,
+        query: keystoneQueryAPI,
         resolver: keystoneConfig.resolver,
         sessionData: '<%= sessionData %>',
         sessionSecret: '<%= sessionSecret %>',
@@ -390,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;
 
@@ -404,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,
@@ -419,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,

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

@@ -167,13 +167,9 @@ import keystoneConfig from '../../../../../keystone';
 import { PrismaClient } from '.prisma/client';
 import { createQueryAPI } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/node-api';
 
-const prisma = global.prisma || PrismaClient
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
 
-if (process.env.NODE_ENV !== 'production') global.prisma = prisma
-
-const query = global.query || createQueryAPI(keystoneConfig, prisma);
-
-if (process.env.NODE_ENV !== 'production') global.query = query
+if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
 export default getNextAuthPage({
         autoCreate: <%= autoCreate %>,
@@ -181,7 +177,7 @@ export default getNextAuthPage({
         listKey: '<%= listKey %>',
         pages: keystoneConfig.pages,
         providers: keystoneConfig.providers,
-        query,
+        query: keystoneQueryAPI,
         resolver: keystoneConfig.resolver,
         sessionData: '<%= sessionData %>',
         sessionSecret: '<%= sessionSecret %>',
@@ -389,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;
 
@@ -403,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,
@@ -418,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,

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

@@ -135,13 +135,9 @@ import keystoneConfig from '../../../../../keystone';
 import { PrismaClient } from '.prisma/client';
 import { createQueryAPI } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/node-api';
 
-const prisma = global.prisma || PrismaClient
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
 
-if (process.env.NODE_ENV !== 'production') global.prisma = prisma
-
-const query = global.query || createQueryAPI(keystoneConfig, prisma);
-
-if (process.env.NODE_ENV !== 'production') global.query = query
+if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
 export default getNextAuthPage({
         autoCreate: <%= autoCreate %>,
@@ -149,7 +145,7 @@ export default getNextAuthPage({
         listKey: '<%= listKey %>',
         pages: keystoneConfig.pages,
         providers: keystoneConfig.providers,
-        query,
+        query: keystoneQueryAPI,
         resolver: keystoneConfig.resolver,
         sessionData: '<%= sessionData %>',
         sessionSecret: '<%= sessionSecret %>',
@@ -357,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;
 
@@ -371,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,
@@ -386,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "22.2.0",
+  "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

@@ -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 }) => {

package/src/templates/auth.ts

@@ -7,13 +7,9 @@ import keystoneConfig from '../../../../../keystone';
 import { PrismaClient } from '.prisma/client';
 import { createQueryAPI } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/node-api';
 
-const prisma = global.prisma || PrismaClient
+const keystoneQueryAPI = global.keystoneQueryAPI || createQueryAPI(keystoneConfig, PrismaClient);
 
-if (process.env.NODE_ENV !== 'production') global.prisma = prisma
-
-const query = global.query || createQueryAPI(keystoneConfig, prisma);
-
-if (process.env.NODE_ENV !== 'production') global.query = query
+if (process.env.NODE_ENV !== 'production') globalThis.keystoneQueryAPI = keystoneQueryAPI
 
 export default getNextAuthPage({
         autoCreate: <%= autoCreate %>,
@@ -21,7 +17,7 @@ export default getNextAuthPage({
         listKey: '<%= listKey %>',
         pages: keystoneConfig.pages,
         providers: keystoneConfig.providers,
-        query,
+        query: keystoneQueryAPI,
         resolver: keystoneConfig.resolver,
         sessionData: '<%= sessionData %>',
         sessionSecret: '<%= sessionSecret %>',