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

package/management-api/openapi/v2-operations.js

@@ -34,11 +34,6 @@ const stepQuery = [
     query('step', 'Step number, 1-based (default 1)', { type: 'integer', minimum: 1 }),
     query('sessionId', 'Session from step 1; required for later steps'),
 ];
-// ADR-056 §3.4: the same two filters on every list that mixes ownership.
-const listFilters = [
-    query('scope', 'Only records of this scope', { type: 'string', enum: ['individual', 'organization'] }),
-    query('owner', 'Only the caller\'s own (`me`) or the active organization\'s (`org`)', { type: 'string', enum: ['me', 'org'] }),
-];
 const anyJson = { description: 'Defined by the integration or module' };
 
 const V2_OPERATIONS = {
@@ -46,8 +41,7 @@ const V2_OPERATIONS = {
     listIntegrations: {
         summary: "List the caller's integrations",
         description:
-            'Returns only `{ integrations }`: the caller\'s and the active organization\'s, created in that organization (ADR-056 §3.6). Each carries `scope`, `owner`, `organizationId` and `access`. Integration types are at /api/v2/integrations/options and connected accounts at /api/v2/entities.',
-        parameters: listFilters,
+            'Returns only `{ integrations }`. Integration types are at /api/v2/integrations/options and connected accounts at /api/v2/entities.',
         responses: { 200: ok('Integrations', ref('ListIntegrationsResponse')), ...errors('Unauthorized') },
     },
     listIntegrationOptions: {
@@ -114,9 +108,6 @@ const V2_OPERATIONS = {
     // Entities
     listEntities: {
         summary: "List the caller's connected entities",
-        description:
-            "The active organization's entities and the caller's individual ones (ADR-056 §3.6): an individual entity belongs to the organization it was connected in, unless `ownership.individualAcross` is `all`. Each carries `scope`, `owner`, `organizationId` and `access`.",
-        parameters: listFilters,
         responses: { 200: ok('Entities', ref('ListEntitiesResponse')), ...errors('Unauthorized') },
     },
     listEntityTypes: {
@@ -165,14 +156,14 @@ const V2_OPERATIONS = {
     proxyEntityRequest: {
         summary: "Call the entity's API through Frigg (beta)",
         description:
-            "ADR-052. Off unless the app sets managementApi.proxy.enable. Path-only input relative to the module's base URL; `base` optionally names one of the module's several base URLs (default `default`; a name, never a URL), and allow-list rules match per base. Deny by default, only operations in the module's (or the app's) allow-list. ADR-056 §3.5: the caller needs use access to the entity in the active organization (an entity they cannot see there is 404), and the entity's scope must be in managementApi.proxy.scopes (default individual only; 403 PROXY_NOT_ALLOWED with details.reason 'scope', or 'access' for view-only access). The HTTP status follows the upstream status; upstream 5xx is 502 UPSTREAM_ERROR, 429 keeps Retry-After.",
+            "ADR-052. Off unless the app sets managementApi.proxy.enable. Path-only input relative to the module's base URL; deny by default, only operations in the module's (or the app's) allow-list. The HTTP status follows the upstream status; upstream 5xx is 502 UPSTREAM_ERROR, 429 keeps Retry-After.",
         requestBody: body(ref('ProxyRequest')),
         responses: {
             200: ok('Upstream answer (the status mirrors the upstream status)', ref('ProxyResponse')),
-            400: ok('INVALID_PROXY_REQUEST, or PROXY_UNKNOWN_BASE (`base` is not one of the module\'s base names; the message lists them)', ref('ProxyError')),
+            400: ok('INVALID_PROXY_REQUEST', ref('ProxyError')),
             401: ok('INVALID_CREDENTIALS or unauthenticated', ref('ProxyError')),
-            403: ok("PROXY_NOT_ALLOWED: not in the allow-list, or details.reason 'scope' / 'access'", ref('ProxyError')),
-            404: ok('Entity not found, or not visible in the active organization', ref('Error')),
+            403: ok('PROXY_NOT_ALLOWED', ref('ProxyError')),
+            404: ok('Entity not found', ref('Error')),
             413: ok('PAYLOAD_TOO_LARGE', ref('ProxyError')),
             415: ok('UNSUPPORTED_MEDIA_TYPE', ref('ProxyError')),
             429: ok('RATE_LIMITED (Retry-After passed through)', ref('ProxyError')),
@@ -184,9 +175,6 @@ const V2_OPERATIONS = {
     // Credentials
     listCredentials: {
         summary: "List the caller's credentials (masked)",
-        description:
-            'A credential is listed through the entities that use it that the caller may see, so each organization lists only its own connections; one no entity uses is listed to its owner. Each carries `scope`, `owner`, `organizationId` and `access`, taken from who owns the credential.',
-        parameters: listFilters,
         responses: { 200: ok('Credentials', ref('ListCredentialsResponse')), ...errors('Unauthorized') },
     },
     getCredential: {

package/management-api/route-registry.js

@@ -50,16 +50,8 @@ const RESERVED_V2_SEGMENTS = Object.freeze(['reports']);
 const V1_MIGRATION_DOCS_URL =
     'https://docs.friggframework.org/api/migrate-v1-v2';
 
-/**
- * Functions (devtools names) that serve registered routes. `queueWorker` is
- * the HTTP queue worker of hosts that deliver queue messages over HTTP
- * (provider-netlify's worker-background); AWS delivers through SQS.
- */
-const FUNCTIONS = Object.freeze({
-    AUTH: 'auth',
-    HEALTH: 'health',
-    QUEUE_WORKER: 'queueWorker',
-});
+/** Lambda functions (devtools names) that serve Management API routes. */
+const FUNCTIONS = Object.freeze({ AUTH: 'auth', HEALTH: 'health' });
 
 const route = (version, fn) => (definition) =>
     Object.freeze({ version, function: fn, ...definition });
@@ -188,91 +180,6 @@ const AUTH_EXTRA_ROUTES = Object.freeze(
     ].map(route(null, FUNCTIONS.AUTH))
 );
 
-/**
- * Unversioned routes the DB-free health Lambda serves next to /api/meta.
- * GET /api/docs redirects to the current OpenAPI document; the docs
- * themselves live under /api/meta (ADR-053).
- */
-const DOCS_ROUTES = Object.freeze(
-    [
-        {
-            operationId: 'redirectToOpenApi',
-            method: 'GET',
-            path: '/api/docs',
-        },
-    ].map(route(null, FUNCTIONS.HEALTH))
-);
-
-/**
- * Admin routes live under /admin (as core's /admin/db-migrate and the
- * admin-scripts /admin/scripts do), never under the public /api prefix. A
- * core extension (appDefinition.coreExtensions[].routes.path) mounts its admin
- * API at /admin/<name>, served by the auth function behind the admin API key;
- * these segments belong to other functions and cannot be taken.
- */
-const ADMIN_ROUTE_PREFIX = '/admin/';
-const RESERVED_ADMIN_SEGMENTS = Object.freeze(['scripts', 'db-migrate', 'queue']);
-
-/**
- * The queue delivery endpoint of hosts that deliver queue messages over HTTP
- * (QStash posts here on Netlify). Every message must be signed: the worker
- * verifies it before parsing anything. Not part of the public /api surface.
- */
-const HTTP_QUEUE_ROUTES = Object.freeze(
-    [
-        {
-            operationId: 'deliverQueueMessage',
-            method: 'POST',
-            path: '/admin/queue',
-        },
-    ].map(route(null, FUNCTIONS.QUEUE_WORKER))
-);
-
-/**
- * Why a core extension route path is not acceptable, or null when it is:
- * `/admin/<segment>` (letters, digits, `-` and `_`, one or more segments), not
- * a reserved segment.
- *
- * @param {*} path
- * @returns {string|null}
- */
-function coreExtensionRoutePathError(path) {
-    if (typeof path !== 'string' || !path.startsWith(ADMIN_ROUTE_PREFIX)) {
-        return `must start with ${ADMIN_ROUTE_PREFIX} (admin routes are not served under /api)`;
-    }
-    if (!/^\/admin(\/[A-Za-z0-9_-]+)+$/.test(path)) {
-        return 'must be /admin/<segment>[/<segment>...] using letters, digits, - and _';
-    }
-    const segment = path.split('/')[2];
-    if (RESERVED_ADMIN_SEGMENTS.includes(segment)) {
-        return `/admin/${segment} is reserved (${RESERVED_ADMIN_SEGMENTS.map((s) => `/admin/${s}`).join(', ')})`;
-    }
-    return null;
-}
-
-/**
- * Route records for the core extensions' admin routes: each path and
- * everything under it, on the auth function (core's auth router mounts the
- * extension routes behind the admin API key).
- *
- * @param {Array<Object>} [coreExtensions] - appDefinition.coreExtensions (plain data;
- *   only `routes.path` is read)
- * @returns {Array<Object>}
- */
-function listCoreExtensionRoutes(coreExtensions = []) {
-    if (!Array.isArray(coreExtensions)) return [];
-    const out = [];
-    for (const ext of coreExtensions) {
-        const path = ext?.routes?.path;
-        if (typeof path !== 'string' || coreExtensionRoutePathError(path)) continue;
-        out.push(
-            Object.freeze({ version: null, function: FUNCTIONS.AUTH, method: 'ANY', path, extension: ext.name }),
-            Object.freeze({ version: null, function: FUNCTIONS.AUTH, method: 'ANY', path: `${path}/{proxy+}`, extension: ext.name })
-        );
-    }
-    return out;
-}
-
 /**
  * The v2 routes an app serves. Routes tied to an opt-in capability (the entity
  * proxy, ADR-052) are left out unless the app enables it.
@@ -299,7 +206,6 @@ function listRoutes({ v1 = true, proxy = false } = {}) {
         ...listV2Routes({ proxy }),
         ...META_ROUTES,
         ...AUTH_EXTRA_ROUTES,
-        ...DOCS_ROUTES,
     ];
 }
 
@@ -319,25 +225,18 @@ function resourceRoot(record) {
 }
 
 /**
- * Gateway routes derived from the registry: the Management API, its
- * discovery and docs routes, the core extensions' admin routes and, for
- * hosts that deliver queue messages over HTTP, the queue endpoint. Each
- * Management API resource root gets an exact route when the root itself is
+ * API Gateway HTTP API routes for the Management API, derived from the
+ * registry. Each resource root gets an exact route when the root itself is
  * registered and a greedy `{proxy+}` route when deeper paths are. The auth
  * function uses `ANY` (as it always has, so CORS preflights reach Express);
  * the health function only serves GET.
  *
- * devtools turns these into API Gateway HTTP API events; provider-netlify
- * into netlify.toml redirects.
- *
  * @param {Object} [options]
  * @param {boolean} [options.v1=true]
  * @param {boolean} [options.proxy=false]
- * @param {Array<Object>} [options.coreExtensions=[]] - appDefinition.coreExtensions
- * @param {boolean} [options.httpQueue=false] - include the HTTP queue route
  * @returns {Array<{function: string, method: string, path: string}>}
  */
-function getGatewayRoutes({ v1 = true, proxy = false, coreExtensions = [], httpQueue = false } = {}) {
+function getGatewayRoutes({ v1 = true, proxy = false } = {}) {
     const out = [];
     const seen = new Set();
     const add = (fn, method, path) => {
@@ -366,7 +265,7 @@ function getGatewayRoutes({ v1 = true, proxy = false, coreExtensions = [], httpQ
 
     // Extra routes get an exact route unless a greedy route on the same
     // function already covers them.
-    for (const record of [...AUTH_EXTRA_ROUTES, ...DOCS_ROUTES]) {
+    for (const record of AUTH_EXTRA_ROUTES) {
         const covered = greedyRoots.has(
             `${record.function} ${resourceRoot(record)}`
         );
@@ -375,16 +274,6 @@ function getGatewayRoutes({ v1 = true, proxy = false, coreExtensions = [], httpQ
         }
     }
 
-    for (const record of listCoreExtensionRoutes(coreExtensions)) {
-        add(record.function, record.method, record.path);
-    }
-
-    if (httpQueue) {
-        for (const record of HTTP_QUEUE_ROUTES) {
-            add(record.function, record.method, record.path);
-        }
-    }
-
     return out;
 }
 
@@ -398,12 +287,6 @@ module.exports = {
     V2_ROUTES,
     META_ROUTES,
     AUTH_EXTRA_ROUTES,
-    DOCS_ROUTES,
-    HTTP_QUEUE_ROUTES,
-    ADMIN_ROUTE_PREFIX,
-    RESERVED_ADMIN_SEGMENTS,
-    coreExtensionRoutePathError,
-    listCoreExtensionRoutes,
     listRoutes,
     listV2Routes,
     getGatewayRoutes,

package/management-api/v2/dependencies.js

@@ -29,18 +29,13 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
         getEntityTypeRegistry,
         getEntityTypeDefinitions,
     } = require('../../modules/entity-type-registry');
-    const { createScopePolicy } = require('../../modules/scope-policy');
-    const {
-        AuthorizeEntityForUser,
-    } = require('../../modules/use-cases/authorize-entity-for-user');
-    const {
-        ResolveIntegrationOwnership,
-    } = require('../../integrations/use-cases/resolve-integration-ownership');
+    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 { CreateIntegration } = require('../../integrations/use-cases/create-integration');
     const { UpdateIntegration } = require('../../integrations/use-cases/update-integration');
     const {
@@ -92,11 +87,6 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
         appDefinition.entityTypeRegistry ??
         getEntityTypeRegistry(appDefinition);
     const moduleDefinitions = getEntityTypeDefinitions(registry);
-    // Ownership by scope (ADR-056 §3): one object every use case asks.
-    const scopePolicy = createScopePolicy({
-        ownership: appDefinition.ownership,
-        entityTypeRegistry: registry,
-    });
 
     const moduleRepository = createModuleRepository();
     const integrationRepository = createIntegrationRepository();
@@ -105,7 +95,9 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
     const authorizationSessionRepository = createAuthorizationSessionRepository();
 
     const authenticateUser = new AuthenticateUser({
-        ...buildUserAuthentication({ userConfig, userRepository }),
+        getUserFromBearerToken: new GetUserFromBearerToken({ userRepository, userConfig }),
+        getUserFromXFriggHeaders: new GetUserFromXFriggHeaders({ userRepository, userConfig }),
+        getUserFromAdopterJwt: new GetUserFromAdopterJwt({ userRepository, userConfig }),
         authenticateWithSharedSecret: new AuthenticateWithSharedSecret(),
         userConfig,
     });
@@ -119,12 +111,10 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
     const getEntityModuleForUser = new GetEntityModuleForUser({
         moduleRepository,
         moduleDefinitions,
-        scopePolicy,
     });
     const getCredentialForUser = new credentialOps.GetCredentialForUserV2({
         credentialRepository,
         moduleRepository,
-        scopePolicy,
     });
     const getAuthorizationRequirements = new GetAuthorizationRequirements({
         moduleDefinitions,
@@ -138,22 +128,17 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
         moduleDefinitions,
         getAuthorizationRequirements,
         authorizationSessionRepository,
-        authorizeEntityForUser: new AuthorizeEntityForUser({
-            scopePolicy,
-            processAuthorizationCallback: new ProcessAuthorizationCallback({
-                moduleRepository,
-                credentialRepository,
-                integrationRepository,
-                moduleDefinitions,
-            }),
+        processAuthorizationCallback: new ProcessAuthorizationCallback({
+            moduleRepository,
+            credentialRepository,
+            integrationRepository,
+            moduleDefinitions,
         }),
         moduleRepository,
         credentialRepository,
-        scopePolicy,
     });
     const getOwnedIntegrationRecord = new integrationOps.GetOwnedIntegrationRecord({
         integrationRepository,
-        scopePolicy,
     });
     const getIntegrationInstanceForUser = new integrationOps.GetIntegrationInstanceForUser({
         getOwnedIntegrationRecord,
@@ -163,7 +148,6 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
     return {
         config,
         moduleDefinitions,
-        scopePolicy,
         repositories: {
             moduleRepository,
             integrationRepository,
@@ -179,7 +163,6 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
             integrationClasses,
             moduleFactory,
             moduleRepository,
-            scopePolicy,
         }),
         getPossibleIntegrations: new GetPossibleIntegrations({ integrationClasses }),
         createIntegrationForUser: new integrationOps.CreateIntegrationForUser({
@@ -188,11 +171,7 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
                 integrationClasses,
                 moduleFactory,
             }),
-            resolveIntegrationOwnership: new ResolveIntegrationOwnership({
-                moduleRepository,
-                integrationClasses,
-                scopePolicy,
-            }),
+            getEntityModuleForUser,
             integrationClasses,
         }),
         getIntegrationInstanceForUser,
@@ -224,10 +203,7 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
 
         // Entities
         getEntityModuleForUser,
-        listEntitiesForUser: new entityOps.ListEntitiesForUser({
-            moduleRepository,
-            scopePolicy,
-        }),
+        listEntitiesForUser: new entityOps.ListEntitiesForUser({ moduleRepository }),
         getEntityForUser: new entityOps.GetEntityForUser({ getEntityModuleForUser }),
         deleteEntityForUser: new entityOps.DeleteEntityForUser({
             getEntityModuleForUser,
@@ -239,15 +215,14 @@ function buildV2Dependencies({ appDefinition, config, entityTypeRegistry }) {
         refreshEntityOptionsForUser: new entityOps.RefreshEntityOptionsForUser({
             getEntityModuleForUser,
         }),
-        listEntityTypes: new ListEntityTypes({ entityTypeRegistry: registry, scopePolicy }),
-        getEntityType: new GetEntityType({ entityTypeRegistry: registry, scopePolicy }),
+        listEntityTypes: new ListEntityTypes({ entityTypeRegistry: registry }),
+        getEntityType: new GetEntityType({ entityTypeRegistry: registry }),
         getAuthorizationRequirements,
 
         // Credentials
         listCredentialsForUser: new credentialOps.ListCredentialsForUser({
             credentialRepository,
             moduleRepository,
-            scopePolicy,
         }),
         getCredentialForUser,
         deleteCredentialForUser: new credentialOps.DeleteCredentialForUser({

package/management-api/v2/dto.js

@@ -13,20 +13,6 @@ const idOf = (value) => {
     return String(value);
 };
 
-/**
- * `{ scope, owner, organizationId, access }` (ADR-056 §3.4): whose a record is
- * and what the caller may do with it. Empty when the use case did not say.
- */
-function tenancyFields(tenancy) {
-    if (!tenancy) return {};
-    return {
-        scope: tenancy.scope,
-        owner: tenancy.owner,
-        organizationId: tenancy.organizationId ?? null,
-        access: tenancy.access,
-    };
-}
-
 /** An entity (connected account). */
 function toEntityDto(entity) {
     const credential =
@@ -44,7 +30,6 @@ function toEntityDto(entity) {
             typeof credential?.authIsValid === 'boolean'
                 ? credential.authIsValid
                 : null,
-        ...tenancyFields(entity.tenancy),
     };
 }
 
@@ -57,7 +42,6 @@ function toIntegrationDto(integration) {
         config: integration.config ?? {},
         version: integration.version ?? null,
         messages: integration.messages ?? {},
-        ...tenancyFields(integration.tenancy),
     };
 }
 
@@ -75,8 +59,6 @@ const CREDENTIAL_METADATA = new Set([
     'type',
     'entityIds',
     'status',
-    // Added by the credential use cases (ADR-056 §3.4); never provider data.
-    'tenancy',
 ]);
 
 /**
@@ -128,13 +110,11 @@ function maskCredential(credential) {
         entityCount: entityIds.length,
         createdAt: toIso(credential.createdAt),
         updatedAt: toIso(credential.updatedAt),
-        ...tenancyFields(credential.tenancy),
         data,
     };
 }
 
 module.exports = {
-    tenancyFields,
     toEntityDto,
     toIntegrationDto,
     maskCredential,

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

@@ -63,7 +63,6 @@ function createAuthorizationHandlers(useCases) {
                 data: body.data,
                 step,
                 sessionId,
-                scope: optionalString(body.scope, 'scope'),
             });
             res.json(toAuthorizationResponse(result));
         },

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/module-factory.js

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