@flowerforce/flowerbase 1.7.3-beta.1 → 1.7.3-beta.2

package/dist/auth/plugins/jwt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../src/auth/plugins/jwt.ts"],"names":[],"mappings":"AAKA,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAQD;;;;;;;GAOG;iUAC8C,OAAO;AAAxD,wBA4GE"}
+{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../src/auth/plugins/jwt.ts"],"names":[],"mappings":"AAKA,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAeD;;;;;;;GAOG;iUAC8C,OAAO;AAAxD,wBA4GE"}

package/dist/auth/plugins/jwt.js

@@ -16,6 +16,12 @@ const jwt_1 = __importDefault(require("@fastify/jwt"));
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const mongodb_1 = require("mongodb");
 const constants_1 = require("../../constants");
+const unauthorizedSessionError = {
+    message: 'Unauthorized',
+    error: 'unauthorized',
+    errorCode: 'InvalidSession',
+    error_code: 'InvalidSession'
+};
 /**
  * This module is a Fastify plugin that sets up JWT-based authentication and token creation.
  * It registers JWT authentication, and provides methods to create access and refresh tokens.
@@ -38,7 +44,7 @@ exports.default = (0, fastify_plugin_1.default)(function (fastify, opts) {
                 }
                 catch (err) {
                     fastify.log.warn({ err }, 'JWT authentication failed');
-                    reply.code(401).send({ message: 'Unauthorized' });
+                    reply.code(401).send(unauthorizedSessionError);
                     return;
                 }
                 if (((_a = request.user) === null || _a === void 0 ? void 0 : _a.typ) !== 'access') {
@@ -50,7 +56,7 @@ exports.default = (0, fastify_plugin_1.default)(function (fastify, opts) {
                     return;
                 }
                 if (!request.user.sub) {
-                    reply.code(401).send({ message: 'Unauthorized' });
+                    reply.code(401).send(unauthorizedSessionError);
                     return;
                 }
                 let authUser;
@@ -61,11 +67,11 @@ exports.default = (0, fastify_plugin_1.default)(function (fastify, opts) {
                 }
                 catch (err) {
                     fastify.log.warn({ err }, 'Failed to lookup user during JWT authentication');
-                    reply.code(401).send({ message: 'Unauthorized' });
+                    reply.code(401).send(unauthorizedSessionError);
                     return;
                 }
                 if (!authUser) {
-                    reply.code(401).send({ message: 'Unauthorized' });
+                    reply.code(401).send(unauthorizedSessionError);
                     return;
                 }
                 const lastLogoutAt = authUser.lastLogoutAt ? new Date(authUser.lastLogoutAt) : null;
@@ -81,7 +87,7 @@ exports.default = (0, fastify_plugin_1.default)(function (fastify, opts) {
                     typeof issuedAt === 'number' &&
                     !Number.isNaN(issuedAt) &&
                     lastLogoutAt.getTime() >= issuedAt * 1000) {
-                    reply.code(401).send({ message: 'Unauthorized' });
+                    reply.code(401).send(unauthorizedSessionError);
                     return;
                 }
             });

package/dist/utils/context/helpers.d.ts

@@ -15,7 +15,7 @@ type JwtUtils = {
  * @param currentFunction -> the function's name that should be called
  * @param functionsList -> the list of all functions
  */
-export declare const generateContextData: ({ user, services, app, rules, currentFunction, functionName, functionsList, GenerateContext, GenerateContextSync, request }: GenerateContextDataParams) => {
+export declare const generateContextData: ({ user, services, app, rules, currentFunction, functionName, functionsList, GenerateContextSync, request }: GenerateContextDataParams) => {
     BSON: typeof mongodb.BSON;
     EJSON: {
         parse: (text: string, options?: mongodb.BSON.EJSONOptions) => any;

package/dist/utils/context/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/context/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AAGvD,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,CACN,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzC,MAAM,CAAA;IACX,MAAM,EAAE,CACN,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,YAAY,CAAC,EAAE,OAAO,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAC9B,OAAO,CAAA;CACb,CAAA;AAgFD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,GAAI,6HAWjC,yBAAyB;;;;;;;;;;;;;uBA4DP,SAAS;yBAGP,SAAS;;;;;;;;;;;;;;;;;;uBAcb,MAAM;;;;;;+BA5CU,MAAM,OAAO,QAAQ;;;;sCA3HrC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAsG+B,CAAC;iCAC5C,CAAD;;;;;;;;;;;;;;;;;;;kCAvGY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsG+B,CAAC;6BAC5C,CAAD;;;;;;;;;;;;;;;;;;kCAvGY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsG+B,CAAC;6BAC5C,CAAD;;;;;;;;;;;;;;;4BAyEiB,MAAM,OAAO,aAAa,WAAW,SAAS;;;CAgBrE,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/context/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AAEvD,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,CACN,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzC,MAAM,CAAA;IACX,MAAM,EAAE,CACN,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,YAAY,CAAC,EAAE,OAAO,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAC9B,OAAO,CAAA;CACb,CAAA;AAgFD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,GAAI,4GAUjC,yBAAyB;;;;;;;;;;;;;uBA4DP,SAAS;yBAGP,SAAS;;;;;;;;;;;;;;;;;;uBAcb,MAAM;;;;;;+BA5CU,MAAM,OAAO,QAAQ;;;;sCA1HrC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAsGT,CAAC;iCAAa,CAAC;;;;;;;;;;;;;;;;;;;kCAtGP,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsGT,CAAC;6BAAa,CAAC;;;;;;;;;;;;;;;;;;kCAtGP,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsGT,CAAC;6BAAa,CAAC;;;;;;;;;;;;;;;4BAyEF,MAAM,OAAO,aAAa,WAAW,SAAS;;;CAiBrE,CAAA"}

package/dist/utils/context/helpers.js

@@ -35,8 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateContextData = void 0;
 const mongodb_1 = require("@fastify/mongodb");
-const jwt = __importStar(require("jsonwebtoken"));
 const bson_1 = require("bson");
+const jwt = __importStar(require("jsonwebtoken"));
 const normalizePayload = (payload) => {
     if (typeof payload !== 'string')
         return payload;
@@ -108,7 +108,7 @@ const createJwtUtils = () => {
  * @param currentFunction -> the function's name that should be called
  * @param functionsList -> the list of all functions
  */
-const generateContextData = ({ user, services, app, rules, currentFunction, functionName, functionsList, GenerateContext, GenerateContextSync, request }) => {
+const generateContextData = ({ user, services, app, rules, currentFunction, functionName, functionsList, GenerateContextSync, request }) => {
     var _a;
     const BSON = mongodb_1.mongodb.BSON;
     const Binary = BSON === null || BSON === void 0 ? void 0 : BSON.Binary;
@@ -185,7 +185,8 @@ const generateContextData = ({ user, services, app, rules, currentFunction, func
                         currentFunction,
                         functionName: String(name),
                         functionsList,
-                        services
+                        services,
+                        deserializeArgs: false
                     });
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.7.3-beta.1",
+  "version": "1.7.3-beta.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/auth/plugins/jwt.test.ts

@@ -40,6 +40,13 @@ describe('jwtAuthentication', () => {
     await app.close()
   })
 
+  const unauthorizedSessionError = {
+    message: 'Unauthorized',
+    error: 'unauthorized',
+    errorCode: 'InvalidSession',
+    error_code: 'InvalidSession'
+  }
+
   const setupMongo = (userPayload: { _id: ObjectId; lastLogoutAt?: Date }) => {
     const findOneMock = jest.fn().mockResolvedValue(userPayload)
     const collectionMock = { findOne: findOneMock }
@@ -88,6 +95,20 @@ describe('jwtAuthentication', () => {
     await app.jwtAuthentication(request as any, reply)
 
     expect(reply.code).toHaveBeenCalledWith(401)
-    expect(reply.send).toHaveBeenCalledWith({ message: 'Unauthorized' })
+    expect(reply.send).toHaveBeenCalledWith(unauthorizedSessionError)
+  })
+
+  it('returns Realm-compatible unauthorized payload when jwt verification fails', async () => {
+    const request = {
+      jwtVerify: jest.fn(async () => {
+        throw new Error('jwt expired')
+      })
+    }
+    const reply = createReply()
+
+    await app.jwtAuthentication(request as any, reply)
+
+    expect(reply.code).toHaveBeenCalledWith(401)
+    expect(reply.send).toHaveBeenCalledWith(unauthorizedSessionError)
   })
 })

package/src/auth/plugins/jwt.ts

@@ -13,6 +13,13 @@ type JwtAccessWithTimestamp = {
   iat?: number
 }
 
+const unauthorizedSessionError = {
+  message: 'Unauthorized',
+  error: 'unauthorized',
+  errorCode: 'InvalidSession',
+  error_code: 'InvalidSession'
+} as const
+
 /**
  * This module is a Fastify plugin that sets up JWT-based authentication and token creation.
  * It registers JWT authentication, and provides methods to create access and refresh tokens.
@@ -33,7 +40,7 @@ export default fp(async function (fastify, opts: Options) {
       await request.jwtVerify()
     } catch (err) {
       fastify.log.warn({ err }, 'JWT authentication failed')
-      reply.code(401).send({ message: 'Unauthorized' })
+      reply.code(401).send(unauthorizedSessionError)
       return
     }
 
@@ -48,7 +55,7 @@ export default fp(async function (fastify, opts: Options) {
     }
 
     if (!request.user.sub) {
-      reply.code(401).send({ message: 'Unauthorized' })
+      reply.code(401).send(unauthorizedSessionError)
       return
     }
 
@@ -59,12 +66,12 @@ export default fp(async function (fastify, opts: Options) {
         .findOne({ _id: new ObjectId(request.user.sub) })
     } catch (err) {
       fastify.log.warn({ err }, 'Failed to lookup user during JWT authentication')
-      reply.code(401).send({ message: 'Unauthorized' })
+      reply.code(401).send(unauthorizedSessionError)
       return
     }
 
     if (!authUser) {
-      reply.code(401).send({ message: 'Unauthorized' })
+      reply.code(401).send(unauthorizedSessionError)
       return
     }
 
@@ -84,7 +91,7 @@ export default fp(async function (fastify, opts: Options) {
       !Number.isNaN(issuedAt) &&
       lastLogoutAt.getTime() >= issuedAt * 1000
     ) {
-      reply.code(401).send({ message: 'Unauthorized' })
+      reply.code(401).send(unauthorizedSessionError)
       return
     }
   })

package/src/utils/__tests__/contextExecuteCompatibility.test.ts

@@ -57,4 +57,38 @@ describe('context.functions.execute compatibility', () => {
     expect(result && typeof (result as Promise<unknown>).then).toBe('function')
     await expect(result).resolves.toEqual({ ok: true })
   })
+
+  it('passes circular native objects without EJSON deserialization', () => {
+    const functionsList = {
+      caller: {
+        code: `
+          module.exports = function() {
+            const session = { tx: true }
+            session.client = { sessionPool: { client: session } }
+            return context.functions.execute("target", session)
+          }
+        `
+      },
+      target: {
+        code: `
+          module.exports = function(session) {
+            return session.client.sessionPool.client === session
+          }
+        `
+      }
+    } as Functions
+
+    const result = GenerateContextSync({
+      args: [],
+      app: {} as any,
+      rules: {} as any,
+      user: {} as any,
+      currentFunction: functionsList.caller,
+      functionsList,
+      services: mockServices,
+      functionName: 'caller'
+    })
+
+    expect(result).toBe(true)
+  })
 })

package/src/utils/context/helpers.ts

@@ -1,9 +1,9 @@
 import { mongodb } from '@fastify/mongodb'
+import { EJSON } from 'bson'
 import * as jwt from 'jsonwebtoken'
 import { Arguments } from '../../auth/dtos'
 import { Function } from '../../features/functions/interface'
 import { GenerateContextDataParams } from './interface'
-import { EJSON } from 'bson'
 
 type JwtUtils = {
   encode: (
@@ -116,7 +116,6 @@ export const generateContextData = ({
   currentFunction,
   functionName,
   functionsList,
-  GenerateContext,
   GenerateContextSync,
   request
 }: GenerateContextDataParams) => {
@@ -215,7 +214,8 @@ export const generateContextData = ({
             currentFunction,
             functionName: String(name),
             functionsList,
-            services
+            services,
+            deserializeArgs: false
           })
         }
       }