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

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/services/mongodb-atlas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAyC,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAysCrF,QAAA,MAAM,YAAY,EAAE,oBA6BlB,CAAA;AAEF,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAuBA,OAAO,EAGL,oBAAoB,EAErB,MAAM,SAAS,CAAA;AA0tChB,QAAA,MAAM,YAAY,EAAE,oBA6BlB,CAAA;AAEF,eAAe,YAAY,CAAA"}

package/dist/services/mongodb-atlas/index.js

@@ -8,15 +8,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const get_1 = __importDefault(require("lodash/get"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const set_1 = __importDefault(require("lodash/set"));
 const unset_1 = __importDefault(require("lodash/unset"));
-const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const utils_1 = require("../../monitoring/utils");
 const machines_1 = require("../../utils/roles/machines");
 const utils_2 = require("../../utils/roles/machines/utils");
@@ -92,6 +103,15 @@ const normalizeInsertManyResult = (result) => {
         return result;
     return Object.assign(Object.assign({}, result), { insertedIds: Object.values(result.insertedIds) });
 };
+const normalizeFindOneAndUpdateOptions = (options) => {
+    if (!options)
+        return undefined;
+    const { returnNewDocument } = options, rest = __rest(options, ["returnNewDocument"]);
+    if (typeof returnNewDocument !== 'boolean' || typeof rest.returnDocument !== 'undefined') {
+        return rest;
+    }
+    return Object.assign(Object.assign({}, rest), { returnDocument: returnNewDocument ? 'after' : 'before' });
+};
 const hasAtomicOperators = (data) => Object.keys(data).some((key) => key.startsWith('$'));
 const normalizeUpdatePayload = (data) => hasAtomicOperators(data) ? data : { $set: data };
 const hasOperatorExpressions = (value) => isPlainObject(value) && Object.keys(value).some((key) => key.startsWith('$'));
@@ -569,6 +589,7 @@ const getOperators = (collection, { rules, collName, user, run_as_system, monito
         findOneAndUpdate: (query, data, options) => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             try {
+                const normalizedOptions = normalizeFindOneAndUpdateOptions(options);
                 if (!run_as_system) {
                     (0, utils_3.checkDenyOperation)(normalizedRules, collection.collectionName, model_1.CRUD_OPERATIONS.UPDATE);
                     const formattedQuery = (0, utils_3.getFormattedQuery)(filters, query, user);
@@ -605,8 +626,8 @@ const getOperators = (collection, { rules, collName, user, run_as_system, monito
                     if (!status || !areDocumentsEqual) {
                         throw new Error('Update not permitted');
                     }
-                    const updateResult = options
-                        ? yield collection.findOneAndUpdate({ $and: safeQuery }, normalizedData, options)
+                    const updateResult = normalizedOptions
+                        ? yield collection.findOneAndUpdate({ $and: safeQuery }, normalizedData, normalizedOptions)
                         : yield collection.findOneAndUpdate({ $and: safeQuery }, normalizedData);
                     if (!updateResult) {
                         emitMongoEvent('findOneAndUpdate');
@@ -625,8 +646,8 @@ const getOperators = (collection, { rules, collName, user, run_as_system, monito
                     emitMongoEvent('findOneAndUpdate');
                     return sanitizedDoc;
                 }
-                const updateResult = options
-                    ? yield collection.findOneAndUpdate(query, data, options)
+                const updateResult = normalizedOptions
+                    ? yield collection.findOneAndUpdate(query, data, normalizedOptions)
                     : yield collection.findOneAndUpdate(query, data);
                 emitMongoEvent('findOneAndUpdate');
                 return updateResult;

package/dist/services/mongodb-atlas/model.d.ts

@@ -29,11 +29,11 @@ export type GetOperatorsFunction = (collection: Collection<Document>, { rules, c
     collName: string;
     monitoringOrigin?: string;
 }) => {
+    findOneAndUpdate: (filter: MongoFilter<Document>, update: UpdateFilter<Document> | Document[], options?: RealmCompatibleFindOneAndUpdateOptions) => Promise<Document | null>;
     findOne: (filter?: MongoFilter<Document>, projection?: Document, options?: FindOneOptions) => ReturnType<Method<'findOne'>>;
     deleteOne: (...params: Parameters<Method<'deleteOne'>>) => ReturnType<Method<'deleteOne'>>;
     insertOne: (...params: Parameters<Method<'insertOne'>>) => ReturnType<Method<'insertOne'>>;
     updateOne: (...params: Parameters<Method<'updateOne'>>) => ReturnType<Method<'updateOne'>>;
-    findOneAndUpdate: (filter: MongoFilter<Document>, update: UpdateFilter<Document> | Document[], options?: FindOneAndUpdateOptions) => Promise<Document | null>;
     find: (filter?: MongoFilter<Document>, projection?: Document, options?: FindOptions) => FindCursor;
     count: (...params: Parameters<Method<'countDocuments'>>) => ReturnType<Method<'countDocuments'>>;
     countDocuments: (...params: Parameters<Method<'countDocuments'>>) => ReturnType<Method<'countDocuments'>>;
@@ -43,6 +43,9 @@ export type GetOperatorsFunction = (collection: Collection<Document>, { rules, c
     updateMany: (...params: Parameters<Method<'updateMany'>>) => ReturnType<Method<'updateMany'>>;
     deleteMany: (...params: Parameters<Method<'deleteMany'>>) => ReturnType<Method<'deleteMany'>>;
 };
+export type RealmCompatibleFindOneAndUpdateOptions = FindOneAndUpdateOptions & {
+    returnNewDocument?: boolean;
+};
 export declare enum CRUD_OPERATIONS {
     CREATE = "CREATE",
     READ = "READ",

package/dist/services/mongodb-atlas/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,UAAU,EACV,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,WAAW,EACX,MAAM,IAAI,WAAW,EACrB,YAAY,EACZ,MAAM,EACP,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,MAAM,MAAM,oBAAoB,GAAG,CACjC,GAAG,EAAE,eAAe,EACpB,EACE,KAAK,EACL,IAAI,EACJ,aAAa,EACb,UAAU,EACX,EAAE;IACD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,UAAU,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACtC,KACE;IACH,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK;QACtB,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,UAAU,CAAC,oBAAoB,CAAC,CAAA;KACnE,CAAA;IACD,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,oBAAoB,KAAK,aAAa,CAAA;CAChE,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,IAAI;IACxD,OAAO,EAAE,CAAC,EAAE,CAAA;IACZ,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAA;CAC5C,CAAA;AACD,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,UAAU,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;AAE3E,MAAM,MAAM,oBAAoB,GAAG,CACjC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,EAChC,EACE,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,gBAAgB,EACjB,EAAE;IACD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,KACE;IACH,gBAAgB,EAAE,CAChB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,EAC7B,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,QAAQ,EAAE,EAC3C,OAAO,CAAC,EAAE,sCAAsC,KAC7C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;IAC7B,OAAO,EAAE,CACP,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,EAC9B,UAAU,CAAC,EAAE,QAAQ,EACrB,OAAO,CAAC,EAAE,cAAc,KACrB,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;IAC1F,SAAS,EAAE,CACT,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KACvC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;IACpC,SAAS,EAAE,CACT,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KACvC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;IACpC,IAAI,EAAE,CACJ,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,EAC9B,UAAU,CAAC,EAAE,QAAQ,EACrB,OAAO,CAAC,EAAE,WAAW,KAClB,UAAU,CAAA;IACf,KAAK,EAAE,CACL,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,KAC5C,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAA;IACzC,cAAc,EAAE,CACd,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,KAC5C,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAA;IACzC,KAAK,EAAE,CAAC,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;IAC9E,SAAS,EAAE,CACT,GAAG,MAAM,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,KAC/D,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;IACpC,UAAU,EAAE,CACV,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KACxC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;IACrC,UAAU,EAAE,CACV,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KACxC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;IACrC,UAAU,EAAE,CACV,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KACxC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,sCAAsC,GAAG,uBAAuB,GAAG;IAC7E,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAGD,oBAAY,eAAe;IACzB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;CAElB"}

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.3",
   "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/services/mongodb-atlas/__tests__/findOneAndUpdate.test.ts

@@ -91,4 +91,38 @@ describe('mongodb-atlas findOneAndUpdate', () => {
     ).rejects.toThrow('Update not permitted')
     expect(findOneAndUpdate).not.toHaveBeenCalled()
   })
+
+  it('maps returnNewDocument=true to returnDocument=after', async () => {
+    const id = new ObjectId()
+    const existingDoc = { _id: id, value: 100, userId: 'user-1' }
+    const updatedDoc = { _id: id, value: 101, userId: 'user-1' }
+    const findOne = jest.fn().mockResolvedValue(existingDoc)
+    const findOneAndUpdate = jest.fn().mockResolvedValue(updatedDoc)
+    const collection = {
+      collectionName: 'todos',
+      findOne,
+      findOneAndUpdate
+    }
+
+    const app = createAppWithCollection(collection)
+    const operators = MongoDbAtlas(app as any, {
+      rules: createRules(),
+      user: { id: 'user-1' }
+    })
+      .db('db')
+      .collection('todos')
+
+    const result = await operators.findOneAndUpdate(
+      { _id: id },
+      { $inc: { value: 1 } },
+      { returnNewDocument: true } as any
+    )
+
+    expect(result).toEqual(updatedDoc)
+    expect(findOneAndUpdate).toHaveBeenCalledWith(
+      { $and: [{ _id: id }] },
+      { $inc: { value: 1 } },
+      { returnDocument: 'after' }
+    )
+  })
 })

package/src/services/mongodb-atlas/__tests__/realmCompatibility.test.ts

@@ -153,6 +153,31 @@ describe('mongodb-atlas Realm compatibility', () => {
     expect(aggregate).not.toHaveBeenCalled()
   })
 
+  it('supports Realm returnNewDocument option in findOneAndUpdate', async () => {
+    const id = new ObjectId()
+    const findOneAndUpdate = jest.fn().mockResolvedValue({ _id: id, value: 101 })
+    const collection = {
+      collectionName: 'todos',
+      findOneAndUpdate
+    }
+    const operators = MongoDbAtlas(createAppWithCollection(collection) as any, {
+      run_as_system: true
+    }).db('db').collection('todos')
+
+    const result = await operators.findOneAndUpdate(
+      { _id: id },
+      { $inc: { value: 1 } } as any,
+      { returnNewDocument: true } as any
+    )
+
+    expect(result).toEqual({ _id: id, value: 101 })
+    expect(findOneAndUpdate).toHaveBeenCalledWith(
+      { _id: id },
+      { $inc: { value: 1 } },
+      { returnDocument: 'after' }
+    )
+  })
+
   it('supports operator updates in updateMany without using invalid aggregate stages', async () => {
     const id = new ObjectId()
     const find = jest.fn().mockReturnValue({

package/src/services/mongodb-atlas/index.ts

@@ -1,17 +1,17 @@
+import cloneDeep from 'lodash/cloneDeep'
 import get from 'lodash/get'
 import isEqual from 'lodash/isEqual'
 import set from 'lodash/set'
 import unset from 'lodash/unset'
-import cloneDeep from 'lodash/cloneDeep'
 import {
   ClientSession,
   ClientSessionOptions,
   Collection,
   Document,
   EventsDescription,
+  FindOneAndUpdateOptions,
   FindOneOptions,
   FindOptions,
-  FindOneAndUpdateOptions,
   Filter as MongoFilter,
   UpdateFilter,
   WithId
@@ -21,7 +21,12 @@ import { buildRulesMeta } from '../../monitoring/utils'
 import { checkValidation } from '../../utils/roles/machines'
 import { getWinningRole } from '../../utils/roles/machines/utils'
 import { emitServiceEvent } from '../monitoring'
-import { CRUD_OPERATIONS, GetOperatorsFunction, MongodbAtlasFunction } from './model'
+import {
+  CRUD_OPERATIONS,
+  GetOperatorsFunction,
+  MongodbAtlasFunction,
+  RealmCompatibleFindOneAndUpdateOptions
+} from './model'
 import {
   applyAccessControlToPipeline,
   checkDenyOperation,
@@ -115,6 +120,22 @@ const normalizeInsertManyResult = <T extends { insertedIds?: Record<string, unkn
   }
 }
 
+const normalizeFindOneAndUpdateOptions = (
+  options?: RealmCompatibleFindOneAndUpdateOptions
+): FindOneAndUpdateOptions | undefined => {
+  if (!options) return undefined
+
+  const { returnNewDocument, ...rest } = options
+  if (typeof returnNewDocument !== 'boolean' || typeof rest.returnDocument !== 'undefined') {
+    return rest
+  }
+
+  return {
+    ...rest,
+    returnDocument: returnNewDocument ? 'after' : 'before'
+  }
+}
+
 const hasAtomicOperators = (data: Document) => Object.keys(data).some((key) => key.startsWith('$'))
 
 const normalizeUpdatePayload = (data: Document) =>
@@ -653,9 +674,10 @@ const getOperators: GetOperatorsFunction = (
     findOneAndUpdate: async (
       query: MongoFilter<Document>,
       data: UpdateFilter<Document> | Document[],
-      options?: FindOneAndUpdateOptions
+      options?: RealmCompatibleFindOneAndUpdateOptions
     ) => {
       try {
+        const normalizedOptions = normalizeFindOneAndUpdateOptions(options)
         if (!run_as_system) {
           checkDenyOperation(normalizedRules, collection.collectionName, CRUD_OPERATIONS.UPDATE)
           const formattedQuery = getFormattedQuery(filters, query, user)
@@ -702,8 +724,8 @@ const getOperators: GetOperatorsFunction = (
             throw new Error('Update not permitted')
           }
 
-          const updateResult = options
-            ? await collection.findOneAndUpdate({ $and: safeQuery }, normalizedData, options)
+          const updateResult = normalizedOptions
+            ? await collection.findOneAndUpdate({ $and: safeQuery }, normalizedData, normalizedOptions)
             : await collection.findOneAndUpdate({ $and: safeQuery }, normalizedData)
           if (!updateResult) {
             emitMongoEvent('findOneAndUpdate')
@@ -729,8 +751,8 @@ const getOperators: GetOperatorsFunction = (
           return sanitizedDoc
         }
 
-        const updateResult = options
-          ? await collection.findOneAndUpdate(query, data, options)
+        const updateResult = normalizedOptions
+          ? await collection.findOneAndUpdate(query, data, normalizedOptions)
           : await collection.findOneAndUpdate(query, data)
         emitMongoEvent('findOneAndUpdate')
         return updateResult

package/src/services/mongodb-atlas/model.ts

@@ -59,6 +59,11 @@ export type GetOperatorsFunction = (
     monitoringOrigin?: string
   }
 ) => {
+  findOneAndUpdate: (
+    filter: MongoFilter<Document>,
+    update: UpdateFilter<Document> | Document[],
+    options?: RealmCompatibleFindOneAndUpdateOptions
+  ) => Promise<Document | null>
   findOne: (
     filter?: MongoFilter<Document>,
     projection?: Document,
@@ -71,11 +76,6 @@ export type GetOperatorsFunction = (
   updateOne: (
     ...params: Parameters<Method<'updateOne'>>
   ) => ReturnType<Method<'updateOne'>>
-  findOneAndUpdate: (
-    filter: MongoFilter<Document>,
-    update: UpdateFilter<Document> | Document[],
-    options?: FindOneAndUpdateOptions
-  ) => Promise<Document | null>
   find: (
     filter?: MongoFilter<Document>,
     projection?: Document,
@@ -102,6 +102,10 @@ export type GetOperatorsFunction = (
   ) => ReturnType<Method<'deleteMany'>>
 }
 
+export type RealmCompatibleFindOneAndUpdateOptions = FindOneAndUpdateOptions & {
+  returnNewDocument?: boolean
+}
+
 
 export enum CRUD_OPERATIONS {
   CREATE = "CREATE",

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
           })
         }
       }