@friggframework/core 2.0.0--canary.397.6ecf8f5.0 → 2.0.0--canary.397.05c9b19.0

package/integrations/integration-base.js

@@ -61,21 +61,7 @@ class IntegrationBase {
     static getCurrentVersion() {
         return this.Definition.version;
     }
-    loadModules() {
-        // Load all the modules defined in Definition.modules
-        const moduleNames = Object.keys(this.constructor.Definition.modules);
-        for (const moduleName of moduleNames) {
-            const { definition } =
-                this.constructor.Definition.modules[moduleName];
-            if (typeof definition.API === 'function') {
-                this[moduleName] = { api: new definition.API({}) };
-            } else {
-                throw new Error(
-                    `Module ${moduleName} must be a function that extends IntegrationModule`
-                );
-            }
-        }
-    }
+
     registerEventHandlers() {
         this.on = {
             ...this.defaultEvents,
@@ -119,7 +105,6 @@ class IntegrationBase {
                 handler: this.refreshActionOptions,
             },
         };
-        this.loadModules();
     }
 
     async send(event, object) {

package/integrations/integration-router.js

@@ -51,9 +51,11 @@ function createIntegrationRouter(params) {
         moduleService,
         moduleRepository,
     });
+
     const getCredentialForUser = new GetCredentialForUser({
         credentialRepository,
     });
+
     const createIntegration = new CreateIntegration({
         integrationRepository,
         integrationClasses,

package/integrations/integration.js

@@ -62,8 +62,14 @@ class Integration {
         // Integration behavior (strategy pattern)
         this.integrationClass = integrationClass;
 
-        // Loaded modules
-        this.modules = modules;
+        // Preserve the provided Module instances (array). We'll attach them
+        // as keyed modules after the behaviour instance is created so that
+        // `this.hubspot`, `this.salesforce`, etc. reference the fully-
+        // initialised objects with credentials.
+        this._moduleInstances = Array.isArray(modules) ? modules : [];
+
+        // Normalised map of modules keyed by module name (filled later)
+        this.modules = {};
 
         // Initialize basic behavior (sync parts only)
         this._initializeBasicBehavior();
@@ -110,10 +116,17 @@ class Integration {
             this.events = this.behavior.events || {};
             this.defaultEvents = this.behavior.defaultEvents || {};
 
+            // -----------------------------------------------------------------
+            // Inject the real Module instances (with credentials) so that any
+            // behaviour code accessing `this.<moduleName>.api` hits the
+            // correctly authenticated requester created by ModuleService.
+            // -----------------------------------------------------------------
+            for (const mod of this._moduleInstances) {
+                const key = typeof mod.getName === 'function' ? mod.getName() : mod.name;
+                if (!key) continue;
+                this.setModule(key, mod);
+            }
 
-            // Expose behaviour instance methods directly on the wrapper so that
-            // early-bound handlers (created before behaviour existed) can still
-            // access them without falling back through the Proxy. This prevents
             // `undefined` errors for methods like `loadDynamicUserActions` that
             // may be invoked inside default event-handlers.
             let proto = Object.getPrototypeOf(this.behavior);
@@ -217,4 +230,4 @@ class Integration {
     }
 }
 
-module.exports = { Integration }; 
+module.exports = { Integration };

package/modules/module-repository.js

@@ -40,24 +40,35 @@ class ModuleRepository {
     }
 
     async findEntitiesByUserId(userId) {
-        return Entity.find(
+        const entitiesRecords = await Entity.find(
             { user: userId },
             '-dateCreated -dateUpdated -user -credentials -credential -__t -__v',
             { lean: true }
-        );
+        ).populate('credential');
+
+        return entitiesRecords.map(e => ({
+            id: e._id.toString(),
+            accountId: e.accountId,
+            credential: e.credential,
+            userId: e.user.toString(),
+            name: e.name,
+            externalId: e.externalId,
+            type: e.__t,
+            moduleName: e.moduleName,
+        }));
     }
 
-    async findEntitiesByIds(entityIds) {
-        const entities = await Entity.find(
-            { _id: { $in: entityIds } },
+    async findEntitiesByIds(entitiesIds) {
+        const entitiesRecords = await Entity.find(
+            { _id: { $in: entitiesIds } },
             '',
             { lean: true }
-        );
+        ).populate('credential');
 
-        return entities.map(e => ({
+        return entitiesRecords.map(e => ({
             id: e._id.toString(),
             accountId: e.accountId,
-            credentialId: e.credential.toString(),
+            credential: e.credential,
             userId: e.user.toString(),
             name: e.name,
             externalId: e.externalId,

package/modules/module-service.js

@@ -27,10 +27,9 @@ class ModuleService {
             );
         }
 
-        const entityType = entity.type;
+        const moduleName = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
-            const modelName = Module.getEntityModelFromDefinition(def).modelName;
-            return entityType === modelName;
+            return moduleName === def.modelName;
         });
 
         if (!moduleDefinition) {

package/modules/module.js

@@ -1,10 +1,6 @@
 const { Delegate } = require('../core');
-const { get } = require('../assertions');
 const _ = require('lodash');
 const { flushDebugLog } = require('../logs');
-const { Credential } = require('./credential');
-const { Entity } = require('./entity');
-const { mongoose } = require('../database/mongoose');
 const { ModuleConstants } = require('./ModuleConstants');
 
 class Module extends Delegate {
@@ -33,10 +29,6 @@ class Module extends Delegate {
 
         Object.assign(this, this.definition.requiredAuthMethods);
 
-        this.CredentialModel = this.getCredentialModel();
-        this.EntityModel = this.getEntityModel();
-
-
         const apiParams = {
             ...this.definition.env,
             delegate: this,
@@ -46,11 +38,6 @@ class Module extends Delegate {
         this.api = new this.apiClass(apiParams);
     }
 
-    static getEntityModelFromDefinition(definition) {
-        const partialModule = new this({ definition });
-        return partialModule.getEntityModel();
-    }
-
     getName() {
         return this.name;
     }
@@ -72,45 +59,6 @@ class Module extends Delegate {
         return _.pick(entity, ...this.apiPropertiesToPersist?.entity);
     }
 
-    getEntityModel() {
-        if (!this.EntityModel) {
-            const prefix = this.modelName ?? _.upperFirst(this.getName());
-            const arrayToDefaultObject = (array, defaultValue) =>
-                _.mapValues(_.keyBy(array), () => defaultValue);
-            const schema = new mongoose.Schema(
-                arrayToDefaultObject(this.apiPropertiesToPersist.entity, {
-                    type: mongoose.Schema.Types.Mixed,
-                    trim: true,
-                })
-            );
-            const name = `${prefix}Entity`;
-            this.EntityModel =
-                Entity.discriminators?.[name] ||
-                Entity.discriminator(name, schema);
-        }
-        return this.EntityModel;
-    }
-
-    getCredentialModel() {
-        if (!this.CredentialModel) {
-            const arrayToDefaultObject = (array, defaultValue) =>
-                _.mapValues(_.keyBy(array), () => defaultValue);
-            const schema = new mongoose.Schema(
-                arrayToDefaultObject(this.apiPropertiesToPersist.credential, {
-                    type: mongoose.Schema.Types.Mixed,
-                    trim: true,
-                    lhEncrypt: true,
-                })
-            );
-            const prefix = this.modelName ?? _.upperFirst(this.getName());
-            const name = `${prefix}Credential`;
-            this.CredentialModel =
-                Credential.discriminators?.[name] ||
-                Credential.discriminator(name, schema);
-        }
-        return this.CredentialModel;
-    }
-
     async validateAuthorizationRequirements() {
         const requirements = await this.getAuthorizationRequirements();
         let valid = true;
@@ -190,58 +138,6 @@ class Module extends Delegate {
         }
     }
 
-    async findOrCreateEntity(entityDetails) {
-        const identifiers = get(entityDetails, 'identifiers');
-        const details = get(entityDetails, 'details');
-        const search = await this.EntityModel.find(identifiers);
-        if (search.length > 1) {
-            throw new Error(
-                'Multiple entities found with the same identifiers: ' +
-                JSON.stringify(identifiers)
-            );
-        } else if (search.length === 0) {
-            this.entity = await this.EntityModel.create({
-                credential: this.credential.id,
-                ...details,
-                ...identifiers,
-            });
-        } else if (search.length === 1) {
-            this.entity = search[0];
-        }
-        if (this.entity.credential === undefined) {
-            this.entity.credential = this.credential.id;
-            await this.entity.save();
-        }
-    }
-
-    async updateOrCreateCredential(credentialDetails) {
-        const identifiers = get(credentialDetails, 'identifiers');
-        const details = get(credentialDetails, 'details');
-
-        if (!this.credential) {
-            const credentialSearch = await this.CredentialModel.find(
-                identifiers
-            );
-            if (credentialSearch.length > 1) {
-                throw new Error(
-                    `Multiple credentials found with same identifiers: ${identifiers}`
-                );
-            } else if (credentialSearch.length === 1) {
-                // found exactly one credential with these identifiers
-                this.credential = credentialSearch[0];
-            } else {
-                // found no credential with these identifiers (match none for insert)
-                this.credential = { $exists: false };
-            }
-        }
-        // update credential or create if none was found
-        this.credential = await this.CredentialModel.findOneAndUpdate(
-            { _id: this.credential },
-            { $set: { ...identifiers, ...details } },
-            { useFindAndModify: true, new: true, upsert: true }
-        );
-    }
-
     async markCredentialsInvalid() {
         if (this.credential) {
             this.credential.auth_is_valid = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.397.6ecf8f5.0",
+  "version": "2.0.0--canary.397.05c9b19.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.6ecf8f5.0",
-    "@friggframework/prettier-config": "2.0.0--canary.397.6ecf8f5.0",
-    "@friggframework/test": "2.0.0--canary.397.6ecf8f5.0",
+    "@friggframework/eslint-config": "2.0.0--canary.397.05c9b19.0",
+    "@friggframework/prettier-config": "2.0.0--canary.397.05c9b19.0",
+    "@friggframework/test": "2.0.0--canary.397.05c9b19.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": "6ecf8f59b4e8e90f6a83c19af86c437504e776d6"
+  "gitHead": "05c9b19a8f1f2d8e7ef49983786c1fd622fa376a"
 }