@friggframework/core 2.0.0--canary.396.d72f334.0 → 2.0.0--canary.396.8420fe0.0

package/integrations/integration-router.js

@@ -139,12 +139,12 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken, integrati
             const integrations = await getIntegrationsForUser.execute(userId);
             const results = {
                 entities: {
-                    options: integrationClasses.map((IntegrationClass) =>
-                        IntegrationClass.getOptionDetails()
+                    options: integrations.map((integration) =>
+                        integration.getOptionDetails()
                     ),
                     authorized: await getEntitiesForUserUseCase.execute(userId),
                 },
-                integrations: integrations.map((integration) => integration.toJSON()),
+                integrations: integrations,
             }
 
             res.json(results);

package/integrations/integration.js

@@ -152,6 +152,10 @@ class Integration {
         return methodName in this || (this.behavior && methodName in this.behavior);
     }
 
+    // getOptions() {
+    //     return this.getOptionDetails();
+    // }
+
     /**
      * Custom JSON serializer to prevent circular references (e.g. Module → Api → delegate)
      * and to keep API responses lightweight.

package/integrations/use-cases/create-integration.js

@@ -1,4 +1,5 @@
 const { Integration } = require('../integration');
+const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 class CreateIntegration {
     /**
@@ -25,7 +26,7 @@ class CreateIntegration {
             modules[key] = moduleInstance;
         }
 
-        const integration = new Integration({
+        const integrationInstance = new Integration({
             id: integrationRecord.id,
             userId: integrationRecord.user,
             entities: integrationRecord.entities,
@@ -38,11 +39,9 @@ class CreateIntegration {
             modules
         });
 
+        await integrationInstance.initialize();
 
-        // load dynamic user actions and register event handlers
-        await integration.initialize();
-
-        return integration;
+        return mapIntegrationClassToIntegrationDTO(integrationInstance);
     }
 }
 

package/integrations/use-cases/get-integration-for-user.js

@@ -1,4 +1,5 @@
 const { Integration } = require('../integration');
+const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 class GetIntegrationForUser {
     constructor({ integrationRepository, integrationClasses, moduleService }) {
@@ -40,7 +41,7 @@ class GetIntegrationForUser {
             modules[key] = moduleInstance;
         }
 
-        const integration = new Integration({
+        const integrationInstance = new Integration({
             id: integrationRecord.id,
             userId: integrationRecord.user,
             entities: integrationRecord.entities,
@@ -53,7 +54,7 @@ class GetIntegrationForUser {
             modules
         });
 
-        return integration;
+        return mapIntegrationClassToIntegrationDTO(integrationInstance);
     }
 }
 

package/integrations/use-cases/get-integration.js

@@ -1,4 +1,5 @@
 const { Integration } = require('../integration');
+const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 
 // todo: remove this use case
@@ -48,7 +49,7 @@ class GetIntegration {
         }
 
         // 4. Create the Integration domain entity with modules
-        const integration = new Integration({
+        const integrationInstance = new Integration({
             id: integrationRecord.id,
             userId: integrationRecord.user,
             entities: integrationRecord.entities,
@@ -63,9 +64,9 @@ class GetIntegration {
 
 
         // 6. Complete async initialization (load dynamic actions, register handlers)
-        await integration.initialize();
+        await integrationInstance.initialize();
 
-        return integration;
+        return mapIntegrationClassToIntegrationDTO(integrationInstance);
     }
 }
 

package/integrations/use-cases/get-integrations-for-user.js

@@ -1,4 +1,5 @@
 const { Integration } = require('../integration');
+const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 class GetIntegrationsForUser {
     constructor({ integrationRepository, integrationClasses, moduleService }) {
@@ -35,7 +36,7 @@ class GetIntegrationsForUser {
                 modules[key] = moduleInstance;
             }
 
-            integrations.push(new Integration({
+            const integrationInstance = new Integration({
                 id: integrationRecord.id,
                 userId: integrationRecord.user,
                 entities: integrationRecord.entities,
@@ -46,10 +47,13 @@ class GetIntegrationsForUser {
                 entityReference: integrationRecord.entityReference,
                 integrationClass: integrationClass,
                 modules
-            }));
+            });
 
-        }
+            integrations.push(
+                mapIntegrationClassToIntegrationDTO(integrationInstance)
+            );
 
+        }
 
         return integrations;
     }

package/integrations/utils/map-integration-dto.js

@@ -0,0 +1,22 @@
+/**
+ * @param {import('../integration').Integration} integration
+ * Convert an Integration domain instance to a plain DTO suitable for JSON responses.
+ */
+function mapIntegrationClassToIntegrationDTO(integration) {
+    if (!integration) return null;
+
+    return {
+        id: integration.id,
+        userId: integration.userId,
+        entities: integration.entities,
+        config: integration.config,
+        status: integration.status,
+        version: integration.version,
+        messages: integration.messages,
+        entityReference: integration.entityReference,
+        userActions: integration.userActions,
+        options: integration.getOptionDetails(),
+    };
+}
+
+module.exports = { mapIntegrationClassToIntegrationDTO }; 

package/module-plugin/use-cases/get-entities-for-user.js

@@ -1,4 +1,5 @@
 const { Module } = require('../module');
+const { mapModuleClassToModuleDTO } = require('../utils/map-module-dto');
 
 class GetEntitiesForUser {
     constructor({ moduleRepository, moduleDefinitions }) {
@@ -23,7 +24,7 @@ class GetEntitiesForUser {
                 definition: definition,
                 entity: entity,
             });
-            return moduleInstance.toJSON();
+            return mapModuleClassToModuleDTO(moduleInstance);
         });
     }
 }

package/module-plugin/utils/map-module-dto.js

@@ -0,0 +1,16 @@
+/**
+ * @param {import('../module').Module} moduleInstance
+ * Convert a Module domain instance to a plain DTO suitable for JSON responses.
+ */
+function mapModuleClassToModuleDTO(moduleInstance) {
+    if (!moduleInstance) return null;
+
+    return {
+        name: moduleInstance.name,
+        userId: moduleInstance.userId,
+        entity: moduleInstance.entity,
+        credentialId: moduleInstance.credential?._id?.toString(),
+    };
+}
+
+module.exports = { mapModuleClassToModuleDTO }; 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.396.d72f334.0",
+  "version": "2.0.0--canary.396.8420fe0.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -22,9 +22,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.396.d72f334.0",
-    "@friggframework/prettier-config": "2.0.0--canary.396.d72f334.0",
-    "@friggframework/test": "2.0.0--canary.396.d72f334.0",
+    "@friggframework/eslint-config": "2.0.0--canary.396.8420fe0.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.8420fe0.0",
+    "@friggframework/test": "2.0.0--canary.396.8420fe0.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "d72f33468fa647bb981825150321f20a61276470"
+  "gitHead": "8420fe09831b3cd4069196f3a14ace468e03b458"
 }