@friggframework/core 2.0.0--canary.690.08cd07e.0 → 2.0.0--canary.693.d8859c2.0

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

@@ -1,6 +1,5 @@
 const { prisma } = require('../../database/prisma');
 const { ModuleRepositoryInterface } = require('./module-repository-interface');
-const { entityNotFoundError } = require('./entity-not-found');
 
 /**
  * PostgreSQL Module Repository Adapter
@@ -109,26 +108,6 @@ class ModuleRepositoryPostgres 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.toString(),
-            credential,
-            userId: row.userId?.toString(),
-            name: row.name,
-            externalId: row.externalId,
-            moduleName: row.moduleName,
-            organizationId: row.organizationId?.toString() ?? null,
-        };
-    }
-
     /**
      * Find entity by ID with credential
      * Replaces: Entity.findById(entityId).populate('credential')
@@ -145,12 +124,20 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
         });
 
         if (!entity) {
-            throw entityNotFoundError(entityId);
+            throw new Error(`Entity ${entityId} not found`);
         }
 
         const credential = await this._fetchCredential(entity.credentialId);
 
-        return this._mapEntity(entity, credential);
+        return {
+            id: entity.id.toString(),
+            credential,
+            userId: entity.userId?.toString(),
+            name: entity.name,
+            externalId: entity.externalId,
+            moduleName: entity.moduleName,
+            ...(entity.data || {}),
+        };
     }
 
     /**
@@ -170,7 +157,15 @@ class ModuleRepositoryPostgres 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.toString(),
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId?.toString(),
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -190,7 +185,15 @@ class ModuleRepositoryPostgres 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.toString(),
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId?.toString(),
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -214,32 +217,15 @@ class ModuleRepositoryPostgres 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: this._convertId(userId),
-                    organizationId: this._convertId(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.toString(),
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId?.toString(),
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -278,7 +264,15 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         const credential = await this._fetchCredential(entity.credentialId);
 
-        return this._mapEntity(entity, credential);
+        return {
+            id: entity.id.toString(),
+            credential,
+            userId: entity.userId?.toString(),
+            name: entity.name,
+            externalId: entity.externalId,
+            moduleName: entity.moduleName,
+            ...(entity.data || {}),
+        };
     }
 
     /**
@@ -298,7 +292,15 @@ class ModuleRepositoryPostgres 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.toString(),
+            credential: credentialMap.get(e.credentialId) || null,
+            userId: e.userId?.toString(),
+            name: e.name,
+            externalId: e.externalId,
+            moduleName: e.moduleName,
+            ...(e.data || {}),
+        }));
     }
 
     /**
@@ -306,13 +308,9 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
      * Replaces: Entity.create(entityData)
      *
      * @param {Object} entityData - Entity data (with string IDs from application layer)
-     * @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,
@@ -330,7 +328,6 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
             name,
             moduleName,
             externalId,
-            organizationId: this._convertId(tenancy.organizationId ?? null),
             data: dynamicData,
         };
 
@@ -340,7 +337,15 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
         const credentialObj = await this._fetchCredential(entity.credentialId);
 
-        return this._mapEntity(entity, credentialObj);
+        return {
+            id: entity.id.toString(),
+            credential: credentialObj,
+            userId: entity.userId?.toString(),
+            name: entity.name,
+            externalId: entity.externalId,
+            moduleName: entity.moduleName,
+            ...(entity.data || {}),
+        };
     }
 
     /**
@@ -396,7 +401,15 @@ class ModuleRepositoryPostgres extends ModuleRepositoryInterface {
 
             const credentialObj = await this._fetchCredential(entity.credentialId);
 
-            return this._mapEntity(entity, credentialObj);
+            return {
+                id: entity.id.toString(),
+                credential: credentialObj,
+                userId: entity.userId?.toString(),
+                name: entity.name,
+                externalId: entity.externalId,
+                moduleName: entity.moduleName,
+                ...(entity.data || {}),
+            };
         } catch (error) {
             if (error.code === 'P2025') {
                 return null;
@@ -461,11 +474,6 @@ class ModuleRepositoryPostgres 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) {
-            where.organizationId = this._convertId(filter.organizationId);
-        }
-
         return where;
     }
 }

package/modules/repositories/module-repository.js

@@ -1,6 +1,5 @@
 const { prisma } = require('../../database/prisma');
 const { ModuleRepositoryInterface } = require('./module-repository-interface');
-const { entityNotFoundError } = require('./entity-not-found');
 
 /**
  * Prisma-based Module Repository
@@ -38,7 +37,7 @@ class ModuleRepository extends ModuleRepositoryInterface {
         });
 
         if (!entity) {
-            throw entityNotFoundError(entityId);
+            throw new Error(`Entity ${entityId} not found`);
         }
 
         return {

package/modules/requester/requester.js

@@ -8,7 +8,6 @@ const { getLogger } = require('../../logs');
 const { redactUrl } = require('../../logs/redact');
 const { toSanitizedSurrogate } = require('../../logs/serialize');
 const { getLoggerScope } = require('../../logs/context');
-const { proxyRequest } = require('./proxy-request');
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
 
@@ -219,14 +218,9 @@ class Requester extends Delegate {
         if (options.query) {
             let queryBuild = '?';
             for (const key in options.query) {
-                const value = options.query[key];
-                // `fields[]: ['a', 'b']` -> `fields%5B%5D=a&fields%5B%5D=b`.
-                // Any other array keeps String(value), i.e. comma-joined.
-                const values =
-                    Array.isArray(value) && key.endsWith('[]') ? value : [value];
-                for (const v of values) {
-                    queryBuild += `${encodeURIComponent(key)}=${encodeURIComponent(v)}&`;
-                }
+                queryBuild += `${encodeURIComponent(key)}=${encodeURIComponent(
+                    options.query[key]
+                )}&`;
             }
             encodedUrl += queryBuild.slice(0, -1);
         }
@@ -243,9 +237,7 @@ class Requester extends Delegate {
         // recursion (with its own backoff sleeps) always gets a clean
         // signal. Timer is cleared in the finally block regardless of
         // outcome.
-        // options.timeoutMs lets one call use a tighter budget (the
-        // Management API proxy passes what is left of its deadline).
-        const timeoutMs = options.timeoutMs ?? this.requestTimeoutMs;
+        const timeoutMs = this.requestTimeoutMs;
         const controller = timeoutMs > 0 ? new AbortController() : null;
         const timeoutHandle = controller
             ? setTimeout(() => controller.abort(), timeoutMs)
@@ -283,11 +275,7 @@ class Requester extends Delegate {
                 // stall at batch scale.
                 const isTimeout =
                     e?.name === 'AbortError' || e?.type === 'aborted';
-                if (
-                    e?.code === 'ECONNRESET' &&
-                    !options.noRetry &&
-                    attempt < this.backOff.length
-                ) {
+                if (e?.code === 'ECONNRESET' && attempt < this.backOff.length) {
                     clearRequestTimer();
                     const delay = this.backOff[attempt] * 1000;
                     await new Promise((resolve) => setTimeout(resolve, delay));
@@ -313,7 +301,6 @@ class Requester extends Delegate {
             // If the status is retriable and there are back off requests left, retry the request
             if (
                 (status === 429 || status >= 500) &&
-                !options.noRetry &&
                 attempt < this.backOff.length
             ) {
                 clearRequestTimer();
@@ -399,12 +386,6 @@ class Requester extends Delegate {
             // If the error wasn't retried, throw. FetchError.create reads
             // the response body (response.text()) — timer must still be
             // alive to catch a stalled body stream.
-            // The proxy relays upstream errors to its caller instead of
-            // throwing; 401 keeps the refresh / invalidate handling above.
-            if (status >= 400 && options.returnErrorResponses) {
-                return response;
-            }
-
             if (status >= 400) {
                 this._logRequestFailed(encodedUrl, options, status);
                 const fetchError = await FetchError.create({
@@ -547,17 +528,6 @@ class Requester extends Delegate {
         return res;
     }
 
-    /**
-     * Generic, path-checked request for the Management API entity proxy
-     * (ADR-052 §8). The URL is always the module base URL plus a validated
-     * path; see ./proxy-request.js. Module methods are not involved.
-     *
-     * @param {Object} params - see proxyRequest()
-     */
-    async _proxyRequest(params) {
-        return proxyRequest(this, params);
-    }
-
     async _delete(options) {
         const fetchOptions = {
             method: 'DELETE',

package/modules/use-cases/get-entities-for-user.js

@@ -1,11 +1,8 @@
 const { Module } = require('../module');
 const { mapModuleClassToModuleDTO } = require('../utils/map-module-dto');
-const { describeRecord, visibilityClauses } = require('../scope-visibility');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class GetEntitiesForUser {
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
 
         this.definitionMap = new Map();
@@ -14,31 +11,21 @@ class GetEntitiesForUser {
         }
     }
 
-    /**
-     * The entities a `User` may see in the active organization (ADR-056 §3.6).
-     * @param {Object} user - authenticated User
-     */
-    async execute(user) {
-        const ctx = this.scopePolicy.accessContext(user);
-        const found = await this.moduleRepository.findEntitiesByOwnership(
-            visibilityClauses(ctx, 'entity')
-        );
-        const entities = (found || []).filter((entity) =>
-            describeRecord(entity, ctx, 'entity')
+    async execute(userId) {
+        const entities = await this.moduleRepository.findEntitiesByUserId(
+            userId
         );
 
-        return Promise.all(
-            entities.map(async (entity) => {
-                const definition = this.definitionMap.get(entity.moduleName);
+        return entities.map((entity) => {
+            const definition = this.definitionMap.get(entity.moduleName);
 
-                const moduleInstance = await Module.create({
-                    userId: entity.userId,
-                    definition: definition,
-                    entity: entity,
-                });
-                return mapModuleClassToModuleDTO(moduleInstance);
-            })
-        );
+            const moduleInstance = new Module({
+                userId,
+                definition: definition,
+                entity: entity,
+            });
+            return mapModuleClassToModuleDTO(moduleInstance);
+        });
     }
 }
 

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

@@ -1,5 +1,4 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class GetEntityOptionsById {
     /**
@@ -7,11 +6,9 @@ class GetEntityOptionsById {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
      * @param {} params.moduleDefinitions
      */
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
-        // Who may load an entity follows its scope (ADR-056 §3.6).
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -38,7 +35,7 @@ class GetEntityOptionsById {
 
         // Validate entity ownership
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
+            ? userIdOrUser.ownsUserId(entity.userId)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -60,11 +57,8 @@ class GetEntityOptionsById {
             );
         }
 
-        // Built for the entity's OWNER, not the caller: a caller may use an
-        // organization's entity, and a token refresh during this call must
-        // update the owner's credential, not create one under the caller.
-        const module = await Module.create({
-            userId: entity.userId ?? userId,
+        const module = new Module({
+            userId,
             entity,
             definition: moduleDefinition,
         });

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

@@ -21,7 +21,7 @@ class GetEntityOptionsByType {
         if (!moduleDefinition) {
             throw new Error(`Module definition not found for type: ${type}`);
         }
-        const moduleInstance = await Module.create({
+        const moduleInstance = new Module({
             userId,
             definition: moduleDefinition,
         });

package/modules/use-cases/get-module-instance-from-type.js

@@ -23,7 +23,7 @@ class GetModuleInstanceFromType {
         if (!moduleDefinition) {
             throw new Error(`Module definition not found for type: ${type}`);
         }
-        return Module.create({
+        return new Module({
             userId,
             definition: moduleDefinition,
             state: options.state,

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

@@ -1,12 +1,9 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class GetModule {
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
-        // Who may load an entity follows its scope (ADR-056 §3.6).
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -35,7 +32,7 @@ class GetModule {
         // If User object provided, use ownsUserId to check linked users
         // Otherwise fall back to simple equality check
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
+            ? userIdOrUser.ownsUserId(entity.userId)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -56,11 +53,8 @@ class GetModule {
             );
         }
 
-        // Built for the entity's OWNER, not the caller: a caller may use an
-        // organization's entity, and a token refresh during this call must
-        // update the owner's credential, not create one under the caller.
-        const module = await Module.create({
-            userId: entity.userId ?? userId,
+        const module = new Module({
+            userId,
             entity,
             definition: moduleDefinition,
         });

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

@@ -1,16 +1,5 @@
 const { Module } = require('../module');
 const { ModuleConstants } = require('../ModuleConstants');
-const { pickExistingEntity } = require('../scope-resolution');
-
-/**
- * What an entity belongs to when the caller says nothing: the person's own,
- * outside any organization.
- */
-const DEFAULT_TENANCY = Object.freeze({
-    scope: 'individual',
-    organizationId: null,
-    legacyOrgId: null,
-});
 const { getLogger } = require('../../logs');
 
 const log = getLogger('frigg.modules.authorization_callback');
@@ -41,17 +30,7 @@ class ProcessAuthorizationCallback {
         this.integrationRepository = integrationRepository;
     }
 
-    /**
-     * @param {string} userId - the OWNER of what this creates (ADR-056 §3.2): the
-     *   person for `individual`, the organization's user for `organization`.
-     *   Not necessarily the caller; callers resolve it from the scope.
-     * @param {string} entityType
-     * @param {Object} params - what the module's authorization needs
-     * @param {{scope: string, organizationId: (string|null), legacyOrgId: (string|null)}} [tenancy]
-     *   the entity's scope and organization (§3.6); default: the person's own,
-     *   with no organization
-     */
-    async execute(userId, entityType, params, tenancy = DEFAULT_TENANCY) {
+    async execute(userId, entityType, params) {
         log.debug('Authorization callback started', {
             eventName: `${log.name}.started`,
             userId,
@@ -78,7 +57,10 @@ class ProcessAuthorizationCallback {
                 userId,
                 entityType
             );
-        const existingEntity = pickExistingEntity(existingEntities, tenancy);
+        const existingEntity =
+            existingEntities && existingEntities.length > 0
+                ? existingEntities[0]
+                : null;
 
         if (existingEntity) {
             log.debug('Existing entity found', {
@@ -88,7 +70,7 @@ class ProcessAuthorizationCallback {
             });
         }
 
-        const module = await Module.create({
+        const module = new Module({
             userId,
             entity: existingEntity,
             definition: moduleDefinition,
@@ -174,8 +156,7 @@ class ProcessAuthorizationCallback {
         const persistedEntity = await this.findOrCreateEntity(
             entityDetails,
             entityType,
-            module.credential.id,
-            tenancy
+            module.credential.id
         );
         log.debug('Authorization callback completed', {
             eventName: `${log.name}.completed`,
@@ -252,12 +233,7 @@ class ProcessAuthorizationCallback {
         module.credential = persisted;
     }
 
-    async findOrCreateEntity(
-        entityDetails,
-        moduleName,
-        credentialId,
-        tenancy = DEFAULT_TENANCY
-    ) {
+    async findOrCreateEntity(entityDetails, moduleName, credentialId) {
         const { identifiers, details } = entityDetails;
 
         // Support both 'user' and 'userId' field names from module definitions
@@ -271,16 +247,11 @@ class ProcessAuthorizationCallback {
             );
         }
 
-        // The same provider account in two organizations is two entities
-        // (ADR-056 §3.6), so the match is per organization.
-        const existingEntity = pickExistingEntity(
-            await this.moduleRepository.findEntities({
-                externalId: identifiers.externalId,
-                user: userId,
-                moduleName: moduleName,
-            }),
-            tenancy
-        );
+        const existingEntity = await this.moduleRepository.findEntity({
+            externalId: identifiers.externalId,
+            user: userId,
+            moduleName: moduleName,
+        });
 
         if (existingEntity) {
             // Repoint the entity's credentialId when re-auth produced a
@@ -311,17 +282,12 @@ class ProcessAuthorizationCallback {
             return existingEntity;
         }
 
-        // `organizationId` is not part of the entity data: that carries provider
-        // fields, and one that happens to be called organizationId is theirs.
-        return await this.moduleRepository.createEntity(
-            {
-                ...identifiers,
-                ...details,
-                moduleName: moduleName,
-                credential: credentialId,
-            },
-            { organizationId: tenancy.organizationId ?? null }
-        );
+        return await this.moduleRepository.createEntity({
+            ...identifiers,
+            ...details,
+            moduleName: moduleName,
+            credential: credentialId,
+        });
     }
 }
 

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

@@ -1,5 +1,4 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class RefreshEntityOptions {
     /**
@@ -7,11 +6,9 @@ class RefreshEntityOptions {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
      * @param {} params.moduleDefinitions
      */
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
-        // Who may load an entity follows its scope (ADR-056 §3.6).
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -39,7 +36,7 @@ class RefreshEntityOptions {
 
         // Validate entity ownership
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
+            ? userIdOrUser.ownsUserId(entity.userId)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -61,11 +58,8 @@ class RefreshEntityOptions {
             );
         }
 
-        // Built for the entity's OWNER, not the caller: a caller may use an
-        // organization's entity, and a token refresh during this call must
-        // update the owner's credential, not create one under the caller.
-        const module = await Module.create({
-            userId: entity.userId ?? userId,
+        const module = new Module({
+            userId,
             entity,
             definition: moduleDefinition,
         });