@friggframework/core 2.0.0--canary.397.58770d0.0 → 2.0.0--canary.397.4cedf64.0

package/credential/credential-repository.js

@@ -1,4 +1,4 @@
-const { Credential } = require('../module-plugin');
+const { Credential } = require('../modules');
 
 class CredentialRepository {
     async findCredentialById(id) {

package/handlers/backend-utils.js

@@ -2,7 +2,7 @@ const { Router } = require('express');
 const { Worker } = require('@friggframework/core');
 const { loadAppDefinition } = require('./app-definition-loader');
 const { IntegrationRepository } = require('../integrations/integration-repository');
-const { ModuleService } = require('../module-plugin/module-service');
+const { ModuleService } = require('../modules/module-service');
 const { GetIntegrationInstance } = require('../integrations/use-cases/get-integration-instance');
 
 const loadRouterFromObject = (IntegrationClass, routerObject) => {

package/index.js

@@ -52,7 +52,7 @@ const {
     OAuth2Requester,
     Requester,
     ModuleConstants,
-} = require('./module-plugin/index');
+} = require('./modules/index');
 const utils = require('./utils');
 
 // const {Sync } = require('./syncs/model');

package/integrations/integration-repository.js

@@ -32,12 +32,22 @@ class IntegrationRepository {
     }
 
     async createIntegration(entities, userId, config) {
-        return IntegrationModel.create({
+        const integrationRecord = await IntegrationModel.create({
             entities: entities,
             user: userId,
             config,
             version: '0.0.0',
         });
+
+        return {
+            id: integrationRecord._id,
+            entitiesIds: integrationRecord.entities.map(e => e._id),
+            userId: integrationRecord.user.toString(),
+            config: integrationRecord.config,
+            version: integrationRecord.version,
+            status: integrationRecord.status,
+            messages: integrationRecord.messages,
+        };
     }
 }
 

package/integrations/integration-router.js

@@ -8,19 +8,20 @@ const { GetIntegrationsForUser } = require('./use-cases/get-integrations-for-use
 const { CredentialRepository } = require('../credential/credential-repository');
 const { GetCredentialForUser } = require('../credential/use-cases/get-credential-for-user');
 const { CreateIntegration } = require('./use-cases/create-integration');
-const { ModuleService } = require('../module-plugin/module-service');
-const { ModuleRepository } = require('../module-plugin/module-repository');
-const { GetEntitiesForUser } = require('../module-plugin/use-cases/get-entities-for-user');
+const { ModuleService } = require('../modules/module-service');
+const { ModuleRepository } = require('../modules/module-repository');
+const { GetEntitiesForUser } = require('../modules/use-cases/get-entities-for-user');
 const { loadAppDefinition } = require('../handlers/app-definition-loader');
 const { GetIntegrationInstance } = require('./use-cases/get-integration-instance');
 const { UpdateIntegration } = require('./use-cases/update-integration');
 const { getModulesDefinitionFromIntegrationClasses } = require('./utils/map-integration-dto');
-const { GetModuleInstanceFromType } = require('../module-plugin/use-cases/get-module-instance-from-type');
-const { GetEntityOptionsByType } = require('../module-plugin/use-cases/get-entity-options-by-type');
-const { TestModuleAuth } = require('../module-plugin/use-cases/test-module-auth');
-const { GetModule } = require('../module-plugin/use-cases/get-module');
-const { GetEntityOptionsById } = require('../module-plugin/use-cases/get-entity-options-by-id');
-const { RefreshEntityOptions } = require('../module-plugin/use-cases/refresh-entity-options');
+const { GetModuleInstanceFromType } = require('../modules/use-cases/get-module-instance-from-type');
+const { GetEntityOptionsByType } = require('../modules/use-cases/get-entity-options-by-type');
+const { TestModuleAuth } = require('../modules/use-cases/test-module-auth');
+const { GetModule } = require('../modules/use-cases/get-module');
+const { GetEntityOptionsById } = require('../modules/use-cases/get-entity-options-by-id');
+const { RefreshEntityOptions } = require('../modules/use-cases/refresh-entity-options');
+const { GetPossibleIntegrations } = require('./use-cases/get-possible-integrations');
 
 /**
  * Creates an Express router with integration and entity routes configured
@@ -104,6 +105,10 @@ function createIntegrationRouter(params) {
         moduleDefinitions: getModulesDefinitionFromIntegrationClasses(integrationClasses),
     });
 
+    const getPossibleIntegrations = new GetPossibleIntegrations({
+        integrationClasses,
+    });
+
     const router = get(params, 'router', express());
     const getUserFromBearerToken = get(params, 'getUserFromBearerToken');
 
@@ -114,6 +119,7 @@ function createIntegrationRouter(params) {
         getEntitiesForUser,
         getIntegrationInstance,
         updateIntegration,
+        getPossibleIntegrations,
     });
     setEntityRoutes(router, getUserFromBearerToken, {
         getCredentialForUser,
@@ -163,6 +169,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
         getEntitiesForUser,
         getIntegrationInstance,
         updateIntegration,
+        getPossibleIntegrations,
     } = useCases;
     router.route('/api/integrations').get(
         catchAsyncError(async (req, res) => {
@@ -173,9 +180,7 @@ function setIntegrationRoutes(router, getUserFromBearerToken, useCases) {
             const integrations = await getIntegrationsForUser.execute(userId);
             const results = {
                 entities: {
-                    options: integrations.map((integration) =>
-                        integration.options
-                    ),
+                    options: await getPossibleIntegrations.execute(),
                     authorized: await getEntitiesForUser.execute(userId),
                 },
                 integrations: integrations,

package/integrations/integration.js

@@ -211,25 +211,6 @@ class Integration {
         });
         return options.get();
     }
-
-    /**
-     * Custom JSON serializer to prevent circular references (e.g. Module → Api → delegate)
-     * and to keep API responses lightweight.
-     * Only primitive, serialisable data needed by clients is returned.
-     */
-    toJSON() {
-        return {
-            id: this.id,
-            userId: this.userId,
-            entities: this.entities,
-            config: this.config,
-            status: this.status,
-            version: this.version,
-            messages: this.messages,
-            // Expose userActions if they were loaded/attached elsewhere
-            userActions: this.userActions,
-        };
-    }
 }
 
 module.exports = { Integration }; 

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

@@ -6,7 +6,7 @@ class CreateIntegration {
      * @param {Object} params
      * @param {import('../integration-repository').IntegrationRepository} params.integrationRepository
      * @param {import('../integration-classes').IntegrationClasses} params.integrationClasses
-     * @param {import('../../module-plugin/module-service').ModuleService} params.moduleService
+     * @param {import('../../modules/module-service').ModuleService} params.moduleService
      */
     constructor({ integrationRepository, integrationClasses, moduleService }) {
         this.integrationRepository = integrationRepository;
@@ -18,7 +18,6 @@ class CreateIntegration {
         const integrationRecord = await this.integrationRepository.createIntegration(entities, userId, config);
 
 
-        // 2. Get the correct Integration class by type
         const integrationClass = this.integrationClasses.find(
             (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
         );

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

@@ -46,7 +46,6 @@ class GetIntegrationsForUser {
                 status: integrationRecord.status,
                 version: integrationRecord.version,
                 messages: integrationRecord.messages,
-                entityReference: integrationRecord.entityReference,
                 integrationClass: integrationClass,
                 modules
             });

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

@@ -0,0 +1,13 @@
+class GetPossibleIntegrations {
+    constructor({ integrationClasses }) {
+        this.integrationClasses = integrationClasses;
+    }
+
+    async execute() {
+        return this.integrationClasses.map((integrationClass) =>
+            integrationClass.getOptionDetails()
+        );
+    }
+}
+
+module.exports = { GetPossibleIntegrations };

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

@@ -13,7 +13,6 @@ function mapIntegrationClassToIntegrationDTO(integration) {
         status: integration.status,
         version: integration.version,
         messages: integration.messages,
-        entityReference: integration.entityReference,
         userActions: integration.userActions,
         options: integration.getOptionDetails(),
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.397.58770d0.0",
+  "version": "2.0.0--canary.397.4cedf64.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.397.58770d0.0",
-    "@friggframework/prettier-config": "2.0.0--canary.397.58770d0.0",
-    "@friggframework/test": "2.0.0--canary.397.58770d0.0",
+    "@friggframework/eslint-config": "2.0.0--canary.397.4cedf64.0",
+    "@friggframework/prettier-config": "2.0.0--canary.397.4cedf64.0",
+    "@friggframework/test": "2.0.0--canary.397.4cedf64.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": "58770d02726c3f3ed9bf3e3260c57d3c2df9efc6"
+  "gitHead": "4cedf648a1675ba589e66f40ee9b3c700b12f0b5"
 }