@flowerforce/flowerbase 1.7.5-beta.0 → 1.7.5-beta.2

package/dist/auth/providers/custom-function/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/custom-function/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AASzC;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,iBAiHlE"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/custom-function/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAUzC;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,iBA2IlE"}

package/dist/auth/providers/custom-function/controller.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFunctionController = customFunctionController;
+const mongodb_1 = require("mongodb");
 const constants_1 = require("../../../constants");
 const state_1 = require("../../../state");
 const context_1 = require("../../../utils/context");
@@ -36,7 +37,10 @@ function customFunctionController(app) {
          * @returns {Promise<Object>} A promise resolving with access and refresh tokens.
          */
         app.post(utils_1.AUTH_ENDPOINTS.LOGIN, {
-            schema: schema_1.LOGIN_SCHEMA
+            schema: schema_1.LOGIN_SCHEMA,
+            errorHandler: (_error, _request, reply) => {
+                reply.code(500).send({ message: 'Internal Server Error' });
+            }
         }, function (req, reply) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
@@ -75,10 +79,29 @@ function customFunctionController(app) {
                     reply.code(401).send({ message: 'Unauthorized' });
                     return;
                 }
-                const authUser = yield db.collection(authCollection).findOne({ email: authResult.id });
+                const email = (authResult === null || authResult === void 0 ? void 0 : authResult.email) || authResult.id;
+                let authUser = yield db.collection(authCollection).findOne({ email });
                 if (!authUser) {
-                    reply.code(401).send({ message: 'Unauthorized' });
-                    return;
+                    const authUserId = new mongodb_1.ObjectId();
+                    yield db.collection(authCollection).insertOne({
+                        _id: authUserId,
+                        email,
+                        status: 'confirmed',
+                        createdAt: new Date(),
+                        custom_data: {},
+                        identities: [
+                            {
+                                id: authResult.id.toString(),
+                                provider_id: authResult.id.toString(),
+                                provider_type: 'custom-function',
+                                provider_data: { email }
+                            }
+                        ]
+                    });
+                    authUser = {
+                        _id: authUserId,
+                        email
+                    };
                 }
                 const user = user_id_field && userCollection
                     ? yield db
@@ -99,12 +122,14 @@ function customFunctionController(app) {
                     expiresAt: new Date(Date.now() + refreshTokenTtlMs),
                     revokedAt: null
                 });
-                return {
-                    access_token: this.createAccessToken(currentUserData),
+                const accessToken = this.createAccessToken(currentUserData);
+                const responsePayload = {
+                    access_token: accessToken,
                     refresh_token: refreshToken,
                     device_id: '',
                     user_id: authUser._id.toString()
                 };
+                reply.code(200).send(responsePayload);
             });
         });
     });

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAA;AAG/C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAU,0CAIpC,sBAAsB,kBAoExB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAA;AAG/C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAU,0CAIpC,sBAAsB,kBAqExB,CAAA"}

package/dist/features/triggers/index.js

