@friggframework/core 2.0.0--canary.396.cb56ae3.0 → 2.0.0--canary.396.2b7bd44.0

package/integrations/index.js

@@ -2,7 +2,7 @@ const { IntegrationBase } = require('./integration-base');
 const { IntegrationModel } = require('./integration-model');
 const { Options } = require('./options');
 const { IntegrationMapping } = require('./integration-mapping');
-const { IntegrationFactory, IntegrationHelper } = require('./integration-factory');
+const { IntegrationFactory } = require('./integration-factory');
 const { createIntegrationRouter, checkRequiredParams } = require('./integration-router');
 
 module.exports = {
@@ -11,7 +11,6 @@ module.exports = {
     Options,
     IntegrationMapping,
     IntegrationFactory,
-    IntegrationHelper,
     createIntegrationRouter,
     checkRequiredParams,
 };

package/integrations/integration-router.js

@@ -5,13 +5,13 @@ const catchAsyncError = require('express-async-handler');
 const { debug } = require('../logs');
 const { IntegrationRepository } = require('./integration-repository');
 const { DeleteIntegrationForUser } = require('./use-cases/delete-integration-for-user');
-const { GetIntegrationForUser } = require('./use-cases/get-integration-for-user');
 const { GetIntegrationsForUser } = require('./use-cases/get-integrations-for-user');
 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 {
     loadAppDefinition,
 } = require('../handlers/app-definition-loader');
@@ -55,9 +55,7 @@ function createIntegrationRouter(params) {
     const deleteIntegrationForUser = new DeleteIntegrationForUser({
         integrationRepository,
     });
-    const getIntegrationForUser = new GetIntegrationForUser({
-        integrationRepository,
-    });
+
     const getIntegrationsForUser = new GetIntegrationsForUser({
         integrationRepository,
     });
@@ -80,7 +78,7 @@ function createIntegrationRouter(params) {
     const getUserFromBearerToken = get(params, 'getUserFromBearerToken');
 
     // todo: moduleFactory in factory is not used here anymore, remove it
-    setIntegrationRoutes(router, factory, getUserFromBearerToken, {
+    setIntegrationRoutes(router, factory, getUserFromBearerToken, integrations, {
         createIntegration,
         deleteIntegrationForUser,
         getIntegrationsForUser,
@@ -122,7 +120,7 @@ function checkRequiredParams(params, requiredKeys) {
  * @param {Object} factory.integrationFactory - Factory for creating and managing integrations
  * @param {import('../user/use-cases/get-user-from-bearer-token').GetUserFromBearerToken} getUserFromBearerToken - Use case for retrieving a user from a bearer token
  */
-function setIntegrationRoutes(router, factory, getUserFromBearerToken, useCases) {
+function setIntegrationRoutes(router, factory, getUserFromBearerToken, integrationClasses, useCases) {
     const { integrationFactory } = factory;
     const {
         createIntegration,
@@ -130,26 +128,22 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken, useCases)
         getIntegrationsForUser,
         getEntitiesForUserUseCase,
     } = useCases;
-
     router.route('/api/integrations').get(
         catchAsyncError(async (req, res) => {
             const user = await getUserFromBearerToken.execute(
                 req.headers.authorization
             );
             const userId = user.getId();
-            const results = await integrationFactory.getIntegrationOptions();
-            results.entities.authorized = await getEntitiesForUserUseCase.execute(userId);
-            results.integrations =
-                await getIntegrationsForUser.execute(userId);
-
-            for (const integrationRecord of results.integrations) {
-                const integration =
-                    await integrationFactory.getInstanceFromIntegrationId({
-                        integrationId: integrationRecord.id,
-                        userId,
-                    });
-                integrationRecord.userActions = integration.userActions;
+            const results = {
+                entities: {
+                    options: integrationClasses.map((IntegrationClass) =>
+                        IntegrationClass.getOptionDetails()
+                    ),
+                    authorized: await getEntitiesForUserUseCase.execute(userId),
+                },
+                integrations: await getIntegrationsForUser.execute(userId),
             }
+
             res.json(results);
         })
     );

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

@@ -1,10 +1,12 @@
 class GetIntegrationForUser {
-    constructor({ integrationRepository }) {
+    constructor({ integrationRepository, integrationClasses, moduleService }) {
 
         /**
          * @type {import('../integration-repository').IntegrationRepository}
          */
         this.integrationRepository = integrationRepository;
+        this.integrationClasses = integrationClasses;
+        this.moduleService = moduleService;
     }
 
     /**
@@ -13,16 +15,38 @@ class GetIntegrationForUser {
      * @returns {Promise<Integration>}
      */
     async execute(integrationId, userId) {
-        const integration = await this.integrationRepository.findIntegrationById(integrationId);
+        const integrationRecord = await this.integrationRepository.findIntegrationById(integrationId);
 
-        if (!integration) {
+        if (!integrationRecord) {
             throw Boom.notFound(`Integration with id of ${integrationId} does not exist`);
         }
 
-        if (integration.user.toString() !== userId.toString()) {
+        if (integrationRecord.user.toString() !== userId.toString()) {
             throw Boom.forbidden('User does not have access to this integration');
         }
 
+        const modules = {};
+        for (const [entityId, key] of Object.entries(integrationRecord.entityReference)) {
+            const moduleInstance = await this.moduleService.getModuleInstance(
+                entityId,
+                integrationRecord.user
+            );
+            modules[key] = moduleInstance;
+        }
+
+        const integration = new Integration({
+            id: integrationRecord.id,
+            userId: integrationRecord.user,
+            entities: integrationRecord.entities,
+            config: integrationRecord.config,
+            status: integrationRecord.status,
+            version: integrationRecord.version,
+            messages: integrationRecord.messages,
+            entityReference: integrationRecord.entityReference,
+            integrationClass: IntegrationClass,
+            modules
+        });
+
         return integration;
     }
 }

package/integrations/use-cases/{get-integration-instance.js → get-integration.js}

@@ -1,9 +1,8 @@
 const { Integration } = require('../integration');
-const { ModuleService } = require('../../module-plugin/module-service');
 
 
 // todo: remove this use case
-class GetIntegrationInstance {
+class GetIntegration {
     constructor({
         integrationRepository,
         integrationClasses,
@@ -74,4 +73,4 @@ class GetIntegrationInstance {
     }
 }
 
-module.exports = { GetIntegrationInstance }; 
+module.exports = { GetIntegration }; 

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

@@ -1,10 +1,12 @@
 class GetIntegrationsForUser {
-    constructor({ integrationRepository }) {
+    constructor({ integrationRepository, integrationClasses, moduleService }) {
 
         /**
          * @type {import('../integration-repository').IntegrationRepository}
          */
         this.integrationRepository = integrationRepository;
+        this.integrationClasses = integrationClasses;
+        this.moduleService = moduleService;
     }
 
     /**
@@ -12,7 +14,38 @@ class GetIntegrationsForUser {
      * @returns {Promise<Integration[]>}
      */
     async execute(userId) {
-        return this.integrationRepository.findIntegrationsByUserId(userId);
+        const integrationRecords = this.integrationRepository.findIntegrationsByUserId(userId);
+
+
+        const integrations = []
+
+        for (const integrationRecord of integrationRecords) {
+
+            const modules = {};
+            for (const [entityId, key] of Object.entries(integrationRecord.entityReference)) {
+                const moduleInstance = await this.moduleService.getModuleInstance(
+                    entityId,
+                    integrationRecord.user
+                );
+                modules[key] = moduleInstance;
+            }
+            integrations.push(new Integration({
+                id: integrationRecord.id,
+                userId: integrationRecord.user,
+                entities: integrationRecord.entities,
+                config: integrationRecord.config,
+                status: integrationRecord.status,
+                version: integrationRecord.version,
+                messages: integrationRecord.messages,
+                entityReference: integrationRecord.entityReference,
+                integrationClass: IntegrationClass,
+                modules
+            }));
+
+        }
+
+
+        return integrations;
     }
 }
 

package/integrations/use-cases/index.js

@@ -1,15 +1,11 @@
-const { GetIntegrationsForUserId } = require('./get-integrations-for-user');
-const { DeleteIntegrationForUserById } = require('./delete-integration-for-user-by-id');
-const { GetIntegrationById } = require('./get-integration-by-id');
-const { ListCredentials } = require('./list-credentials');
+const { GetIntegrationsForUser } = require('./get-integrations-for-user');
+const { DeleteIntegrationForUser } = require('./delete-integration-for-user');
 const { CreateIntegration } = require('./create-integration');
-const { GetIntegrationInstance } = require('./get-integration-instance');
+const { GetIntegration } = require('./get-integration');
 
 module.exports = {
-    GetIntegrationsForUserId,
-    DeleteIntegrationForUserById,
-    GetIntegrationById,
-    ListCredentials,
+    GetIntegrationsForUser,
+    DeleteIntegrationForUser,
     CreateIntegration,
-    GetIntegrationInstance,
+    GetIntegration,
 }; 

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

@@ -6,9 +6,7 @@ class GetEntitiesForUser {
 
         this.definitionMap = new Map();
         for (const definition of moduleDefinitions) {
-            const modelName =
-                Module.getEntityModelFromDefinition(definition).modelName;
-            this.definitionMap.set(modelName, definition);
+            this.definitionMap.set(definition.modelName, definition);
         }
     }
 
@@ -18,9 +16,7 @@ class GetEntitiesForUser {
         );
 
         return entities.map((entity) => {
-            const definition = this.definitionMap.get(entity.__t);
-            // todo: check if dont need to use this.
-            const type = definition ? definition.getName() : 'unknown';
+            const definition = this.definitionMap.get(entity.moduleName);
 
             const moduleInstance = new Module({
                 userId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.396.cb56ae3.0",
+  "version": "2.0.0--canary.396.2b7bd44.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.cb56ae3.0",
-    "@friggframework/prettier-config": "2.0.0--canary.396.cb56ae3.0",
-    "@friggframework/test": "2.0.0--canary.396.cb56ae3.0",
+    "@friggframework/eslint-config": "2.0.0--canary.396.2b7bd44.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.2b7bd44.0",
+    "@friggframework/test": "2.0.0--canary.396.2b7bd44.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": "cb56ae344c7fed00baa31a00970d27ea59d3dce5"
+  "gitHead": "2b7bd440a6eba523892911e27082c1eff49fa8bb"
 }