@flowerforce/flowerbase 1.8.2 → 1.8.4-beta.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.8.3 (2026-04-02)
+
+
+### 🩹 Fixes
+
+- updateOne options ([5b16467](https://github.com/flowerforce/flowerbase/commit/5b16467))
+
 ## 1.8.2 (2026-03-31)
 
 

package/README.md

@@ -616,35 +616,80 @@ Once deployed, you'll receive a public URL (e.g. https://your-app-name.up.exampl
 
 >This URL should be used as the base URL in your frontend application, as explained in the next section.
 
-## 🌐 Frontend Setup – Realm SDK in React (Example)
+## 🌐 Frontend Setup – `@flowerforce/flowerbase-client` (Recommended)
 
-You can use the official `realm-web` SDK to integrate MongoDB Realm into a React application.
-This serves as a sample setup — similar logic can be applied using other official Realm SDKs **(e.g. React Native, Node, or Flutter)**.
-
-### 📦 Install Realm SDK
+For frontend and mobile projects, you can use the dedicated Flowerbase client:
 
 ```bash
-npm install realm-web
+npm install @flowerforce/flowerbase-client
 ```
 
-### ⚙️ Configure Realm in React
-
-Create a file to initialize and export the Realm App instance:
+### ⚙️ Configure client app
 
 ```ts
-// src/realm/realmApp.ts
+import { App, Credentials } from '@flowerforce/flowerbase-client'
 
-import * as Realm from "realm-web";
+const app = new App({
+  id: 'your-app-id',
+  baseUrl: 'https://your-deployed-backend-url.com',
+  timeout: 10000
+})
 
-// Replace with your actual Realm App ID and your deployed backend URL
-const app = new Realm.App({
-  id: "your-realm-app-id", // e.g., my-app-abcde
-  baseUrl: "https://your-deployed-backend-url.com" // e.g., https://your-app-name.up.example.app
-});
+await app.logIn(Credentials.emailPassword('user@example.com', 'secret'))
+```
+
+### 📦 Common client operations
+
+```ts
+const user = app.currentUser
+if (!user) throw new Error('User not logged in')
+
+const profile = await user.functions.getProfile()
 
-export default app;
+const todos = user.mongoClient('mongodb-atlas')
+  .db('my-db')
+  .collection('todos')
 
+await todos.insertOne({ title: 'Ship docs update', done: false })
+const openTodos = await todos.find({ done: false })
 ```
 
->🔗 The baseUrl should point to the backend URL you deployed earlier using Flowerbase.
-This tells the frontend SDK where to send authentication and data requests.
+`@flowerforce/flowerbase-client` supports:
+- local-userpass / anon-user / custom-function authentication
+- function calls (`user.functions.<name>(...)`)
+- MongoDB operations via `user.mongoClient('mongodb-atlas')`
+- change streams with `watch()` async iterator
+- BSON/EJSON interoperability (`ObjectId`, `Date`, etc.)
+
+## 💡 Use Cases by Feature
+
+### 🔐 Authentication
+- Registration and login flows for SaaS dashboards using `local-userpass`.
+- Guest sessions for trial users with `anon-user`, then account upgrade with full registration.
+- Delegated enterprise login with `custom-function` auth when credentials must be validated by external identity logic.
+
+### 🔒 Rules
+- Multi-tenant isolation where each user can only read/write documents of their own workspace.
+- Field-level protection to hide private fields (for example billing or internal notes) from non-admin users.
+
+### ⚙️ Functions
+- Centralized business logic (pricing, counters, workflows) called from web and mobile clients.
+- Privileged server-side tasks invoked with `run_as_system` to perform safe internal operations.
+
+### 🔔 Triggers
+- Audit logging on insert/update/delete events into an activity collection.
+- Scheduled jobs (for example nightly cleanup, reminder generation, data aggregation).
+- Auth lifecycle reactions (welcome email on user creation, cleanup on user deletion).
+
+### 🌐 HTTP Endpoints
+- Public webhook ingestion from third-party systems.
+- Protected custom APIs for backoffice actions not exposed as direct database operations.
+
+### 📡 `flowerbase-client`
+- Real-time UI updates in task boards using `collection.watch()` change streams.
+- Frontend data access with Realm-style API surface to minimize integration complexity.
+- Shared client usage across web and React Native projects with consistent auth/session behavior.
+
+### 🖥 Monitoring UI
+- Live inspection of function invocations, endpoint calls, and trigger executions in staging/production.
+- Fast troubleshooting with event stream filters and user/session search tools.

package/dist/features/functions/utils.d.ts

@@ -18,7 +18,7 @@ export declare const executeQuery: ({ currentMethod, query, update, filter, proj
     countDocuments: () => Promise<number>;
     deleteOne: () => Promise<import("mongodb").DeleteResult>;
     insertOne: () => Promise<import("mongodb").InsertOneResult<Document>>;
-    updateOne: () => Promise<unknown> | import("mongodb").FindCursor<any> | import("mongodb").ChangeStream<Document, Document> | import("mongodb").AggregationCursor<Document>;
+    updateOne: () => Promise<import("mongodb").UpdateResult<Document>>;
     findOneAndUpdate: () => Promise<Document | null>;
     aggregate: () => Promise<Document[]>;
     insertMany: () => Promise<import("mongodb").InsertManyResult<Document>>;

package/dist/features/functions/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/functions/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGlC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE3D;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAU,gBAAuB,KAAG,OAAO,CAAC,SAAS,CAwB9E,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAU,2HAYhC,kBAAkB;;;;;;;;;;;;;EAiGpB,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/functions/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGlC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE3D;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAU,gBAAuB,KAAG,OAAO,CAAC,SAAS,CAwB9E,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAU,2HAYhC,kBAAkB;;;;;;;;;;;;;EAsGpB,CAAA"}

package/dist/features/functions/utils.js

@@ -100,7 +100,7 @@ const executeQuery = (_a) => __awaiter(void 0, [_a], void 0, function* ({ curren
         countDocuments: () => currentMethod(bson_1.EJSON.deserialize(resolvedQuery), parsedOptions),
         deleteOne: () => currentMethod(bson_1.EJSON.deserialize(resolvedQuery), parsedOptions),
         insertOne: () => currentMethod(bson_1.EJSON.deserialize(document)),
-        updateOne: () => currentMethod(bson_1.EJSON.deserialize(resolvedQuery), bson_1.EJSON.deserialize(resolvedUpdate)),
+        updateOne: () => currentMethod(bson_1.EJSON.deserialize(resolvedQuery), bson_1.EJSON.deserialize(resolvedUpdate), parsedOptions),
         findOneAndUpdate: () => currentMethod(bson_1.EJSON.deserialize(resolvedQuery), bson_1.EJSON.deserialize(resolvedUpdate), parsedOptions),
         aggregate: () => __awaiter(void 0, void 0, void 0, function* () {
             return (yield currentMethod(bson_1.EJSON.deserialize(pipeline), {}, // TODO -> ADD OPTIONS

package/dist/features/triggers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/utils.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAA;AA0E9D;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,gBAAuB,KAAG,OAAO,CAAC,QAAQ,CAkB5E,CAAA;AA2qBD,eAAO,MAAM,gBAAgB;kHAppB1B,aAAa;iHA4jBb,aAAa;uHA1cb,aAAa;CAsiBf,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAA;AA6E9D;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,gBAAuB,KAAG,OAAO,CAAC,QAAQ,CAkB5E,CAAA;AAmrBD,eAAO,MAAM,gBAAgB;kHA5pB1B,aAAa;iHAmkBb,aAAa;uHAhdb,aAAa;CA6iBf,CAAA"}

package/dist/features/triggers/utils.js

@@ -27,11 +27,13 @@ exports.TRIGGER_HANDLERS = exports.loadTriggers = void 0;
 const fs_1 = __importDefault(require("fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_cron_1 = __importDefault(require("node-cron"));
+const bson_1 = require("bson");
 const constants_1 = require("../../constants");
 const utils_1 = require("../../monitoring/utils");
 const state_1 = require("../../state");
 const utils_2 = require("../../utils");
 const context_1 = require("../../utils/context");
+const normalizeTriggerPayload = (value) => bson_1.EJSON.deserialize(bson_1.EJSON.serialize(value, { relaxed: false }));
 const registerOnClose = (app, handler, label) => {
     if (app.server) {
         app.server.once('close', () => {
@@ -148,7 +150,8 @@ const handleCronTrigger = (_a) => __awaiter(void 0, [_a], void 0, function* ({ c
                 currentFunction: triggerHandler,
                 functionName,
                 functionsList,
-                services
+                services,
+                deserializeArgs: false
             });
         }
         catch (error) {
@@ -332,7 +335,7 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: [Object.assign({ user: userData }, op)],
+                        args: [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -340,7 +343,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -352,7 +356,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -389,7 +392,7 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGIN' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: [Object.assign({ user: userData }, op)],
+                        args: [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -397,7 +400,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -409,7 +413,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGIN' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -441,7 +444,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                        args: isAutoTrigger
+                            ? [normalizeTriggerPayload(userData)]
+                            : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -449,7 +454,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -461,7 +467,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -495,7 +500,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                        args: isAutoTrigger
+                            ? [normalizeTriggerPayload(userData)]
+                            : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -503,7 +510,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -515,7 +523,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -586,7 +593,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' })
                 });
                 yield (0, context_1.GenerateContext)({
-                    args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                    args: isAutoTrigger
+                        ? [normalizeTriggerPayload(userData)]
+                        : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                     app,
                     rules: state_1.StateManager.select("rules"),
                     user: {}, // TODO from currentUser ??
@@ -594,7 +603,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     functionName,
                     functionsList,
                     services,
-                    runAsSystem: true
+                    runAsSystem: true,
+                    deserializeArgs: false
                 });
             }
             catch (error) {
@@ -606,7 +616,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' }),
                     error
                 });
-                console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
             }
         });
     });
@@ -677,14 +686,15 @@ const handleDataBaseTrigger = (_a) => __awaiter(void 0, [_a], void 0, function*
             });
             try {
                 yield (0, context_1.GenerateContext)({
-                    args: [change],
+                    args: [normalizeTriggerPayload(change)],
                     app,
                     rules: state_1.StateManager.select("rules"),
                     user: {}, // TODO add from?
                     currentFunction: triggerHandler,
                     functionName,
                     functionsList,
-                    services
+                    services,
+                    deserializeArgs: false
                 });
             }
             catch (error) {

package/package.json

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

package/src/features/functions/__tests__/utils.test.ts

@@ -0,0 +1,33 @@
+import { executeQuery } from '../utils'
+
+describe('executeQuery', () => {
+  it('passes parsed options to updateOne', async () => {
+    const currentMethod = jest.fn().mockResolvedValue({
+      acknowledged: true,
+      matchedCount: 0,
+      modifiedCount: 0,
+      upsertedCount: 1
+    })
+
+    const operators = await executeQuery({
+      currentMethod,
+      query: { ownerUserId: 'user-1' },
+      update: {
+        $set: { locale: 'it-IT' },
+        $setOnInsert: { scope: 'workspace' }
+      },
+      options: { upsert: true }
+    } as any)
+
+    await operators.updateOne()
+
+    expect(currentMethod).toHaveBeenCalledWith(
+      { ownerUserId: 'user-1' },
+      {
+        $set: { locale: 'it-IT' },
+        $setOnInsert: { scope: 'workspace' }
+      },
+      { upsert: true }
+    )
+  })
+})

package/src/features/functions/utils.ts

@@ -122,7 +122,12 @@ export const executeQuery = async ({
       (currentMethod as ReturnType<GetOperatorsFunction>['insertOne'])(
         EJSON.deserialize(document)
       ),
-    updateOne: () => currentMethod(EJSON.deserialize(resolvedQuery), EJSON.deserialize(resolvedUpdate)),
+    updateOne: () =>
+      (currentMethod as ReturnType<GetOperatorsFunction>['updateOne'])(
+        EJSON.deserialize(resolvedQuery),
+        EJSON.deserialize(resolvedUpdate),
+        parsedOptions
+      ),
     findOneAndUpdate: () =>
       (currentMethod as ReturnType<GetOperatorsFunction>['findOneAndUpdate'])(
         EJSON.deserialize(resolvedQuery),

package/src/features/triggers/__tests__/utils.test.ts

@@ -0,0 +1,112 @@
+import { ObjectId } from 'bson'
+import { GenerateContext } from '../../../utils/context'
+import { StateManager } from '../../../state'
+import { TRIGGER_HANDLERS } from '../utils'
+
+jest.mock('../../../utils/context', () => ({
+    GenerateContext: jest.fn()
+}))
+
+jest.mock('../../../state', () => ({
+    StateManager: {
+        select: jest.fn()
+    }
+}))
+
+const mockedGenerateContext = jest.mocked(GenerateContext)
+const mockedStateSelect = StateManager.select as jest.Mock
+
+describe('TRIGGER_HANDLERS.DATABASE', () => {
+    beforeEach(() => {
+        mockedGenerateContext.mockReset()
+        mockedGenerateContext.mockResolvedValue(undefined)
+        mockedStateSelect.mockReset()
+        mockedStateSelect.mockReturnValue(undefined)
+    })
+
+    it('preserves BSON ObjectId values in fullDocument before invoking the trigger function', async () => {
+        const changeListeners: Record<string, (...args: any[]) => unknown> = {}
+        const close = jest.fn(async () => undefined)
+        const watch = jest.fn(() => ({
+            on: jest.fn((event: string, listener: (...args: any[]) => unknown) => {
+                changeListeners[event] = listener
+            }),
+            close
+        }))
+
+        const collection = { watch }
+        const db = jest.fn(() => ({ collection: jest.fn(() => collection) }))
+        const client = { db }
+
+        const app = {
+            mongo: {
+                changestream: { client }
+            },
+            server: {
+                once: jest.fn()
+            }
+        } as any
+
+        await TRIGGER_HANDLERS.DATABASE({
+            config: {
+                database: 'flowerbase-test',
+                collection: 'activityLogs',
+                operation_types: ['INSERT'],
+                full_document: true,
+                full_document_before_change: false,
+                match: {},
+                project: {}
+            } as any,
+            triggerHandler: { code: 'module.exports = async function () {}' } as any,
+            functionsList: {
+                logTriggerEvent: { code: 'module.exports = async function () {}' }
+            } as any,
+            services: {} as any,
+            app,
+            triggerName: 'log-trigger-event',
+            triggerType: 'DATABASE',
+            functionName: 'logTriggerEvent'
+        })
+
+        const documentId = new ObjectId('507f1f77bcf86cd799439011')
+        const ownerId = new ObjectId('507f191e810c19729de860ea')
+
+        await changeListeners.change({
+            clusterTime: new Date(),
+            operationType: 'insert',
+            ns: { db: 'flowerbase-test', coll: 'activityLogs' },
+            documentKey: { _id: documentId },
+            fullDocument: {
+                _id: documentId,
+                ownerId
+            }
+        })
+
+        expect(mockedGenerateContext).toHaveBeenCalledTimes(1)
+        expect(mockedGenerateContext).toHaveBeenCalledWith(
+            expect.objectContaining({
+                deserializeArgs: false,
+                args: [
+                    expect.objectContaining({
+                        documentKey: expect.objectContaining({
+                            _id: expect.any(ObjectId)
+                        }),
+                        fullDocument: expect.objectContaining({
+                            _id: expect.any(ObjectId),
+                            ownerId: expect.any(ObjectId)
+                        })
+                    })
+                ]
+            })
+        )
+
+        const payload = mockedGenerateContext.mock.calls[0][0].args[0] as {
+            documentKey: { _id: ObjectId }
+            fullDocument: { _id: ObjectId; ownerId: ObjectId }
+        }
+
+        expect(payload.documentKey._id.toHexString()).toBe(documentId.toHexString())
+        expect(payload.fullDocument._id.toHexString()).toBe(documentId.toHexString())
+        expect(payload.fullDocument.ownerId.toHexString()).toBe(ownerId.toHexString())
+    })
+})

package/src/features/triggers/utils.ts

@@ -1,6 +1,7 @@
 import fs from 'fs'
 import path from 'node:path'
 import cron from 'node-cron'
+import { EJSON } from 'bson'
 import { AUTH_CONFIG, AUTH_DB_NAME, DB_NAME, CHANGESTREAM } from '../../constants'
 import { createEventId, sanitize } from '../../monitoring/utils'
 import { StateManager } from '../../state'
@@ -8,6 +9,9 @@ import { readJsonContent } from '../../utils'
 import { GenerateContext } from '../../utils/context'
 import { HandlerParams, Trigger, Triggers } from './interface'
 
+const normalizeTriggerPayload = <T>(value: T): T =>
+  EJSON.deserialize(EJSON.serialize(value, { relaxed: false })) as T
+
 const registerOnClose = (
   app: HandlerParams['app'],
   handler: () => Promise<void> | void,
@@ -150,7 +154,8 @@ const handleCronTrigger = async ({
         currentFunction: triggerHandler,
         functionName,
         functionsList,
-        services
+        services,
+        deserializeArgs: false
       })
     } catch (error) {
       emitTriggerEvent({
@@ -376,7 +381,7 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGOUT' }
         })
         await GenerateContext({
-          args: [{ user: userData, ...op }],
+          args: [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -384,7 +389,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -395,7 +401,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGOUT' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -433,7 +438,7 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGIN' }
         })
         await GenerateContext({
-          args: [{ user: userData, ...op }],
+          args: [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -441,7 +446,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -452,7 +458,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGIN' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -485,7 +490,9 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'DELETE' }
         })
         await GenerateContext({
-          args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
+          args: isAutoTrigger
+            ? [normalizeTriggerPayload(userData)]
+            : [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -493,7 +500,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -504,7 +512,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'DELETE' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -539,7 +546,9 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'UPDATE' }
         })
         await GenerateContext({
-          args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
+          args: isAutoTrigger
+            ? [normalizeTriggerPayload(userData)]
+            : [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -547,7 +556,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -558,7 +568,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'UPDATE' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -643,7 +652,9 @@ const handleAuthenticationTrigger = async ({
         meta: { ...baseMeta, event: 'CREATE' }
       })
       await GenerateContext({
-        args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
+        args: isAutoTrigger
+          ? [normalizeTriggerPayload(userData)]
+          : [normalizeTriggerPayload({ user: userData, ...op })],
         app,
         rules: StateManager.select("rules"),
         user: {},  // TODO from currentUser ??
@@ -651,7 +662,8 @@ const handleAuthenticationTrigger = async ({
         functionName,
         functionsList,
         services,
-        runAsSystem: true
+        runAsSystem: true,
+        deserializeArgs: false
       })
     } catch (error) {
       emitTriggerEvent({
@@ -662,7 +674,6 @@ const handleAuthenticationTrigger = async ({
         meta: { ...baseMeta, event: 'CREATE' },
         error
       })
-      console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
     }
   })
   registerOnClose(
@@ -755,14 +766,15 @@ const handleDataBaseTrigger = async ({
     })
     try {
       await GenerateContext({
-        args: [change],
+        args: [normalizeTriggerPayload(change)],
         app,
         rules: StateManager.select("rules"),
         user: {}, // TODO add from?
         currentFunction: triggerHandler,
         functionName,
         functionsList,
-        services
+        services,
+        deserializeArgs: false
       })
     } catch (error) {
       emitTriggerEvent({