@@ -79,6 +79,8 @@ const activateTriggers = (_a) => __awaiter(void 0, [_a], void 0, function* ({ fa
                 _f = false;
                 const trigger = _d;
                 const { content } = trigger;
+                if (content.disabled)
+                    continue;
                 const { type, config, event_processors } = content;
                 const functionName = event_processors.FUNCTION.config.function_name;
                 const triggerHandler = functionsList[functionName];

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;AA+mBD,eAAO,MAAM,gBAAgB;kHAxlB1B,aAAa;iHAggBb,aAAa;uHA/Yb,aAAa;CA2ef,CAAA"}
+{"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;AA0nBD,eAAO,MAAM,gBAAgB;kHAnmB1B,aAAa;iHA2gBb,aAAa;uHA1Zb,aAAa;CAsff,CAAA"}

package/dist/features/triggers/utils.js

@@ -252,6 +252,14 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
         if (shouldIgnoreStreamError(error))
             return;
         console.error('Authentication trigger change stream error', error);
+        emitTriggerEvent({
+            status: 'error',
+            triggerName,
+            triggerType,
+            functionName,
+            meta: Object.assign(Object.assign({}, baseMeta), { event: 'CHANGE_STREAM' }),
+            error
+        });
     });
     changeStream.on('change', function (change) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -321,13 +329,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     updateDescription
                 };
                 try {
-                    emitTriggerEvent({
-                        status: 'fired',
-                        triggerName,
-                        triggerType,
-                        functionName,
-                        meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' })
-                    });
                     yield (0, context_1.GenerateContext)({
                         args: [Object.assign({ user: userData }, op)],
                         app,
@@ -339,6 +340,13 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         services,
                         runAsSystem: true
                     });
+                    emitTriggerEvent({
+                        status: 'fired',
+                        triggerName,
+                        triggerType,
+                        functionName,
+                        meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' })
+                    });
                 }
                 catch (error) {
                     emitTriggerEvent({
@@ -373,13 +381,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     updateDescription
                 };
                 try {
-                    emitTriggerEvent({
-                        status: 'fired',
-                        triggerName,
-                        triggerType,
-                        functionName,
-                        meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' })
-                    });
                     yield (0, context_1.GenerateContext)({
                         args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
                         app,
@@ -391,6 +392,13 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         services,
                         runAsSystem: true
                     });
+                    emitTriggerEvent({
+                        status: 'fired',
+                        triggerName,
+                        triggerType,
+                        functionName,
+                        meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' })
+                    });
                 }
                 catch (error) {
                     emitTriggerEvent({
@@ -427,13 +435,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     updateDescription
                 };
                 try {
-                    emitTriggerEvent({
-                        status: 'fired',
-                        triggerName,
-                        triggerType,
-                        functionName,
-                        meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' })
-                    });
                     yield (0, context_1.GenerateContext)({
                         args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
                         app,
@@ -445,6 +446,13 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         services,
                         runAsSystem: true
                     });
+                    emitTriggerEvent({
+                        status: 'fired',
+                        triggerName,
+                        triggerType,
+                        functionName,
+                        meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' })
+                    });
                 }
                 catch (error) {
                     emitTriggerEvent({
@@ -518,13 +526,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                 updateDescription
             };
             try {
-                emitTriggerEvent({
-                    status: 'fired',
-                    triggerName,
-                    triggerType,
-                    functionName,
-                    meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' })
-                });
                 yield (0, context_1.GenerateContext)({
                     args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
                     app,
@@ -536,6 +537,13 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     services,
                     runAsSystem: true
                 });
+                emitTriggerEvent({
+                    status: 'fired',
+                    triggerName,
+                    triggerType,
+                    functionName,
+                    meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' })
+                });
             }
             catch (error) {
                 emitTriggerEvent({

package/package.json

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

package/src/auth/providers/custom-function/controller.ts

@@ -1,4 +1,5 @@
 import { FastifyInstance } from 'fastify'
+import { ObjectId } from 'mongodb'
 import { AUTH_CONFIG, DB_NAME, DEFAULT_CONFIG } from '../../../constants'
 import { StateManager } from '../../../state'
 import { GenerateContext } from '../../../utils/context'
@@ -30,7 +31,10 @@ export async function customFunctionController(app: FastifyInstance) {
   app.post<LoginDto>(
     AUTH_ENDPOINTS.LOGIN,
     {
-      schema: LOGIN_SCHEMA
+      schema: LOGIN_SCHEMA,
+      errorHandler: (_error, _request, reply) => {
+        reply.code(500).send({ message: 'Internal Server Error' })
+      }
     },
     async function (req, reply) {
       const customFunctionProvider = AUTH_CONFIG.authProviders?.['custom-function']
@@ -54,7 +58,7 @@ export async function customFunctionController(app: FastifyInstance) {
         id
       } = req
 
-      type CustomFunctionAuthResult = { id?: string }
+      type CustomFunctionAuthResult = { id?: string; email?: string }
       const authResult = await GenerateContext({
         args: [
           req.body
@@ -77,16 +81,35 @@ export async function customFunctionController(app: FastifyInstance) {
         }
       }) as CustomFunctionAuthResult
 
-
       if (!authResult.id) {
         reply.code(401).send({ message: 'Unauthorized' })
         return
       }
 
-      const authUser = await db.collection(authCollection!).findOne({ email: authResult.id })
+      const email = authResult?.email || authResult.id
+      let authUser = await db.collection(authCollection!).findOne({ email })
+
       if (!authUser) {
-        reply.code(401).send({ message: 'Unauthorized' })
-        return
+        const authUserId = new ObjectId()
+        await db.collection(authCollection!).insertOne({
+          _id: authUserId,
+          email,
+          status: 'confirmed',
+          createdAt: new Date(),
+          custom_data: {},
+          identities: [
+            {
+              id: authResult.id.toString(),
+              provider_id: authResult.id.toString(),
+              provider_type: 'custom-function',
+              provider_data: { email }
+            }
+          ]
+        })
+        authUser = {
+          _id: authUserId,
+          email
+        }
       }
 
       const user =
@@ -107,6 +130,7 @@ export async function customFunctionController(app: FastifyInstance) {
           ...(user || {})
         }
       }
+
       const refreshToken = this.createRefreshToken(currentUserData)
       const refreshTokenHash = hashToken(refreshToken)
       await db.collection(refreshTokensCollection).insertOne({
@@ -116,12 +140,15 @@ export async function customFunctionController(app: FastifyInstance) {
         expiresAt: new Date(Date.now() + refreshTokenTtlMs),
         revokedAt: null
       })
-      return {
-        access_token: this.createAccessToken(currentUserData),
+      const accessToken = this.createAccessToken(currentUserData)
+
+      const responsePayload = {
+        access_token: accessToken,
         refresh_token: refreshToken,
         device_id: '',
         user_id: authUser._id.toString()
       }
+      reply.code(200).send(responsePayload)
     }
   )
 

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

@@ -0,0 +1,75 @@
+import { activateTriggers } from '../index'
+import { TRIGGER_HANDLERS } from '../utils'
+
+jest.mock('../../../constants', () => ({
+  AUTH_CONFIG: {},
+  DB_NAME: 'test-db'
+}))
+
+jest.mock('../utils', () => ({
+  TRIGGER_HANDLERS: {
+    SCHEDULED: jest.fn(async () => {}),
+    DATABASE: jest.fn(async () => {}),
+    AUTHENTICATION: jest.fn(async () => {})
+  }
+}))
+
+describe('activateTriggers', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('skips triggers marked as disabled', async () => {
+    const functionsList = {
+      runEnabled: jest.fn(),
+      runDisabled: jest.fn()
+    }
+
+    await activateTriggers({
+      fastify: {} as never,
+      functionsList,
+      triggersList: [
+        {
+          fileName: 'enabled-trigger.json',
+          content: {
+            name: 'enabled-trigger',
+            type: 'SCHEDULED',
+            disabled: false,
+            config: { schedule: '* * * * *' },
+            event_processors: {
+              FUNCTION: {
+                config: {
+                  function_name: 'runEnabled'
+                }
+              }
+            }
+          }
+        },
+        {
+          fileName: 'disabled-trigger.json',
+          content: {
+            name: 'disabled-trigger',
+            type: 'SCHEDULED',
+            disabled: true,
+            config: { schedule: '* * * * *' },
+            event_processors: {
+              FUNCTION: {
+                config: {
+                  function_name: 'runDisabled'
+                }
+              }
+            }
+          }
+        }
+      ] as never
+    })
+
+    expect(TRIGGER_HANDLERS.SCHEDULED).toHaveBeenCalledTimes(1)
+    expect(TRIGGER_HANDLERS.SCHEDULED).toHaveBeenCalledWith(
+      expect.objectContaining({
+        functionName: 'runEnabled',
+        triggerName: 'enabled-trigger'
+      })
+    )
+  })
+})

package/src/features/triggers/index.ts

@@ -62,6 +62,7 @@ export const activateTriggers = async ({
 
     for await (const trigger of triggersToActivate) {
       const { content } = trigger
+      if (content.disabled) continue
       const { type, config, event_processors } = content
 
       const functionName: keyof Functions = event_processors.FUNCTION.config.function_name

package/src/features/triggers/utils.ts

@@ -277,6 +277,17 @@ const handleAuthenticationTrigger = async ({
   changeStream.on('error', (error) => {
     if (shouldIgnoreStreamError(error)) return
     console.error('Authentication trigger change stream error', error)
+    emitTriggerEvent({
+      status: 'error',
+      triggerName,
+      triggerType,
+      functionName,
+      meta: {
+        ...baseMeta,
+        event: 'CHANGE_STREAM'
+      },
+      error
+    })
   })
   changeStream.on('change', async function (change) {
     const operationType = change['operationType' as keyof typeof change] as
@@ -365,13 +376,6 @@ const handleAuthenticationTrigger = async ({
         updateDescription
       }
       try {
-        emitTriggerEvent({
-          status: 'fired',
-          triggerName,
-          triggerType,
-          functionName,
-          meta: { ...baseMeta, event: 'LOGOUT' }
-        })
         await GenerateContext({
           args: [{ user: userData, ...op }],
           app,
@@ -383,6 +387,13 @@ const handleAuthenticationTrigger = async ({
           services,
           runAsSystem: true
         })
+        emitTriggerEvent({
+          status: 'fired',
+          triggerName,
+          triggerType,
+          functionName,
+          meta: { ...baseMeta, event: 'LOGOUT' }
+        })
       } catch (error) {
         emitTriggerEvent({
           status: 'error',
@@ -417,13 +428,6 @@ const handleAuthenticationTrigger = async ({
         updateDescription
       }
       try {
-        emitTriggerEvent({
-          status: 'fired',
-          triggerName,
-          triggerType,
-          functionName,
-          meta: { ...baseMeta, event: 'DELETE' }
-        })
         await GenerateContext({
           args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
           app,
@@ -435,6 +439,13 @@ const handleAuthenticationTrigger = async ({
           services,
           runAsSystem: true
         })
+        emitTriggerEvent({
+          status: 'fired',
+          triggerName,
+          triggerType,
+          functionName,
+          meta: { ...baseMeta, event: 'DELETE' }
+        })
       } catch (error) {
         emitTriggerEvent({
           status: 'error',
@@ -471,13 +482,6 @@ const handleAuthenticationTrigger = async ({
         updateDescription
       }
       try {
-        emitTriggerEvent({
-          status: 'fired',
-          triggerName,
-          triggerType,
-          functionName,
-          meta: { ...baseMeta, event: 'UPDATE' }
-        })
         await GenerateContext({
           args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
           app,
@@ -489,6 +493,13 @@ const handleAuthenticationTrigger = async ({
           services,
           runAsSystem: true
         })
+        emitTriggerEvent({
+          status: 'fired',
+          triggerName,
+          triggerType,
+          functionName,
+          meta: { ...baseMeta, event: 'UPDATE' }
+        })
       } catch (error) {
         emitTriggerEvent({
           status: 'error',
@@ -575,13 +586,6 @@ const handleAuthenticationTrigger = async ({
     }
 
     try {
-      emitTriggerEvent({
-        status: 'fired',
-        triggerName,
-        triggerType,
-        functionName,
-        meta: { ...baseMeta, event: 'CREATE' }
-      })
       await GenerateContext({
         args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
         app,
@@ -593,6 +597,13 @@ const handleAuthenticationTrigger = async ({
         services,
         runAsSystem: true
       })
+      emitTriggerEvent({
+        status: 'fired',
+        triggerName,
+        triggerType,
+        functionName,
+        meta: { ...baseMeta, event: 'CREATE' }
+      })
     } catch (error) {
       emitTriggerEvent({
         status: 'error',