@friggframework/core 2.0.0--canary.663.8de669c.0 → 2.0.0--canary.686.821f8a3.0

package/infrastructure/scheduler/scheduler-service-factory.js

@@ -7,16 +7,22 @@
  * Environment Detection:
  * - SCHEDULER_PROVIDER=eventbridge -> Use AWS EventBridge Scheduler
  * - SCHEDULER_PROVIDER=mock -> Use in-memory mock scheduler
+ * - SCHEDULER_PROVIDER=netlify -> Netlify poll-and-dispatch scheduler
+ *   (friggframework/frigg#545; needs `repository`, usually `queueProvider`)
+ * - Default on Netlify (NETLIFY=true, set by the Netlify runtime and build;
+ *   provider-netlify's generated functions also set SCHEDULER_PROVIDER) -> Netlify
  * - Default in dev/test/local stages -> Mock scheduler
  * - Default in other stages -> EventBridge scheduler
+ * - Any other name -> require('@friggframework/provider-<name>').SchedulerAdapter
+ *
+ * Adapters are required inside their branch so building one never loads
+ * another's SDK (@aws-sdk/client-scheduler is not a core dependency).
  */
 
-const { EventBridgeSchedulerAdapter } = require('./eventbridge-scheduler-adapter');
-const { MockSchedulerAdapter } = require('./mock-scheduler-adapter');
-
 const SCHEDULER_PROVIDERS = {
     EVENTBRIDGE: 'eventbridge',
     MOCK: 'mock',
+    NETLIFY: 'netlify',
 };
 
 const LOCAL_STAGES = ['dev', 'test', 'local'];
@@ -32,6 +38,12 @@ function determineProvider() {
         return explicitProvider;
     }
 
+    // Checked before the stage: a Netlify site with no STAGE (or STAGE=dev)
+    // must still persist schedules where scheduled-sync reads them.
+    if (process.env.NETLIFY === 'true') {
+        return SCHEDULER_PROVIDERS.NETLIFY;
+    }
+
     const stage = process.env.STAGE || 'dev';
     if (LOCAL_STAGES.includes(stage)) {
         return SCHEDULER_PROVIDERS.MOCK;
@@ -40,6 +52,13 @@ function determineProvider() {
     return SCHEDULER_PROVIDERS.EVENTBRIDGE;
 }
 
+function createDefaultScheduledJobRepository() {
+    const { ScheduledJobRepository } = require('./scheduled-job-repository');
+    // The prisma export is a lazy proxy: nothing connects until a query runs.
+    const { prisma } = require('../../database/prisma');
+    return new ScheduledJobRepository({ prismaClient: prisma });
+}
+
 /**
  * Create a scheduler service instance
  *
@@ -47,22 +66,51 @@ function determineProvider() {
  * @param {string} options.provider - Scheduler provider ('eventbridge' or 'mock')
  * @param {string} options.region - AWS region (for EventBridge)
  * @param {boolean} options.verbose - Verbose logging (for Mock)
+ * @param {Object} [options.repository] - Schedule repository (for Netlify: persists schedules)
+ * @param {Object} [options.queueProvider] - Queue provider (for Netlify: dispatches due jobs)
  * @returns {SchedulerServiceInterface} Implementation of scheduler interface
  */
 function createSchedulerService(options = {}) {
     const provider = options.provider || determineProvider();
 
     switch (provider) {
-        case SCHEDULER_PROVIDERS.EVENTBRIDGE:
+        case SCHEDULER_PROVIDERS.EVENTBRIDGE: {
+            const { EventBridgeSchedulerAdapter } = require('./eventbridge-scheduler-adapter');
             return new EventBridgeSchedulerAdapter({
                 region: options.region,
             });
-        case SCHEDULER_PROVIDERS.MOCK:
+        }
+        case SCHEDULER_PROVIDERS.MOCK: {
+            const { MockSchedulerAdapter } = require('./mock-scheduler-adapter');
             return new MockSchedulerAdapter({
                 verbose: options.verbose,
             });
-        default:
-            throw new Error(`Unknown scheduler provider: ${provider}`);
+        }
+        case SCHEDULER_PROVIDERS.NETLIFY: {
+            const { NetlifySchedulerAdapter } = require('./netlify-scheduler-adapter');
+            return new NetlifySchedulerAdapter({
+                // Default: the Prisma ScheduledJob rows that the Netlify
+                // scheduled-sync function polls. Without it the adapter
+                // falls back to memory, and a schedule made in one function
+                // is never seen by the cron.
+                repository: options.repository || createDefaultScheduledJobRepository(),
+                queueProvider: options.queueProvider,
+            });
+        }
+        default: {
+            let plugin;
+            try {
+                plugin = require('../../providers/resolve-provider').resolveProvider(null, {
+                    provider,
+                });
+            } catch (error) {
+                throw new Error(`Unknown scheduler provider: ${provider} (${error.message})`);
+            }
+            if (!plugin.SchedulerAdapter) {
+                throw new Error(`Unknown scheduler provider: ${provider}`);
+            }
+            return new plugin.SchedulerAdapter(options);
+        }
     }
 }
 

package/integrations/index.js

@@ -21,6 +21,7 @@ module.exports = {
     Options,
     createIntegrationRouter,
     checkRequiredParams,
+    // Deprecated (ADR-059): a wrapper over getEntityTypeRegistry.
     getModulesDefinitionFromIntegrationClasses,
     LoadIntegrationContextUseCase,
     validateExtensionBinding,

package/integrations/integration-router.js

@@ -31,9 +31,6 @@ const {
     GetIntegrationInstance,
 } = require('./use-cases/get-integration-instance');
 const { UpdateIntegration } = require('./use-cases/update-integration');
-const {
-    getModulesDefinitionFromIntegrationClasses,
-} = require('./utils/map-integration-dto');
 const {
     GetModuleInstanceFromType,
 } = require('../modules/use-cases/get-module-instance-from-type');
@@ -54,47 +51,51 @@ const {
 const {
     createUserRepository,
 } = require('../user/repositories/user-repository-factory');
-const {
-    GetUserFromBearerToken,
-} = require('../user/use-cases/get-user-from-bearer-token');
-const {
-    GetUserFromXFriggHeaders,
-} = require('../user/use-cases/get-user-from-x-frigg-headers');
-const {
-    GetUserFromAdopterJwt,
-} = require('../user/use-cases/get-user-from-adopter-jwt');
 const {
     AuthenticateWithSharedSecret,
 } = require('../user/use-cases/authenticate-with-shared-secret');
 const { AuthenticateUser } = require('../user/use-cases/authenticate-user');
+const {
+    buildUserAuthentication,
+} = require('../user/create-user-authentication');
 const {
     ProcessAuthorizationCallback,
 } = require('../modules/use-cases/process-authorization-callback');
+const { createScopePolicy } = require('../modules/scope-policy');
+const {
+    AuthorizeEntityForUser,
+} = require('../modules/use-cases/authorize-entity-for-user');
+const {
+    CreateEntityFromCredential,
+} = require('../modules/use-cases/create-entity-from-credential');
+const {
+    ResolveIntegrationOwnership,
+} = require('./use-cases/resolve-integration-ownership');
+const { GetOwnedIntegrationRecord } = require('./use-cases/integration-operations-for-user');
 
 const log = getLogger('frigg.integrations');
 
 function createIntegrationRouter() {
-    const { integrations: integrationClasses, userConfig } =
-        loadAppDefinition();
+    // moduleDefinitions is the app registry's definitions (ADR-059), so
+    // /api/authorize and friends accept a type no integration binds.
+    const {
+        integrations: integrationClasses,
+        userConfig,
+        moduleDefinitions,
+        ownership,
+        entityTypeRegistry,
+    } = loadAppDefinition();
+    // Ownership by scope (ADR-056 §3): one object every use case asks.
+    const scopePolicy = createScopePolicy({ ownership, entityTypeRegistry });
     const moduleRepository = createModuleRepository();
     const integrationRepository = createIntegrationRepository();
     const credentialRepository = createCredentialRepository();
     const userRepository = createUserRepository();
-
-    const getUserFromBearerToken = new GetUserFromBearerToken({
-        userRepository,
-        userConfig,
-    });
-
-    const getUserFromXFriggHeaders = new GetUserFromXFriggHeaders({
-        userRepository,
-        userConfig,
-    });
-
-    const getUserFromAdopterJwt = new GetUserFromAdopterJwt({
-        userRepository,
-        userConfig,
-    });
+    const {
+        getUserFromBearerToken,
+        getUserFromXFriggHeaders,
+        getUserFromAdopterJwt,
+    } = buildUserAuthentication({ userConfig, userRepository });
 
     const authenticateWithSharedSecret = new AuthenticateWithSharedSecret();
 
@@ -108,8 +109,7 @@ function createIntegrationRouter() {
 
     const moduleFactory = new ModuleFactory({
         moduleRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
     });
     const deleteIntegrationForUser = new DeleteIntegrationForUser({
         integrationRepository,
@@ -122,6 +122,19 @@ function createIntegrationRouter() {
         integrationClasses,
         moduleFactory,
         moduleRepository,
+        scopePolicy,
+    });
+
+    // Decides who owns a new integration and which entities the caller may bind
+    // (the v1 create used to check neither), and who may reach an existing one.
+    const resolveIntegrationOwnership = new ResolveIntegrationOwnership({
+        moduleRepository,
+        integrationClasses,
+        scopePolicy,
+    });
+    const getOwnedIntegrationRecord = new GetOwnedIntegrationRecord({
+        integrationRepository,
+        scopePolicy,
     });
 
     const getCredentialForUser = new GetCredentialForUser({
@@ -136,8 +149,8 @@ function createIntegrationRouter() {
 
     const getEntitiesForUser = new GetEntitiesForUser({
         moduleRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
+        scopePolicy,
     });
 
     const getIntegrationInstance = new GetIntegrationInstance({
@@ -153,54 +166,65 @@ function createIntegrationRouter() {
     });
 
     const getModuleInstanceFromType = new GetModuleInstanceFromType({
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
     });
 
     const getEntityOptionsByType = new GetEntityOptionsByType({
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
     });
 
     const testModuleAuth = new TestModuleAuth({
         moduleRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
+        scopePolicy,
     });
 
     const getModule = new GetModule({
         moduleRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
+        scopePolicy,
     });
 
     const getEntityOptionsById = new GetEntityOptionsById({
         moduleRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
+        scopePolicy,
     });
 
     const refreshEntityOptions = new RefreshEntityOptions({
         moduleRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
+        scopePolicy,
     });
 
     const getPossibleIntegrations = new GetPossibleIntegrations({
         integrationClasses,
     });
 
+    // The owner of what an authorization creates follows its scope (ADR-056 §3.2).
     const processAuthorizationCallback = new ProcessAuthorizationCallback({
         moduleRepository,
         credentialRepository,
         integrationRepository,
-        moduleDefinitions:
-            getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions,
+    });
+    const authorizeEntityForUser = new AuthorizeEntityForUser({
+        scopePolicy,
+        processAuthorizationCallback,
+    });
+    // v1 POST /api/entity: same owner resolution as /api/authorize.
+    const createEntityFromCredential = new CreateEntityFromCredential({
+        authorizeEntityForUser,
+        processAuthorizationCallback,
+        credentialRepository,
+        moduleDefinitions,
     });
 
     const router = express();
 
     setIntegrationRoutes(router, authenticateUser, {
+        resolveIntegrationOwnership,
+        getOwnedIntegrationRecord,
         createIntegration,
         deleteIntegrationForUser,
         getIntegrationsForUser,
@@ -217,7 +241,8 @@ function createIntegrationRouter() {
         getModule,
         getEntityOptionsById,
         refreshEntityOptions,
-        processAuthorizationCallback,
+        authorizeEntityForUser,
+        createEntityFromCredential,
     });
     return router;
 }
@@ -254,6 +279,8 @@ function checkRequiredParams(params, requiredKeys) {
  */
 function setIntegrationRoutes(router, authenticateUser, useCases) {
     const {
+        resolveIntegrationOwnership,
+        getOwnedIntegrationRecord,
         createIntegration,
         deleteIntegrationForUser,
         getIntegrationsForUser,
@@ -262,15 +289,22 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
         updateIntegration,
         getPossibleIntegrations,
     } = useCases;
+
+    // The owner of an integration the caller may reach (404 otherwise), which is
+    // what the id-and-owner use cases below expect. `manage: true` is for
+    // changing or deleting: an organization's integration needs an admin (403).
+    const ownerOf = async (integrationId, user, options) =>
+        (await getOwnedIntegrationRecord.execute(integrationId, user, options))
+            .userId;
+
     router.route('/api/integrations').get(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
-            const integrations = await getIntegrationsForUser.execute(userId);
+            const integrations = await getIntegrationsForUser.execute(user);
             const results = {
                 entities: {
                     options: await getPossibleIntegrations.execute(),
-                    authorized: await getEntitiesForUser.execute(userId),
+                    authorized: await getEntitiesForUser.execute(user),
                 },
                 integrations: integrations,
             };
@@ -282,7 +316,6 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
     router.route('/api/integrations').post(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.body, [
                 'entities',
                 'config',
@@ -290,10 +323,17 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
 
             get(params.config, 'type');
 
+            const { ownerId, organizationId, adoptUnscoped } =
+                await resolveIntegrationOwnership.execute({
+                    entityIds: params.entities,
+                    config: params.config,
+                    user,
+                });
             const integration = await createIntegration.execute(
                 params.entities,
-                userId,
-                params.config
+                ownerId,
+                params.config,
+                { organizationId, adoptUnscoped }
             );
 
             res.status(201).json(integration);
@@ -303,12 +343,11 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
     router.route('/api/integrations/:integrationId').patch(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.body, ['config']);
 
             const integration = await updateIntegration.execute(
                 req.params.integrationId,
-                userId,
+                await ownerOf(req.params.integrationId, user, { manage: true }),
                 params.config
             );
             res.json(integration);
@@ -321,7 +360,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
             const params = checkRequiredParams(req.params, ['integrationId']);
             await deleteIntegrationForUser.execute(
                 params.integrationId,
-                user.getId()
+                await ownerOf(params.integrationId, user, { manage: true })
             );
             res.status(204).json({});
         })
@@ -333,7 +372,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
             const params = checkRequiredParams(req.params, ['integrationId']);
             const integration = await getIntegrationInstance.execute(
                 params.integrationId,
-                user.getId()
+                await ownerOf(params.integrationId, user)
             );
             res.json(await integration.send('GET_CONFIG_OPTIONS'));
         })
@@ -349,7 +388,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
                 ]);
                 const integration = await getIntegrationInstance.execute(
                     params.integrationId,
-                    user.getId()
+                    await ownerOf(params.integrationId, user)
                 );
 
                 res.json(
@@ -363,7 +402,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
             const params = checkRequiredParams(req.params, ['integrationId']);
             const integration = await getIntegrationInstance.execute(
                 params.integrationId,
-                user.getId()
+                await ownerOf(params.integrationId, user)
             );
             res.json(await integration.send('GET_USER_ACTIONS', req.body));
         })
@@ -380,7 +419,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
                 ]);
                 const integration = await getIntegrationInstance.execute(
                     params.integrationId,
-                    user.getId()
+                    await ownerOf(params.integrationId, user)
                 );
 
                 res.json(
@@ -405,7 +444,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
                 ]);
                 const integration = await getIntegrationInstance.execute(
                     params.integrationId,
-                    user.getId()
+                    await ownerOf(params.integrationId, user)
                 );
 
                 res.json(
@@ -426,7 +465,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
             ]);
             const integration = await getIntegrationInstance.execute(
                 params.integrationId,
-                user.getId()
+                await ownerOf(params.integrationId, user)
             );
             res.json(await integration.send(params.actionId, req.body));
         })
@@ -443,7 +482,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
             const params = checkRequiredParams(req.params, ['integrationId']);
             const integration = await getIntegrationInstance.execute(
                 params.integrationId,
-                user.getId()
+                await ownerOf(params.integrationId, user)
             );
 
             // We could perhaps augment router with dynamic options? Haven't decided yet, but here may be the place
@@ -463,7 +502,7 @@ function setIntegrationRoutes(router, authenticateUser, useCases) {
             const params = checkRequiredParams(req.params, ['integrationId']);
             const instance = await getIntegrationInstance.execute(
                 params.integrationId,
-                user.getId()
+                await ownerOf(params.integrationId, user)
             );
 
             if (!instance) {
@@ -501,16 +540,21 @@ function setEntityRoutes(router, authenticateUser, useCases) {
         getModule,
         getEntityOptionsById,
         refreshEntityOptions,
-        processAuthorizationCallback,
+        authorizeEntityForUser,
+        createEntityFromCredential,
     } = useCases;
 
     router.route('/api/authorize').get(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.query, ['entityType']);
+            // The owner POST stores under, so GET and POST describe one connection.
+            const { ownerId } = authorizeEntityForUser.resolveOwnership({
+                user,
+                entityType: params.entityType,
+            });
             const module = await getModuleInstanceFromType.execute(
-                userId,
+                ownerId,
                 params.entityType,
                 { state: req.query.state }
             );
@@ -529,11 +573,15 @@ function setEntityRoutes(router, authenticateUser, useCases) {
     router.route('/api/authorize').post(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.body, [
                 'entityType',
                 'data',
             ]);
+            const ownership = authorizeEntityForUser.resolveOwnership({
+                user,
+                entityType: params.entityType,
+            });
+            const userId = ownership.ownerId;
 
             const dataKeys =
                 params.data && typeof params.data === 'object'
@@ -545,11 +593,13 @@ function setEntityRoutes(router, authenticateUser, useCases) {
                 dataKeys,
             });
 
-            const entityDetails = await processAuthorizationCallback.execute(
-                userId,
-                params.entityType,
-                params.data
-            );
+            const { result: entityDetails } =
+                await authorizeEntityForUser.execute({
+                    user,
+                    entityType: params.entityType,
+                    data: params.data,
+                    ownership,
+                });
 
             log.info('Entity authorized', {
                 eventName: 'frigg.integrations.authorized',
@@ -566,35 +616,20 @@ function setEntityRoutes(router, authenticateUser, useCases) {
     router.route('/api/entity').post(
         catchAsyncError(async (req, res) => {
             const user = await authenticateUser.execute(req);
-            const userId = user.getId();
             const params = checkRequiredParams(req.body, [
                 'entityType',
                 'data',
             ]);
             checkRequiredParams(req.body.data, ['credential_id']);
 
-            // May want to pass along the user ID as well so credential ID's can't be fished???
-            const credential = await getCredentialForUser.execute(
-                params.data.credential_id,
-                userId
+            // The owner follows the entity type's scope, as /api/authorize.
+            res.json(
+                await createEntityFromCredential.execute({
+                    user,
+                    entityType: params.entityType,
+                    credentialId: params.data.credential_id,
+                })
             );
-
-            if (!credential) {
-                throw Boom.badRequest('Invalid credential ID');
-            }
-
-            const module = await getModuleInstanceFromType.execute(
-                userId,
-                params.entityType
-            );
-            const entityDetails = await module.getEntityDetails(
-                module.api,
-                null,
-                null,
-                userId
-            );
-
-            res.json(await module.findOrCreateEntity(entityDetails));
         })
     );
 

package/integrations/repositories/integration-not-found.js

@@ -0,0 +1,14 @@
+/**
+ * The error `findIntegrationById` throws for an id with no row, and the one
+ * predicate that recognises it. The adapters build the error here and the
+ * use cases match it here, so the message is written once and a missing
+ * integration can be told from any other failure without widening a regex.
+ */
+const MESSAGE = /^Integration with id .+ not found$/;
+
+const integrationNotFoundError = (id) =>
+    new Error(`Integration with id ${id} not found`);
+
+const isIntegrationNotFound = (error) => MESSAGE.test(error?.message || '');
+
+module.exports = { integrationNotFoundError, isIntegrationNotFound };

package/integrations/repositories/integration-repository-documentdb.js

@@ -14,6 +14,7 @@ const {
     IntegrationRepositoryInterface,
 } = require('./integration-repository-interface');
 const { validateConfigPatch } = require('./config-patch-shared');
+const { integrationNotFoundError } = require('./integration-not-found');
 
 class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
     constructor() {
@@ -28,6 +29,28 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         return records.map((doc) => this._mapIntegration(doc));
     }
 
+    /**
+     * Find integrations 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 findIntegrationsByOwnership(clauses) {
+        if (!Array.isArray(clauses) || clauses.length === 0) return [];
+        // Drained: a list can hold more than the first cursor batch (~101).
+        const records = await findManyDrained(this.prisma, 'Integration', {
+            $or: clauses.map(({ userId, organizationId }) => ({
+                userId: toObjectId(userId),
+                organizationId:
+                    organizationId === null ? null : toObjectId(organizationId),
+            })),
+        });
+        return records.map((doc) => this._mapIntegration(doc));
+    }
+
     async findIntegrations({ type, status } = {}) {
         const filter = {};
         if (type) {
@@ -68,11 +91,11 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
     async findIntegrationById(id) {
         const objectId = toObjectId(id);
         if (!objectId) {
-            throw new Error(`Integration with id ${id} not found`);
+            throw integrationNotFoundError(id);
         }
         const doc = await findOne(this.prisma, 'Integration', { _id: objectId });
         if (!doc) {
-            throw new Error(`Integration with id ${id} not found`);
+            throw integrationNotFoundError(id);
         }
         return this._mapIntegration(doc);
     }
@@ -132,10 +155,18 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         return true;
     }
 
-    async createIntegration(entities, userId, config) {
+    /**
+     * @param {Array<string>} entities - entity ids
+     * @param {string} userId - owner (the person, or the organization's user)
+     * @param {Object} config - Integration configuration
+     * @param {{organizationId?: (string|null)}} [tenancy] - the organization the
+     *   integration is created in (ADR-056 §3.6)
+     */
+    async createIntegration(entities, userId, config, tenancy = {}) {
         const now = new Date();
         const document = {
             userId: toObjectId(userId) || null,
+            organizationId: toObjectId(tenancy.organizationId) || null,
             config,
             version: '0.0.0',
             status: 'IN_CREATION',
@@ -298,6 +329,7 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
             id: fromObjectId(doc?._id),
             entitiesIds: (doc?.entityIds || []).map((value) => fromObjectId(value)),
             userId: fromObjectId(doc?.userId),
+            organizationId: fromObjectId(doc?.organizationId) ?? null,
             config: doc?.config ?? null,
             version: doc?.version ?? null,
             status: doc?.status ?? null,