@friggframework/core 2.0.0--canary.684.0da024b.0 → 2.0.0--canary.679.a2bcc2f.0

package/management-api/v2/handlers/credentials.js

@@ -1,5 +1,4 @@
 const { maskCredential } = require('../dto');
-const { parseListFilters } = require('../request');
 
 /** Management API v2 credential handlers, keyed by operationId. */
 function createCredentialHandlers(useCases) {
@@ -7,11 +6,8 @@ function createCredentialHandlers(useCases) {
         useCases;
 
     return {
-        async listCredentials(req, res, user) {
-            const credentials = await listCredentialsForUser.execute(
-                user,
-                parseListFilters(req.query)
-            );
+        async listCredentials(_req, res, user) {
+            const credentials = await listCredentialsForUser.execute(user);
             res.json({ credentials: credentials.map(maskCredential) });
         },
 

package/management-api/v2/handlers/entities.js

@@ -1,5 +1,5 @@
 const { toEntityDto } = require('../dto');
-const { objectBody, parseStep, parseListFilters } = require('../request');
+const { objectBody, parseStep } = require('../request');
 
 /** Management API v2 entity and entity-type handlers, keyed by operationId. */
 function createEntityHandlers(useCases) {
@@ -16,20 +16,17 @@ function createEntityHandlers(useCases) {
     } = useCases;
 
     return {
-        async listEntities(req, res, user) {
-            const entities = await listEntitiesForUser.execute(
-                user,
-                parseListFilters(req.query)
-            );
+        async listEntities(_req, res, user) {
+            const entities = await listEntitiesForUser.execute(user);
             res.json({ entities: entities.map(toEntityDto) });
         },
 
-        async listEntityTypes(_req, res, user) {
-            res.json({ types: await listEntityTypes.execute({ user }) });
+        async listEntityTypes(_req, res) {
+            res.json({ types: await listEntityTypes.execute() });
         },
 
-        async getEntityType(req, res, user) {
-            res.json(await getEntityType.execute(req.params.entityType, { user }));
+        async getEntityType(req, res) {
+            res.json(await getEntityType.execute(req.params.entityType));
         },
 
         // Describes a step's requirements without starting an authorization

package/management-api/v2/handlers/integrations.js

@@ -1,5 +1,5 @@
 const { toIntegrationDto } = require('../dto');
-const { objectBody, optionalString, parseListFilters } = require('../request');
+const { objectBody, optionalString } = require('../request');
 
 /**
  * Management API v2 integration handlers, keyed by registry operationId.
@@ -27,11 +27,8 @@ function createIntegrationHandlers(useCases) {
         );
 
     return {
-        async listIntegrations(req, res, user) {
-            const integrations = await getIntegrationsForUser.execute(
-                user,
-                parseListFilters(req.query)
-            );
+        async listIntegrations(_req, res, user) {
+            const integrations = await getIntegrationsForUser.execute(user.getId());
             res.json({ integrations: integrations.map(toIntegrationDto) });
         },
 

package/management-api/v2/request.js

@@ -1,5 +1,4 @@
 const Boom = require('@hapi/boom');
-const { LIST_OWNERS } = require('../../modules/scope-visibility');
 
 /** The JSON body as an object, or a 400 VALIDATION_ERROR. */
 function objectBody(req) {
@@ -52,34 +51,4 @@ function optionalString(value, name) {
     return value;
 }
 
-const LIST_SCOPES = ['individual', 'organization'];
-
-/**
- * `?scope=individual|organization` and `?owner=me|org` on a list (ADR-056
- * §3.4). Anything else is a 400.
- */
-function parseListFilters(query = {}) {
-    const scope = optionalString(query.scope, 'scope');
-    const owner = optionalString(query.owner, 'owner');
-    if (scope !== undefined && !LIST_SCOPES.includes(scope)) {
-        throw Boom.badRequest(`scope must be one of ${LIST_SCOPES.join(', ')}`, {
-            code: 'VALIDATION_ERROR',
-            details: { field: 'scope' },
-        });
-    }
-    if (owner !== undefined && !Object.hasOwn(LIST_OWNERS, owner)) {
-        throw Boom.badRequest('owner must be me or org', {
-            code: 'VALIDATION_ERROR',
-            details: { field: 'owner' },
-        });
-    }
-    return { scope, owner };
-}
-
-module.exports = {
-    objectBody,
-    requireFields,
-    parseStep,
-    optionalString,
-    parseListFilters,
-};
+module.exports = { objectBody, requireFields, parseStep, optionalString };

package/modules/index.js

@@ -8,11 +8,6 @@ const {
     getEntityTypeRegistry,
     EntityRegistryError,
 } = require('./entity-type-registry');
-const {
-    resolveScope,
-    listBindingScopes,
-    OwnershipConfigError,
-} = require('./entity-scope');
 
 module.exports = {
     ApiKeyRequester,
@@ -23,7 +18,4 @@ module.exports = {
     ModuleFactory,
     getEntityTypeRegistry,
     EntityRegistryError,
-    resolveScope,
-    listBindingScopes,
-    OwnershipConfigError,
 };

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

@@ -3,7 +3,6 @@ const {
     toObjectId,
     fromObjectId,
     findMany,
-    findManyDrained,
     findOne,
     insertOne,
     updateOne,
@@ -77,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;
@@ -139,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,
@@ -164,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);
@@ -279,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 }
             });
 
@@ -362,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');
     }
 

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

@@ -1,5 +1,4 @@
 const { prisma } = require('../../database/prisma');
-const { organizationWhere } = require('../../database/organization-where');
 const { ModuleRepositoryInterface } = require('./module-repository-interface');
 
 /**
@@ -77,26 +76,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         return credentialMap;
     }
 
-    /**
-     * The one place a stored entity row becomes the entity the application sees.
-     * The provider's `data` is spread FIRST and every column is pinned after it:
-     * a stored `id`, `userId` or `organizationId` in `data` must not decide who
-     * owns the entity or who sees it.
-     * @private
-     */
-    _mapEntity(row, credential) {
-        return {
-            ...(row.data || {}),
-            id: row.id,
-            credential,
-            userId: row.userId,
-            name: row.name,
-            externalId: row.externalId,
-            moduleName: row.moduleName,
-            organizationId: row.organizationId ?? null,
-        };
-    }
-
     /**
      * Find entity by ID with credential
      * Replaces: Entity.findById(entityId).populate('credential')
@@ -116,7 +95,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         const credential = await this._fetchCredential(entity.credentialId);
 
-        return this._mapEntity(entity, credential);
+        return {
+            id: entity.id,
+            credential,
+            userId: entity.userId,
+            name: entity.name,
+            externalId: entity.externalId,
+            moduleName: entity.moduleName,
+            ...(entity.data || {}),
+        };
     }
 
     /**
@@ -134,7 +121,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         const credentialIds = entities.map(e => e.credentialId).filter(Boolean);
         const credentialMap = await this._fetchCredentialsBulk(credentialIds);
 
-        return entities.map((e) => (this._mapEntity(e, credentialMap.get(e.credentialId) || null)));
+        return entities.map((e) => ({
+            id: e.id,
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId,
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -152,7 +147,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         const credentialIds = entities.map(e => e.credentialId).filter(Boolean);
         const credentialMap = await this._fetchCredentialsBulk(credentialIds);
 
-        return entities.map((e) => (this._mapEntity(e, credentialMap.get(e.credentialId) || null)));
+        return entities.map((e) => ({
+            id: e.id,
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId,
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -174,32 +177,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         const credentialIds = entities.map(e => e.credentialId).filter(Boolean);
         const credentialMap = await this._fetchCredentialsBulk(credentialIds);
 
-        return entities.map((e) => (this._mapEntity(e, credentialMap.get(e.credentialId) || null)));
-    }
-
-    /**
-     * Find entities matching any of the owner/organization pairs, in one query.
-     * `organizationId: null` matches rows with no organization. The caller
-     * (a use case) decides which pairs; this only runs them.
-     *
-     * @param {Array<{userId: string, organizationId: (string|null)}>} clauses
-     * @returns {Promise<Array>} Array of entity objects with string IDs
-     */
-    async findEntitiesByOwnership(clauses) {
-        if (!Array.isArray(clauses) || clauses.length === 0) return [];
-        const entities = await this.prisma.entity.findMany({
-            where: {
-                OR: clauses.map(({ userId, organizationId }) => ({
-                    userId,
-                    ...organizationWhere(organizationId),
-                })),
-            },
-        });
-
-        const credentialIds = entities.map(e => e.credentialId).filter(Boolean);
-        const credentialMap = await this._fetchCredentialsBulk(credentialIds);
-
-        return entities.map((e) => (this._mapEntity(e, credentialMap.get(e.credentialId) || null)));
+        return entities.map((e) => ({
+            id: e.id,
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId,
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -237,7 +223,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         const credential = await this._fetchCredential(entity.credentialId);
 
-        return this._mapEntity(entity, credential);
+        return {
+            id: entity.id,
+            credential,
+            userId: entity.userId,
+            name: entity.name,
+            externalId: entity.externalId,
+            moduleName: entity.moduleName,
+            ...(entity.data || {}),
+        };
     }
 
     /**
@@ -257,7 +251,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             .filter(Boolean);
         const credentialMap = await this._fetchCredentialsBulk(credentialIds);
 
-        return entities.map((e) => (this._mapEntity(e, credentialMap.get(e.credentialId) || null)));
+        return entities.map((e) => ({
+            id: e.id,
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId,
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -265,13 +267,9 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
      * Replaces: Entity.create(entityData)
      *
      * @param {Object} entityData - Entity data
-     * @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.
      * @returns {Promise<Object>} Created entity object with string IDs
      */
-    async createEntity(entityData, tenancy = {}) {
+    async createEntity(entityData) {
         const {
             user,
             userId,
@@ -289,7 +287,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
             name,
             moduleName,
             externalId,
-            organizationId: tenancy.organizationId ?? null,
             data: dynamicData,
         };
 
@@ -299,7 +296,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
         const credentialObj = await this._fetchCredential(entity.credentialId);
 
-        return this._mapEntity(entity, credentialObj);
+        return {
+            id: entity.id,
+            credential: credentialObj,
+            userId: entity.userId,
+            name: entity.name,
+            externalId: entity.externalId,
+            moduleName: entity.moduleName,
+            ...(entity.data || {}),
+        };
     }
 
     /**
@@ -353,7 +358,15 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
 
             const credentialObj = await this._fetchCredential(entity.credentialId);
 
-            return this._mapEntity(entity, credentialObj);
+            return {
+                id: entity.id,
+                credential: credentialObj,
+                userId: entity.userId,
+                name: entity.name,
+                externalId: entity.externalId,
+                moduleName: entity.moduleName,
+                ...(entity.data || {}),
+            };
         } catch (error) {
             if (error.code === 'P2025') {
                 return null;
@@ -416,11 +429,6 @@ class ModuleRepositoryMongo extends ModuleRepositoryInterface {
         if (filter.moduleName) where.moduleName = filter.moduleName;
         if (filter.externalId) where.externalId = this._toString(filter.externalId);
 
-        // `null` means "no organization"; absent means "any".
-        if (filter.organizationId !== undefined) {
-            Object.assign(where, organizationWhere(filter.organizationId));
-        }
-
         return where;
     }
 }