@friggframework/core 2.0.0-next.55 → 2.0.0-next.57

package/integrations/integration-base.js

@@ -203,22 +203,53 @@ class IntegrationBase {
 
     /**
      * Returns the modules as object with keys as module names.
+     * Uses the keys from Definition.modules to attach modules correctly.
+     * 
+     * Example:
+     *   Definition.modules = { attio: {...}, quo: { definition: { getName: () => 'quo-attio' } } }
+     *   Module with getName()='quo-attio' gets attached as this.quo (not this['quo-attio'])
+     * 
      * @private
      * @param {Array} integrationModules - Array of module instances
      * @returns {Object} The modules object
      */
     _appendModules(integrationModules) {
         const modules = {};
+
+        // Build reverse mapping: definition.getName() → referenceKey
+        // e.g., 'quo-attio' → 'quo', 'attio' → 'attio'
+        const moduleNameToKey = {};
+        if (this.constructor.Definition?.modules) {
+            for (const [key, moduleConfig] of Object.entries(this.constructor.Definition.modules)) {
+                const definition = moduleConfig.definition;
+                if (definition) {
+                    // Use getName() if available, fallback to moduleName
+                    const definitionName = typeof definition.getName === 'function'
+                        ? definition.getName()
+                        : definition.moduleName;
+                    if (definitionName) {
+                        moduleNameToKey[definitionName] = key;
+                    }
+                }
+            }
+        }
+
         for (const module of integrationModules) {
-            const key =
+            const moduleName =
                 typeof module.getName === 'function'
                     ? module.getName()
                     : module.name;
+
+            // Use the reference key from Definition.modules if available,
+            // otherwise fall back to moduleName
+            const key = moduleNameToKey[moduleName] || moduleName;
+
             if (key) {
                 modules[key] = module;
                 this[key] = module;
             }
         }
+
         return modules;
     }
 
@@ -333,7 +364,6 @@ class IntegrationBase {
         return {};
     }
     async loadUserActions({ actionType } = {}) {
-        console.log('loadUserActions called with actionType:', actionType);
         const userActions = {};
         for (const [key, event] of Object.entries(this.events)) {
             if (event.type === constantsToBeMigrated.types.USER_ACTION) {
@@ -389,7 +419,6 @@ class IntegrationBase {
 
     async onWebhook({ data }) {
         // Default: no-op, integrations override this
-        console.log('Webhook received:', data);
     }
 
     async queueWebhook(data) {

package/integrations/integration-router.js

@@ -601,11 +601,10 @@ function setEntityRoutes(router, authenticateUser, useCases) {
     router.route('/api/entities/:entityId/test-auth').get(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
             const testAuthResponse = await testModuleAuth.execute(
                 params.entityId,
-                userId
+                user // Pass User object for proper validation
             );
 
             if (!testAuthResponse) {
@@ -614,7 +613,7 @@ function setEntityRoutes(router, authenticateUser, useCases) {
                     errors: [
                         {
                             title: 'Authentication Error',
-                            message: `There was an error with your ${module.getName()} Entity.  Please reconnect/re-authenticate, or reach out to Support for assistance.`,
+                            message: `There was an error with your Entity. Please reconnect/re-authenticate, or reach out to Support for assistance.`,
                             timestamp: Date.now(),
                         },
                     ],
@@ -628,9 +627,8 @@ function setEntityRoutes(router, authenticateUser, useCases) {
     router.route('/api/entities/:entityId').get(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
-            const module = await getModule.execute(params.entityId, userId);
+            const module = await getModule.execute(params.entityId, user); // Pass User object
 
             res.json(module);
         })
@@ -639,12 +637,11 @@ function setEntityRoutes(router, authenticateUser, useCases) {
     router.route('/api/entities/:entityId/options').post(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
 
             const entityOptions = await getEntityOptionsById.execute(
                 params.entityId,
-                userId
+                user // Pass User object
             );
 
             res.json(entityOptions);
@@ -654,11 +651,10 @@ function setEntityRoutes(router, authenticateUser, useCases) {
     router.route('/api/entities/:entityId/options/refresh').post(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.params, ['entityId']);
             const updatedOptions = await refreshEntityOptions.execute(
                 params.entityId,
-                userId,
+                user, // Pass User object
                 req.body
             );
 

package/modules/requester/api-key.js

@@ -1,4 +1,5 @@
 const { Requester } = require('./requester');
+const { get } = require('../../assertions');
 const { ModuleConstants } = require('../ModuleConstants');
 
 
@@ -9,27 +10,42 @@ class ApiKeyRequester extends Requester {
     constructor(params) {
         super(params);
         this.requesterType = 'apiKey';
-        this.API_KEY_NAME = 'key';
-        this.API_KEY_VALUE = null;
+
+        // Use snake_case convention consistent with OAuth2Requester and BasicAuthRequester
+        this.api_key_name = get(params, 'api_key_name', 'key');
+        this.api_key = get(params, 'api_key', null);
+
+        // Backward compatibility: support old naming convention
+        if (!this.api_key && params.API_KEY_VALUE) {
+            this.api_key = params.API_KEY_VALUE;
+        }
+        if (!this.api_key_name && params.API_KEY_NAME) {
+            this.api_key_name = params.API_KEY_NAME;
+        }
     }
 
     async addAuthHeaders(headers) {
-        if (this.API_KEY_VALUE) {
-            headers[this.API_KEY_NAME] = this.API_KEY_VALUE;
+        if (this.api_key) {
+            headers[this.api_key_name] = this.api_key;
         }
         return headers;
     }
 
     isAuthenticated() {
         return (
-            this.API_KEY_VALUE !== null &&
-            this.API_KEY_VALUE !== undefined &&
-            this.API_KEY_VALUE.trim().length() > 0
+            this.api_key !== null &&
+            this.api_key !== undefined &&
+            typeof this.api_key === 'string' &&
+            this.api_key.trim().length > 0
         );
     }
 
     setApiKey(api_key) {
-        this.API_KEY_VALUE = api_key;
+        this.api_key = api_key;
+    }
+
+    setApiKeyName(api_key_name) {
+        this.api_key_name = api_key_name;
     }
 }
 

package/modules/use-cases/get-entity-options-by-id.js

@@ -12,11 +12,18 @@ class GetEntityOptionsById {
     }
 
     /**
-     * Retrieve a Module instance for a given user and entity/module type.
-     * @param {string} userId
-     * @param {string} entityId
+     * Retrieve entity options for a given entity
+     *
+     * @param {string|number} entityId - Entity ID to retrieve options for
+     * @param {string|number|import('../../user/user').User} userIdOrUser - User ID or User object for validation
+     * @returns {Promise<Object>} Entity options
      */
-    async execute(entityId, userId) {
+    async execute(entityId, userIdOrUser) {
+        // Support both userId (backward compatible) and User object (new pattern)
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
+
         const entity = await this.moduleRepository.findEntityById(
             entityId,
             userId
@@ -26,7 +33,12 @@ class GetEntityOptionsById {
             throw new Error(`Entity ${entityId} not found`);
         }
 
-        if (entity.userId !== userId) {
+        // Validate entity ownership
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
+
+        if (!isOwned) {
             throw new Error(
                 `Entity ${entityId} does not belong to user ${userId}`
             );

package/modules/use-cases/get-module.js

@@ -6,7 +6,19 @@ class GetModule {
         this.moduleDefinitions = moduleDefinitions;
     }
 
-    async execute(entityId, userId) {
+    /**
+     * Get module instance for an entity
+     *
+     * @param {string|number} entityId - Entity ID to retrieve
+     * @param {string|number|import('../../user/user').User} userIdOrUser - User ID or User object for validation
+     * @returns {Promise<Object>} Module details
+     */
+    async execute(entityId, userIdOrUser) {
+        // Support both userId (backward compatible) and User object (new pattern)
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
+
         const entity = await this.moduleRepository.findEntityById(
             entityId,
             userId
@@ -16,7 +28,14 @@ class GetModule {
             throw new Error(`Entity ${entityId} not found`);
         }
 
-        if (entity.userId !== userId) {
+        // Validate entity ownership
+        // If User object provided, use ownsUserId to check linked users
+        // Otherwise fall back to simple equality check
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
+
+        if (!isOwned) {
             throw new Error(
                 `Entity ${entityId} does not belong to user ${userId}`
             );

package/modules/use-cases/process-authorization-callback.js

@@ -100,9 +100,20 @@ class ProcessAuthorizationCallback {
     async findOrCreateEntity(entityDetails, moduleName, credentialId) {
         const { identifiers, details } = entityDetails;
 
+        // Support both 'user' and 'userId' field names from module definitions
+        // Some modules use 'user' (legacy), others use 'userId' (newer pattern)
+        const userId = identifiers.user || identifiers.userId;
+
+        if (!userId) {
+            throw new Error(
+                `Module definition for ${moduleName} must return 'user' or 'userId' in identifiers from getEntityDetails(). ` +
+                    `Without userId, entity lookup would match across all users (security issue).`
+            );
+        }
+
         const existingEntity = await this.moduleRepository.findEntity({
             externalId: identifiers.externalId,
-            user: identifiers.user,
+            user: userId,
             moduleName: moduleName,
         });
 

package/modules/use-cases/refresh-entity-options.js

@@ -12,11 +12,19 @@ class RefreshEntityOptions {
     }
 
     /**
-     * Retrieve a Module instance for a given user and entity/module type.
-     * @param {string} userId
-     * @param {string} entityId
+     * Refresh entity options for a given entity
+     *
+     * @param {string|number} entityId - Entity ID to refresh
+     * @param {string|number|import('../../user/user').User} userIdOrUser - User ID or User object for validation
+     * @param {Object} options - Refresh options
+     * @returns {Promise<Object>} Updated entity options
      */
-    async execute(entityId, userId, options) {
+    async execute(entityId, userIdOrUser, options) {
+        // Support both userId (backward compatible) and User object (new pattern)
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
+
         const entity = await this.moduleRepository.findEntityById(
             entityId,
             userId
@@ -26,7 +34,12 @@ class RefreshEntityOptions {
             throw new Error(`Entity ${entityId} not found`);
         }
 
-        if (entity.userId !== userId) {
+        // Validate entity ownership
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
+
+        if (!isOwned) {
             throw new Error(
                 `Entity ${entityId} does not belong to user ${userId}`
             );

package/modules/use-cases/test-module-auth.js

@@ -11,7 +11,19 @@ class TestModuleAuth {
         this.moduleDefinitions = moduleDefinitions;
     }
 
-    async execute(entityId, userId) {
+    /**
+     * Test authentication for a module entity
+     *
+     * @param {string|number} entityId - Entity ID to test
+     * @param {string|number|import('../../user/user').User} userIdOrUser - User ID or User object for validation
+     * @returns {Promise<boolean>} Authentication test result
+     */
+    async execute(entityId, userIdOrUser) {
+        // Support both userId (backward compatible) and User object (new pattern)
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
+
         const entity = await this.moduleRepository.findEntityById(
             entityId,
             userId
@@ -21,7 +33,12 @@ class TestModuleAuth {
             throw new Error(`Entity ${entityId} not found`);
         }
 
-        if (entity.userId !== userId) {
+        // Validate entity ownership
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
+
+        if (!isOwned) {
             throw new Error(
                 `Entity ${entityId} does not belong to user ${userId}`
             );

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0-next.55",
+    "version": "2.0.0-next.57",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0-next.55",
-        "@friggframework/prettier-config": "2.0.0-next.55",
-        "@friggframework/test": "2.0.0-next.55",
+        "@friggframework/eslint-config": "2.0.0-next.57",
+        "@friggframework/prettier-config": "2.0.0-next.57",
+        "@friggframework/test": "2.0.0-next.57",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "7f86d4b5faaab4de74e6e3676948b62d1e1a5bb1"
+    "gitHead": "d09ee09decef14a8cdbf657494ac0dc9bf0b4014"
 }

package/prisma-postgresql/migrations/20251112195422_update_user_unique_constraints/migration.sql

@@ -21,49 +21,5 @@ ALTER TABLE "Credential" DROP COLUMN "subType";
 -- AlterTable
 ALTER TABLE "Entity" DROP COLUMN "subType";
 
--- CreateTable
-CREATE TABLE "Process" (
-    "id" SERIAL NOT NULL,
-    "userId" INTEGER NOT NULL,
-    "integrationId" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "type" TEXT NOT NULL,
-    "state" TEXT NOT NULL,
-    "context" JSONB NOT NULL DEFAULT '{}',
-    "results" JSONB NOT NULL DEFAULT '{}',
-    "parentProcessId" INTEGER,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "Process_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE INDEX "Process_userId_idx" ON "Process"("userId");
-
--- CreateIndex
-CREATE INDEX "Process_integrationId_idx" ON "Process"("integrationId");
-
--- CreateIndex
-CREATE INDEX "Process_type_idx" ON "Process"("type");
-
--- CreateIndex
-CREATE INDEX "Process_state_idx" ON "Process"("state");
-
--- CreateIndex
-CREATE INDEX "Process_name_idx" ON "Process"("name");
-
--- CreateIndex
-CREATE INDEX "Process_parentProcessId_idx" ON "Process"("parentProcessId");
-
 -- CreateIndex
 CREATE UNIQUE INDEX "User_username_appUserId_key" ON "User"("username", "appUserId");
-
--- AddForeignKey
-ALTER TABLE "Process" ADD CONSTRAINT "Process_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Process" ADD CONSTRAINT "Process_integrationId_fkey" FOREIGN KEY ("integrationId") REFERENCES "Integration"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Process" ADD CONSTRAINT "Process_parentProcessId_fkey" FOREIGN KEY ("parentProcessId") REFERENCES "Process"("id") ON DELETE SET NULL ON UPDATE CASCADE;

package/queues/queuer-util.js

@@ -4,7 +4,6 @@ const { SQSClient, SendMessageCommand, SendMessageBatchCommand } = require('@aws
 const awsConfigOptions = () => {
     const config = {};
     if (process.env.IS_OFFLINE) {
-        console.log('Running in offline mode');
         config.credentials = {
             accessKeyId: 'test-aws-key',
             secretAccessKey: 'test-aws-secret',
@@ -21,7 +20,6 @@ const sqs = new SQSClient(awsConfigOptions());
 
 const QueuerUtil = {
     send: async (message, queueUrl) => {
-        console.log(`Enqueuing message to SQS queue ${queueUrl}`);
         const command = new SendMessageCommand({
             MessageBody: JSON.stringify(message),
             QueueUrl: queueUrl,
@@ -30,9 +28,6 @@ const QueuerUtil = {
     },
 
     batchSend: async (entries = [], queueUrl) => {
-        console.log(
-            `Enqueuing ${entries.length} entries on SQS to queue ${queueUrl}`
-        );
         const buffer = [];
         const batchSize = 10;
 
@@ -43,7 +38,6 @@ const QueuerUtil = {
             });
             // Sends 10, then purges the buffer
             if (buffer.length === batchSize) {
-                console.log('Buffer at 10, sending batch');
                 const command = new SendMessageBatchCommand({
                     Entries: buffer,
                     QueueUrl: queueUrl,
@@ -53,11 +47,9 @@ const QueuerUtil = {
                 buffer.splice(0, buffer.length);
             }
         }
-        console.log('Buffer at end, sending final batch');
 
         // If any remaining entries under 10 are left in the buffer, send and return
         if (buffer.length > 0) {
-            console.log(buffer);
             const command = new SendMessageBatchCommand({
                 Entries: buffer,
                 QueueUrl: queueUrl,

package/user/repositories/user-repository-documentdb.js

@@ -427,6 +427,26 @@ class UserRepositoryDocumentDB extends UserRepositoryInterface {
         const date = new Date(value);
         return isNaN(date.getTime()) ? undefined : date;
     }
+
+    /**
+     * Link an individual user to an organization user
+     * @param {string} individualUserId - Individual user ID (MongoDB ObjectId string)
+     * @param {string} organizationUserId - Organization user ID (MongoDB ObjectId string)
+     * @returns {Promise<Object>} Updated individual user object
+     */
+    async linkIndividualToOrganization(individualUserId, organizationUserId) {
+        const doc = await updateOne(
+            this.prisma,
+            'User',
+            { _id: toObjectId(individualUserId), type: 'INDIVIDUAL' },
+            { $set: { organizationId: toObjectId(organizationUserId) } }
+        );
+        const decrypted = await this.encryptionService.decryptFields(
+            'User',
+            doc
+        );
+        return this._mapUser(decrypted);
+    }
 }
 
 module.exports = { UserRepositoryDocumentDB };

package/user/repositories/user-repository-interface.js

@@ -193,6 +193,20 @@ class UserRepositoryInterface {
     async deleteUser(userId) {
         throw new Error('Method deleteUser must be implemented by subclass');
     }
+
+    /**
+     * Link an individual user to an organization user
+     *
+     * @param {string|number} individualUserId - Individual user ID
+     * @param {string|number} organizationUserId - Organization user ID
+     * @returns {Promise<Object>} Updated individual user object
+     * @abstract
+     */
+    async linkIndividualToOrganization(individualUserId, organizationUserId) {
+        throw new Error(
+            'Method linkIndividualToOrganization must be implemented by subclass'
+        );
+    }
 }
 
 module.exports = { UserRepositoryInterface };

package/user/repositories/user-repository-mongo.js

@@ -287,6 +287,24 @@ class UserRepositoryMongo extends UserRepositoryInterface {
             throw error;
         }
     }
+
+    /**
+     * Link an individual user to an organization user
+     * @param {string} individualUserId - Individual user ID (MongoDB ObjectId string)
+     * @param {string} organizationUserId - Organization user ID (MongoDB ObjectId string)
+     * @returns {Promise<Object>} Updated individual user object
+     */
+    async linkIndividualToOrganization(individualUserId, organizationUserId) {
+        return await this.prisma.user.update({
+            where: {
+                id: individualUserId,
+                type: 'INDIVIDUAL',
+            },
+            data: {
+                organizationId: organizationUserId,
+            },
+        });
+    }
 }
 
 module.exports = { UserRepositoryMongo };

package/user/repositories/user-repository-postgres.js

@@ -346,6 +346,28 @@ class UserRepositoryPostgres extends UserRepositoryInterface {
             throw error;
         }
     }
+
+    /**
+     * Link an individual user to an organization user
+     * @param {string} individualUserId - Individual user ID (string from application layer)
+     * @param {string} organizationUserId - Organization user ID (string from application layer)
+     * @returns {Promise<Object>} Updated individual user with string IDs
+     */
+    async linkIndividualToOrganization(individualUserId, organizationUserId) {
+        const intIndividualId = this._convertId(individualUserId);
+        const intOrganizationId = this._convertId(organizationUserId);
+
+        const user = await this.prisma.user.update({
+            where: {
+                id: intIndividualId,
+                type: 'INDIVIDUAL',
+            },
+            data: {
+                organizationId: intOrganizationId,
+            },
+        });
+        return this._convertUserIds(user);
+    }
 }
 
 module.exports = { UserRepositoryPostgres };