@friggframework/core 2.0.0--canary.707.df80bfd.0 → 2.0.0--canary.680.d670696.0

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-module-for-user.js

@@ -1,14 +1,8 @@
 const Boom = require('@hapi/boom');
-const { describeRecord } = require('../scope-visibility');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
-const { isEntityNotFound } = require('../repositories/entity-not-found');
 
 /**
  * True when `user` may act on records owned by `ownerId`. Uses the User
  * domain object's rule (individual or organisation user model) when present.
- * This is the owner-only rule: it ignores the organization a record belongs
- * to, so it no longer decides access to an entity or an integration
- * (modules/scope-visibility.js does). Credentials still use it.
  * @param {Object} user - authenticated User (or a plain { getId } double)
  * @param {string|number} ownerId
  */
@@ -20,7 +14,7 @@ function userOwns(user, ownerId) {
 
 const defaultCreateModule = (params) => {
     const { Module } = require('../module');
-    return Module.create(params);
+    return new Module(params);
 };
 
 /**
@@ -36,11 +30,8 @@ class GetEntityModuleForUser {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
      * @param {Array<Object>} params.moduleDefinitions
      * @param {Function} [params.createModule] - builds a Module; injectable for tests.
-     * @param {Object} [params.scopePolicy] - from createScopePolicy; with none the
-     *   app configures nothing (ADR-056 §3.1).
      */
-    constructor({ moduleRepository, moduleDefinitions, createModule, scopePolicy }) {
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
+    constructor({ moduleRepository, moduleDefinitions, createModule }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions || [];
         this.createModule = createModule || defaultCreateModule;
@@ -62,7 +53,7 @@ class GetEntityModuleForUser {
                 { code: 'ENTITY_TYPE_NOT_FOUND' }
             );
         }
-        const module = await this.createModule({
+        const module = this.createModule({
             userId: entity.userId,
             entity,
             definition,
@@ -70,44 +61,26 @@ class GetEntityModuleForUser {
         return { entity, definition, module };
     }
 
-    /**
-     * The entity record, or a 404 when it is missing or the caller may not use
-     * it: not theirs, or paired with another organization (ADR-056 §3.6). A
-     * `global` entity is never the tenant's to load.
-     */
+    /** The entity record, or a 404 when it is missing or not the caller's. */
     async loadOwnedEntity(entityId, user) {
         let entity = null;
         try {
             entity = await this.moduleRepository.findEntityById(entityId);
         } catch (error) {
-            // Every adapter throws for a missing row, and a malformed id (e.g.
-            // not an integer on Postgres) is "not found" too. Both must be the
-            // 404 another tenant's entity gets, or the status says which ids
-            // exist. Anything else is a real failure.
-            if (
-                isEntityNotFound(error) ||
-                /Invalid ID|ObjectId|Malformed/i.test(error?.message || '')
-            ) {
+            // A malformed id (e.g. not an integer on Postgres) is "not found".
+            if (/Invalid ID|ObjectId|Malformed/i.test(error?.message || '')) {
                 entity = null;
             } else {
                 throw error;
             }
         }
-        if (!entity || !this.describe(entity, user)) {
+        if (!entity || !userOwns(user, entity.userId)) {
             throw Boom.notFound(`Entity ${entityId} not found`, {
                 code: 'ENTITY_NOT_FOUND',
             });
         }
         return entity;
     }
-
-    /**
-     * `{ scope, owner, organizationId, access }` of an entity to this caller,
-     * or null when they may not see it (§3.4).
-     */
-    describe(entity, user) {
-        return describeRecord(entity, this.scopePolicy.accessContext(user), 'entity');
-    }
 }
 
 module.exports = { GetEntityModuleForUser, userOwns };

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/multi-step-authorization.js

@@ -3,14 +3,12 @@ const { FetchError } = require('../../errors/fetch-error');
 const { getLogger } = require('../../logs');
 const { AuthorizationSession } = require('../domain/authorization-session');
 const { findDefinition, getAuthStepCount } = require('./entity-types');
-const { describeRecord } = require('../scope-visibility');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 const log = getLogger('frigg.api.authorize');
 
 const defaultCreateModule = (params) => {
     const { Module } = require('../module');
-    return Module.create(params);
+    return new Module(params);
 };
 
 const isMultiStep = (definition) =>
@@ -146,30 +144,21 @@ class SubmitAuthorizationStep {
         moduleDefinitions,
         getAuthorizationRequirements,
         authorizationSessionRepository,
-        authorizeEntityForUser,
+        processAuthorizationCallback,
         moduleRepository,
         credentialRepository,
         createModule,
-        scopePolicy,
     }) {
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
         this.moduleDefinitions = moduleDefinitions || [];
         this.getAuthorizationRequirements = getAuthorizationRequirements;
         this.sessions = authorizationSessionRepository;
-        this.authorizeEntityForUser = authorizeEntityForUser;
+        this.processAuthorizationCallback = processAuthorizationCallback;
         this.moduleRepository = moduleRepository;
         this.credentialRepository = credentialRepository;
         this.createModule = createModule || defaultCreateModule;
     }
 
-    /**
-     * @param {Object} params
-     * @param {string} [params.scope] - the scope the caller asks for, from the
-     *   deciding level's allow list (ADR-056 §3.1). Never `global`.
-     * @param {string} [params.fixedScope] - re-authorization keeps the scope the
-     *   credential already has, whatever the config says now.
-     */
-    async execute({ user, entityType, data, step = 1, sessionId, credentialId = null, scope, fixedScope }) {
+    async execute({ user, entityType, data, step = 1, sessionId, credentialId = null }) {
         if (!data || typeof data !== 'object' || Array.isArray(data)) {
             throw Boom.badRequest('data must be an object', {
                 code: 'VALIDATION_ERROR',
@@ -177,16 +166,7 @@ class SubmitAuthorizationStep {
             });
         }
         const definition = findDefinition(this.moduleDefinitions, entityType);
-        // `userId` binds a session to the caller and is what GET /authorize
-        // computes too. The owner of the entity this creates is decided by
-        // scope (§3.2), not by user.primary, and is `ownership.ownerId`.
         const userId = user.getId();
-        const ownership = this.authorizeEntityForUser.resolveOwnership({
-            user,
-            entityType,
-            scope,
-            fixedScope,
-        });
 
         if (!isMultiStep(definition)) {
             if (step !== 1) {
@@ -194,7 +174,7 @@ class SubmitAuthorizationStep {
                     code: 'INVALID_STEP',
                 });
             }
-            return this.complete({ ownership, user, entityType, params: data, credentialId });
+            return this.complete({ userId, entityType, params: data, credentialId });
         }
 
         const totalSteps = getAuthStepCount(definition);
@@ -225,7 +205,7 @@ class SubmitAuthorizationStep {
             );
         }
 
-        const module = await this.createModule({ userId: ownership.ownerId, definition });
+        const module = this.createModule({ userId, definition });
         let result;
         try {
             result = await definition.processAuthorizationStep(
@@ -244,8 +224,7 @@ class SubmitAuthorizationStep {
             session.markComplete();
             await this.sessions.update(session);
             const outcome = await this.complete({
-                ownership,
-                user,
+                userId,
                 entityType,
                 params: result.authData || {},
                 credentialId,
@@ -282,15 +261,14 @@ class SubmitAuthorizationStep {
         };
     }
 
-    async complete({ ownership, user, entityType, params, credentialId }) {
+    async complete({ userId, entityType, params, credentialId }) {
         let callback;
         try {
-            ({ result: callback } = await this.authorizeEntityForUser.execute({
-                user,
+            callback = await this.processAuthorizationCallback.execute(
+                userId,
                 entityType,
-                data: params,
-                ownership,
-            }));
+                params
+            );
         } catch (error) {
             throw toAuthorizationError(error);
         }
@@ -298,18 +276,13 @@ class SubmitAuthorizationStep {
             this.moduleRepository.findEntityById(callback.entity_id),
             this.credentialRepository.findCredentialById(callback.credential_id),
         ]);
-        // What the new entity is to this caller (§3.4), so a client need not list again.
-        const tenancy = entity
-            ? describeRecord(entity, this.scopePolicy.accessContext(user), 'entity')
-            : null;
         const outcome = {
             status: 'complete',
-            entity: entity && tenancy ? { ...entity, tenancy } : entity,
+            entity,
             credential: credential && {
                 ...credential,
                 type: entityType,
                 entityIds: entity ? [String(entity.id)] : [],
-                ...(tenancy && { tenancy }),
             },
         };
         if (credentialId && String(callback.credential_id) !== String(credentialId)) {

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,
         });

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

@@ -1,5 +1,4 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class TestModuleAuth {
     /**
@@ -7,11 +6,9 @@ class TestModuleAuth {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository - Repository for module data operations.
      * @param {Array<Object>} params.moduleDefinitions - Array of module definitions.
      */
-    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 TestModuleAuth {
 
         // 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 TestModuleAuth {
             );
         }
 
-        // 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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.707.df80bfd.0",
+    "version": "2.0.0--canary.680.d670696.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -28,7 +28,6 @@
         "express-async-handler": "^1.2.0",
         "form-data": "^4.0.6",
         "fs-extra": "^11.2.0",
-        "jose": "^5.10.0",
         "lodash": "4.18.1",
         "lodash.get": "^4.4.2",
         "node-fetch": "^2.6.7",
@@ -48,9 +47,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.707.df80bfd.0",
-        "@friggframework/prettier-config": "2.0.0--canary.707.df80bfd.0",
-        "@friggframework/test": "2.0.0--canary.707.df80bfd.0",
+        "@friggframework/eslint-config": "2.0.0--canary.680.d670696.0",
+        "@friggframework/prettier-config": "2.0.0--canary.680.d670696.0",
+        "@friggframework/test": "2.0.0--canary.680.d670696.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -90,5 +89,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "df80bfd35bba914a7b20184bd2d5aa88f9f406ff"
+    "gitHead": "d6706963c56674519299fca904c380268b721911"
 }