@friggframework/core 2.0.0--canary.686.3e27a92.0 → 2.0.0--canary.663.8de669c.0

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

@@ -2,17 +2,9 @@
 const {
     mapIntegrationClassToIntegrationDTO,
 } = require('../utils/map-integration-dto');
-const {
-    describeRecord,
-    visibilityClauses,
-    matchesListFilters,
-} = require('../../modules/scope-visibility');
-const { DEFAULT_SCOPE_POLICY } = require('../../modules/scope-policy');
 
 /**
- * Use case for retrieving the integrations a caller may see: the ones they own
- * or their active organization owns, created in that organization (ADR-056
- * §3.6), each with `tenancy` ({scope, owner, organizationId, access}).
+ * Use case for retrieving all integrations for a specific user.
  * @class GetIntegrationsForUser
  */
 class GetIntegrationsForUser {
@@ -23,16 +15,13 @@ class GetIntegrationsForUser {
      * @param {Array<import('../integration').Integration>} params.integrationClasses - Array of available integration classes.
      * @param {import('../../modules/module-factory').ModuleFactory} params.moduleFactory - Service for module instantiation and management.
      * @param {import('../../modules/repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository - Repository for module and entity data operations.
-     * @param {Object} [params.scopePolicy] - from createScopePolicy
      */
     constructor({
         integrationRepository,
         integrationClasses,
         moduleFactory,
         moduleRepository,
-        scopePolicy,
     }) {
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
         /**
          * @type {import('../repositories/integration-repository-interface').IntegrationRepositoryInterface}
          */
@@ -43,86 +32,57 @@ class GetIntegrationsForUser {
     }
 
     /**
+     * Executes the retrieval of all integrations for a user.
      * @async
-     * @param {Object} user - authenticated User
-     * @param {{scope?: string, owner?: string}} [filters] - `?scope=` and `?owner=`
-     * @returns {Promise<Object[]>} Array of integration DTOs.
+     * @param {string} userId - ID of the user whose integrations to retrieve.
+     * @returns {Promise<Object[]>} Array of integration DTOs for the specified user.
      */
-    async execute(user, filters = {}) {
-        const ctx = this.scopePolicy.accessContext(user);
-        const records = await this.integrationRepository.findIntegrationsByOwnership(
-            visibilityClauses(ctx, 'integration')
-        );
+    async execute(userId) {
+        const integrationRecords =
+            await this.integrationRepository.findIntegrationsByUserId(userId);
 
         const integrations = [];
-        for (const record of records) {
-            // The query is the filter; the same rule again means a repository
-            // that returns too much cannot widen the list.
-            const tenancy = describeRecord(record, ctx, 'integration');
-            if (!tenancy || !matchesListFilters(tenancy, filters)) continue;
-            integrations.push({ ...(await this.toDto(record)), tenancy });
-        }
-        return integrations;
-    }
 
-    /** Hydrates one stored integration record into its DTO. */
-    async toDto(integrationRecord) {
-        const entities = await this.moduleRepository.findEntitiesByIds(
-            integrationRecord.entitiesIds
-        );
-
-        const integrationClass = this.integrationClasses.find(
-            (integrationClass) =>
-                integrationClass.Definition.name ===
-                integrationRecord.config.type
-        );
+        for (const integrationRecord of integrationRecords) {
+            const entities = await this.moduleRepository.findEntitiesByIds(
+                integrationRecord.entitiesIds
+            );
 
-        const modules = [];
-        for (const entity of entities) {
-            const moduleInstance = await this.moduleFactory.getModuleInstance(
-                entity.id,
-                integrationRecord.userId
+            const integrationClass = this.integrationClasses.find(
+                (integrationClass) =>
+                    integrationClass.Definition.name ===
+                    integrationRecord.config.type
             );
-            modules.push(moduleInstance);
-        }
 
-        return mapIntegrationClassToIntegrationDTO({
-            id: integrationRecord.id,
-            userId: integrationRecord.userId,
-            entities: entities,
-            config: integrationRecord.config,
-            status: integrationRecord.status,
-            version: integrationRecord.version,
-            messages: integrationRecord.messages || { errors: [], warnings: [] },
-            modules,
-            options: integrationClass.getOptionDetails(),
-        });
-    }
-}
+            const modules = [];
+            for (const entity of entities) {
+                const moduleInstance =
+                    await this.moduleFactory.getModuleInstance(
+                        entity.id,
+                        integrationRecord.userId
+                    );
+                modules.push(moduleInstance);
+            }
 
-/**
- * Every integration one user id owns, with no organization rules: the lookup
- * behind the app-level `friggCommands.findIntegrationsByUserId`, which has a
- * user id and no request.
- */
-class GetIntegrationsByUserId {
-    /** @param {ConstructorParameters<typeof GetIntegrationsForUser>[0]} params */
-    constructor(params) {
-        this.integrationRepository = params.integrationRepository;
-        this.hydrator = new GetIntegrationsForUser(params);
-    }
+            const integrationData = {
+                id: integrationRecord.id,
+                userId: integrationRecord.userId,
+                entities: entities,
+                config: integrationRecord.config,
+                status: integrationRecord.status,
+                version: integrationRecord.version,
+                messages: integrationRecord.messages || { errors: [], warnings: [] },
+                modules,
+                options: integrationClass.getOptionDetails(),
+            };
 
-    /** @param {string} userId */
-    async execute(userId) {
-        const records = await this.integrationRepository.findIntegrationsByUserId(
-            userId
-        );
-        const integrations = [];
-        for (const record of records) {
-            integrations.push(await this.hydrator.toDto(record));
+            integrations.push(
+                mapIntegrationClassToIntegrationDTO(integrationData)
+            );
         }
+
         return integrations;
     }
 }
 
-module.exports = { GetIntegrationsForUser, GetIntegrationsByUserId };
+module.exports = { GetIntegrationsForUser };

package/integrations/use-cases/index.js

@@ -1,7 +1,4 @@
-const {
-    GetIntegrationsForUser,
-    GetIntegrationsByUserId,
-} = require('./get-integrations-for-user');
+const { GetIntegrationsForUser } = require('./get-integrations-for-user');
 const { DeleteIntegrationForUser } = require('./delete-integration-for-user');
 const { CreateIntegration } = require('./create-integration');
 const { GetIntegration } = require('./get-integration');
@@ -9,11 +6,9 @@ const { CreateProcess } = require('./create-process');
 const { UpdateProcessState } = require('./update-process-state');
 const { UpdateProcessMetrics } = require('./update-process-metrics');
 const { GetProcess } = require('./get-process');
-const { DispatchOngoingSyncs } = require('./dispatch-ongoing-syncs');
 
 module.exports = {
     GetIntegrationsForUser,
-    GetIntegrationsByUserId,
     DeleteIntegrationForUser,
     CreateIntegration,
     GetIntegration,
@@ -21,5 +16,4 @@ module.exports = {
     UpdateProcessState,
     UpdateProcessMetrics,
     GetProcess,
-    DispatchOngoingSyncs,
 }; 

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

@@ -19,48 +19,19 @@ function mapIntegrationClassToIntegrationDTO(integration) {
     };
 }
 
-let deprecationLogged = false;
 
-/**
- * @deprecated Since ADR-059. Read `entityTypeRegistry` / `moduleDefinitions`
- * from `loadAppDefinition()`, or call `getEntityTypeRegistry(appDefinition)`
- * and read each entry's `definition`.
- *
- * Kept as a wrapper over the entity type registry so callers that imported it
- * keep working. It returns the registry's definitions, so it follows the
- * registry's rules: one definition per entity type name (the first wins when
- * two integrations bind different definitions under one name, as
- * ModuleFactory already picked), and, when `entities` is passed, registry-only
- * types are included and conflicts throw `EntityRegistryError`.
- *
- * @param {Array<Function>} integrationClasses - integration classes
- * @param {Object} [entities] - `appDefinition.entities` (ADR-059)
- * @returns {Array<Object>} API module definitions
- */
-function getModulesDefinitionFromIntegrationClasses(
-    integrationClasses,
-    entities
-) {
-    // Required here, not at the top: modules/ must not load at require time
-    // of every integration use case that only wants the DTO mapper.
-    const {
-        getEntityTypeRegistry,
-        getEntityTypeDefinitions,
-    } = require('../../modules/entity-type-registry');
-    if (!deprecationLogged) {
-        deprecationLogged = true;
-        const { getLogger } = require('../../logs');
-        getLogger('frigg.integrations').warn(
-            'getModulesDefinitionFromIntegrationClasses is deprecated; use getEntityTypeRegistry (ADR-059)',
-            { eventName: 'frigg.integrations.deprecated_module_definitions' }
-        );
-    }
-    return getEntityTypeDefinitions(
-        getEntityTypeRegistry({ integrations: integrationClasses, entities })
-    );
-}
-
-module.exports = {
-    mapIntegrationClassToIntegrationDTO,
-    getModulesDefinitionFromIntegrationClasses,
+const getModulesDefinitionFromIntegrationClasses = (integrationClasses) => {
+    return [
+        ...new Set(
+            integrationClasses
+                .map((integration) =>
+                    Object.values(integration.Definition.modules).map(
+                        (module) => module.definition
+                    )
+                )
+                .flat()
+        ),
+    ];
 };
+
+module.exports = { mapIntegrationClassToIntegrationDTO, getModulesDefinitionFromIntegrationClasses }; 

package/modules/index.js

@@ -4,15 +4,6 @@ const { OAuth2Requester } = require('./requester/oauth-2');
 const { Requester } = require('./requester/requester');
 const { ModuleConstants } = require('./ModuleConstants');
 const { ModuleFactory } = require('./module-factory');
-const {
-    getEntityTypeRegistry,
-    EntityRegistryError,
-} = require('./entity-type-registry');
-const {
-    resolveScope,
-    listBindingScopes,
-    OwnershipConfigError,
-} = require('./entity-scope');
 
 module.exports = {
     ApiKeyRequester,
@@ -21,9 +12,4 @@ module.exports = {
     Requester,
     ModuleConstants,
     ModuleFactory,
-    getEntityTypeRegistry,
-    EntityRegistryError,
-    resolveScope,
-    listBindingScopes,
-    OwnershipConfigError,
 };

package/modules/module-factory.js

@@ -45,18 +45,6 @@ class ModuleFactory {
             );
         }
 
-        // definition.env may be an async function (e.g. the db-credentials
-        // extension's bootstrap loads OAuth app credentials from the
-        // database); resolve it first. A static env keeps the plain
-        // constructor, exactly as before.
-        if (typeof moduleDefinition.env === 'function') {
-            return await Module.create({
-                userId,
-                entity,
-                definition: moduleDefinition,
-            });
-        }
-
         return new Module({
             userId,
             entity,

package/modules/module.js

@@ -21,17 +21,8 @@ class Module extends Delegate {
      * @param {string} params.userId The user id
      * @param {Object} params.entity The entity record from the database
      * @param {string} [params.state] Optional OAuth state value forwarded to the API client (round-trips through the OAuth provider).
-     * @param {Object} [params.resolvedEnv] definition.env as Module.create() resolved it (may be undefined).
-     * @param {boolean} [params.envResolved=false] true when resolvedEnv carries the resolved env, even an undefined one; otherwise the static definition.env is used.
      */
-    constructor({
-        definition,
-        userId = null,
-        entity: entityObj = null,
-        state = null,
-        resolvedEnv,
-        envResolved = false,
-    }) {
+    constructor({ definition, userId = null, entity: entityObj = null, state = null }) {
         super({ definition, userId, entity: entityObj });
 
         this.validateDefinition(definition);
@@ -63,23 +54,8 @@ class Module extends Delegate {
 
         Object.assign(this, this.definition.requiredAuthMethods);
 
-        // A pre-resolved env (Module.create()) supports definition.env as an
-        // async function, e.g. OAuth app credentials loaded from the database
-        // by the db-credentials extension; otherwise the static object.
-        // "Resolved" is an explicit flag, not a non-null value: a function env
-        // may legitimately resolve to undefined (no static env, no DB row),
-        // and falling back to definition.env would then read the function.
-        const envValues = envResolved ? resolvedEnv : this.definition.env;
-        if (typeof envValues === 'function') {
-            // Spreading a function yields no keys, so the API client would
-            // silently get no client_id / client_secret.
-            throw new TypeError(
-                `Module ${this.name}: definition.env is a function; build the module with await Module.create(...)`
-            );
-        }
-
         const apiParams = {
-            ...envValues,
+            ...this.definition.env,
             delegate: this,
             logger: this.logger,
             ...(state ? { state } : {}),
@@ -91,33 +67,6 @@ class Module extends Delegate {
         this.api = new this.apiClass(apiParams);
     }
 
-    /**
-     * Resolves definition.env, supporting both a static object and a
-     * (possibly async) function.
-     *
-     * @param {Object} definition - Module definition
-     * @returns {Promise<Object|undefined>} Resolved env values
-     */
-    static async resolveEnv(definition) {
-        if (typeof definition.env === 'function') {
-            return await definition.env();
-        }
-        return definition.env;
-    }
-
-    /**
-     * Async factory that resolves definition.env first, so a module whose
-     * env is a function gets its values. Prefer it over `new Module(...)`
-     * wherever the call site can await.
-     *
-     * @param {Object} params - same as the constructor, minus resolvedEnv
-     * @returns {Promise<Module>}
-     */
-    static async create({ definition, userId = null, entity = null, state = null }) {
-        const resolvedEnv = await Module.resolveEnv(definition);
-        return new Module({ definition, userId, entity, state, resolvedEnv, envResolved: true });
-    }
-
     getName() {
         return this.name;
     }

package/modules/repositories/module-repository-documentdb.js

@@ -3,14 +3,12 @@ const {
     toObjectId,
     fromObjectId,
     findMany,
-    findManyDrained,
     findOne,
     insertOne,
     updateOne,
     deleteOne,
 } = require('../../database/documentdb-utils');
 const { ModuleRepositoryInterface } = require('./module-repository-interface');
-const { entityNotFoundError } = require('./entity-not-found');
 const { DocumentDBEncryptionService } = require('../../database/documentdb-encryption-service');
 
 /**
@@ -35,11 +33,11 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
     async findEntityById(entityId) {
         const objectId = toObjectId(entityId);
         if (!objectId) {
-            throw entityNotFoundError(entityId);
+            throw new Error(`Entity ${entityId} not found`);
         }
         const doc = await findOne(this.prisma, 'Entity', { _id: objectId });
         if (!doc) {
-            throw entityNotFoundError(entityId);
+            throw new Error(`Entity ${entityId} not found`);
         }
         const credential = await this._fetchCredential(doc.credentialId);
         return this._mapEntity(doc, credential);
@@ -78,29 +76,6 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
         return docs.map((doc) => this._mapEntity(doc, credentialMap.get(fromObjectId(doc.credentialId)) || null));
     }
 
-    /**
-     * Find entities matching any of the owner/organization pairs, in one query.
-     * `organizationId: null` matches rows with no organization (a raw MongoDB
-     * `null` also matches a missing field). The caller (a use case) decides
-     * which pairs; this only runs them.
-     *
-     * @param {Array<{userId: string, organizationId: (string|null)}>} clauses
-     * @returns {Promise<Array>}
-     */
-    async findEntitiesByOwnership(clauses) {
-        if (!Array.isArray(clauses) || clauses.length === 0) return [];
-        // Drained: a list can hold more than the first cursor batch (~101).
-        const docs = await findManyDrained(this.prisma, 'Entity', {
-            $or: clauses.map(({ userId, organizationId }) => ({
-                userId: toObjectId(userId),
-                organizationId:
-                    organizationId === null ? null : toObjectId(organizationId),
-            })),
-        });
-        const credentialMap = await this._fetchCredentialsBulk(docs.map((doc) => doc.credentialId));
-        return docs.map((doc) => this._mapEntity(doc, credentialMap.get(fromObjectId(doc.credentialId)) || null));
-    }
-
     async unsetCredential(entityId) {
         const objectId = toObjectId(entityId);
         if (!objectId) return false;
@@ -140,14 +115,7 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
         );
     }
 
-    /**
-     * @param {Object} entityData
-     * @param {{organizationId?: (string|null)}} [tenancy] - the organization the entity
-     *   belongs to (ADR-056 §3.6). A separate argument, not a field of `entityData`,
-     *   because `entityData` carries provider fields and one named `organizationId`
-     *   must not be taken for ours.
-     */
-    async createEntity(entityData, tenancy = {}) {
+    async createEntity(entityData) {
         const {
             user,
             userId,
@@ -165,7 +133,6 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
             name: name ?? null,
             moduleName: moduleName ?? null,
             externalId: externalId ?? null,
-            organizationId: toObjectId(tenancy.organizationId) || null,
             data: dynamicData,
         };
         const insertedId = await insertOne(this.prisma, 'Entity', document);
@@ -280,9 +247,8 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
             const objectIds = ids.map(id => toObjectId(id)).filter(Boolean);
             if (objectIds.length === 0) return new Map();
 
-            // Raw read to bypass the Prisma encryption extension. Drained:
-            // more ids than the first cursor batch must all come back.
-            const rawCredentials = await findManyDrained(this.prisma, 'Credential', {
+            // Use raw findMany to bypass Prisma encryption extension
+            const rawCredentials = await findMany(this.prisma, 'Credential', {
                 _id: { $in: objectIds }
             });
 
@@ -363,30 +329,19 @@ class ModuleRepositoryDocumentDB extends ModuleRepositoryInterface {
         if (filter.name) query.name = filter.name;
         if (filter.moduleName) query.moduleName = filter.moduleName;
         if (filter.externalId) query.externalId = filter.externalId;
-        // `null` means "no organization"; absent means "any". A raw MongoDB
-        // `{ field: null }` matches both a null value and a missing field.
-        if (filter.organizationId !== undefined) {
-            query.organizationId =
-                filter.organizationId === null
-                    ? null
-                    : toObjectId(filter.organizationId);
-        }
         return query;
     }
 
     _mapEntity(doc, credential) {
         const dynamicData = doc?.data || {};
         return {
-            // First, so no stored provider field can replace a column below
-            // (identity, owner or organization decide who sees the entity).
-            ...dynamicData,
             id: fromObjectId(doc?._id),
             credential,
             userId: fromObjectId(doc?.userId),
             name: doc?.name ?? null,
             externalId: doc?.externalId ?? null,
             moduleName: doc?.moduleName ?? null,
-            organizationId: fromObjectId(doc?.organizationId) ?? null,
+            ...dynamicData,
         };
     }
 }

package/modules/repositories/module-repository-interface.js

@@ -67,21 +67,6 @@ class ModuleRepositoryInterface {
         );
     }
 
-    /**
-     * Find entities matching any of the owner/organization pairs, in one query
-     * (ADR-056 §3.6). `organizationId: null` matches rows with no organization.
-     * Which pairs is decided by the caller (modules/entity-scope.js), not here.
-     *
-     * @param {Array<{userId: string|number, organizationId: (string|number|null)}>} clauses
-     * @returns {Promise<Array>} Array of entity objects
-     * @abstract
-     */
-    async findEntitiesByOwnership(clauses) {
-        throw new Error(
-            'Method findEntitiesByOwnership must be implemented by subclass'
-        );
-    }
-
     /**
      * Unset credential from entity
      *
@@ -125,13 +110,11 @@ class ModuleRepositoryInterface {
     /**
      * Create a new entity
      *
-     * @param {Object} entityData - Entity data (provider fields included)
-     * @param {{organizationId?: (string|number|null)}} [tenancy] - the organization
-     *   the entity belongs to (ADR-056 §3.6), kept apart from `entityData`
+     * @param {Object} entityData - Entity data
      * @returns {Promise<Object>} Created entity object
      * @abstract
      */
-    async createEntity(entityData, tenancy) {
+    async createEntity(entityData) {
         throw new Error('Method createEntity must be implemented by subclass');
     }