@friggframework/core 2.0.0--canary.686.df38e8e.0 → 2.0.0--canary.710.9045bbc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +0 -16
- package/CLAUDE.md +41 -29
- package/README.md +0 -105
- package/application/commands/README.md +17 -11
- package/application/commands/entity-commands.js +18 -60
- package/application/commands/integration-commands.js +73 -20
- package/application/commands/scheduler-commands.js +7 -11
- package/application/commands/user-commands.js +5 -17
- package/application/index.js +2 -6
- package/core/Worker.js +7 -31
- package/core/create-handler.js +0 -9
- package/credential/repositories/credential-repository-documentdb.js +0 -34
- package/credential/repositories/credential-repository-interface.js +0 -15
- package/credential/repositories/credential-repository-mongo.js +0 -23
- package/credential/repositories/credential-repository-postgres.js +0 -28
- package/database/config.js +24 -48
- package/database/documentdb-encryption-service.js +22 -9
- package/database/documentdb-utils.js +0 -2
- package/database/encryption/README.md +17 -81
- package/database/encryption/documentdb-encryption-service.md +1 -78
- package/database/encryption/encryption-schema-registry.js +46 -123
- package/database/encryption/field-encryption-service.js +5 -69
- package/database/encryption/integration-mapping-encryption.js +1 -1
- package/database/prisma.js +38 -15
- package/database/use-cases/check-encryption-health-use-case.js +52 -43
- package/errors/index.js +4 -0
- package/errors/mapping-already-exists-error.js +14 -0
- package/generated/prisma-mongodb/edge.js +4 -43
- package/generated/prisma-mongodb/index-browser.js +1 -40
- package/generated/prisma-mongodb/index.d.ts +111 -4739
- package/generated/prisma-mongodb/index.js +4 -43
- package/generated/prisma-mongodb/package.json +1 -1
- package/generated/prisma-mongodb/schema.prisma +0 -92
- package/generated/prisma-mongodb/wasm.js +4 -43
- package/generated/prisma-postgresql/edge.js +4 -43
- package/generated/prisma-postgresql/index-browser.js +1 -40
- package/generated/prisma-postgresql/index.d.ts +33 -4966
- package/generated/prisma-postgresql/index.js +4 -43
- package/generated/prisma-postgresql/package.json +1 -1
- package/generated/prisma-postgresql/schema.prisma +0 -87
- package/generated/prisma-postgresql/wasm.js +4 -43
- package/handlers/WEBHOOKS.md +29 -0
- package/handlers/app-definition-loader.js +19 -121
- package/handlers/app-handler-helpers.js +3 -25
- package/handlers/backend-utils.js +25 -31
- package/handlers/middleware/admin-auth.js +1 -14
- package/handlers/routers/auth.js +10 -46
- package/handlers/routers/health.js +4 -13
- package/handlers/routers/integration-defined-routers.js +92 -144
- package/handlers/routers/integration-webhook-routers.js +64 -102
- package/handlers/workers/integration-defined-workers.js +2 -5
- package/index.js +3 -65
- package/infrastructure/scheduler/eventbridge-scheduler-adapter.js +67 -13
- package/infrastructure/scheduler/index.js +6 -19
- package/infrastructure/scheduler/scheduler-service-factory.js +7 -55
- package/integrations/index.js +0 -1
- package/integrations/integration-base.js +29 -0
- package/integrations/integration-router.js +96 -131
- package/integrations/repositories/integration-mapping-repository-documentdb.js +50 -0
- package/integrations/repositories/integration-mapping-repository-interface.js +15 -0
- package/integrations/repositories/integration-mapping-repository-mongo.js +29 -0
- package/integrations/repositories/integration-mapping-repository-postgres.js +30 -0
- package/integrations/repositories/integration-mapping-repository.js +29 -0
- package/integrations/repositories/integration-repository-documentdb.js +35 -35
- package/integrations/repositories/integration-repository-interface.js +31 -17
- package/integrations/repositories/integration-repository-mongo.js +129 -60
- package/integrations/repositories/integration-repository-postgres.js +134 -62
- package/integrations/repositories/process-repository-mongo.js +1 -1
- package/integrations/tests/doubles/test-integration-repository.js +1 -12
- package/integrations/use-cases/add-entities-to-integration.js +92 -0
- package/integrations/use-cases/create-integration.js +75 -72
- package/integrations/use-cases/get-integrations-for-user.js +40 -80
- package/integrations/use-cases/index.js +1 -7
- package/integrations/use-cases/remove-entities-from-integration.js +70 -0
- package/integrations/utils/assert-entity-ids-input.js +42 -0
- package/integrations/utils/map-integration-dto.js +14 -43
- package/jest-setup.js +13 -2
- package/jest-teardown.js +5 -2
- package/jest.config.js +4 -0
- package/jest.db.config.js +23 -0
- package/modules/index.js +0 -14
- package/modules/module-factory.js +0 -12
- package/modules/module.js +2 -53
- package/modules/repositories/module-repository-documentdb.js +6 -51
- package/modules/repositories/module-repository-interface.js +2 -19
- package/modules/repositories/module-repository-mongo.js +74 -67
- package/modules/repositories/module-repository-postgres.js +74 -66
- package/modules/repositories/module-repository.js +1 -2
- package/modules/requester/requester.js +2 -27
- package/modules/use-cases/get-entities-for-user.js +13 -26
- package/modules/use-cases/get-entity-options-by-id.js +4 -10
- package/modules/use-cases/get-entity-options-by-type.js +1 -1
- package/modules/use-cases/get-module-instance-from-type.js +1 -1
- package/modules/use-cases/get-module.js +4 -10
- package/modules/use-cases/process-authorization-callback.js +19 -53
- package/modules/use-cases/refresh-entity-options.js +4 -10
- package/modules/use-cases/test-module-auth.js +4 -10
- package/modules/utils/map-module-dto.js +5 -3
- package/modules/utils/to-credential-id.js +14 -0
- package/package.json +7 -6
- package/prisma-mongodb/schema.prisma +0 -92
- package/prisma-postgresql/schema.prisma +0 -87
- package/queues/index.js +0 -25
- package/queues/queuer-util.js +6 -5
- package/types/index.d.ts +0 -2
- package/user/repositories/user-repository-documentdb.js +2 -27
- package/user/repositories/user-repository-interface.js +0 -18
- package/user/repositories/user-repository-mongo.js +0 -24
- package/user/repositories/user-repository-postgres.js +0 -18
- package/user/tests/doubles/test-user-repository.js +1 -1
- package/user/use-cases/authenticate-user.js +1 -7
- package/user/use-cases/get-user-from-adopter-jwt.js +124 -95
- package/user/use-cases/get-user-from-bearer-token.js +7 -2
- package/user/use-cases/get-user-from-x-frigg-headers.js +80 -83
- package/user/user.js +1 -64
- package/credential/use-cases/credential-operations-for-user.js +0 -202
- package/credential/use-cases/reauthorize-credential-for-user.js +0 -73
- package/database/encryption/encryption-config.js +0 -219
- package/database/encryption/test-support/fake-ciphertext.js +0 -15
- package/database/organization-where.js +0 -18
- package/database/unique-violation.js +0 -25
- package/extensions/bootstrap-runner.js +0 -43
- package/extensions/extension-loader.js +0 -187
- package/extensions/index.js +0 -41
- package/extensions/initialize-app.js +0 -123
- package/extensions/route-mounter.js +0 -103
- package/extensions/schema-composer.js +0 -188
- package/infrastructure/scheduler/netlify-scheduler-adapter.js +0 -220
- package/infrastructure/scheduler/scheduled-job-repository.js +0 -118
- package/integrations/repositories/integration-not-found.js +0 -14
- package/integrations/schedule-config.js +0 -80
- package/integrations/use-cases/dispatch-ongoing-syncs.js +0 -100
- package/integrations/use-cases/integration-operations-for-user.js +0 -256
- package/integrations/use-cases/resolve-integration-ownership.js +0 -177
- package/management-api/create-management-api-router.js +0 -49
- package/management-api/error-response.js +0 -116
- package/management-api/management-api-config.js +0 -151
- package/management-api/meta-router.js +0 -76
- package/management-api/openapi/build-openapi.js +0 -144
- package/management-api/openapi/components.js +0 -408
- package/management-api/openapi/v1-operations.js +0 -83
- package/management-api/openapi/v2-operations.js +0 -264
- package/management-api/route-registry.js +0 -411
- package/management-api/test-support/http-client.js +0 -39
- package/management-api/use-cases/get-management-api-meta.js +0 -57
- package/management-api/v1-deprecation.js +0 -120
- package/management-api/v2/create-v2-router.js +0 -85
- package/management-api/v2/dependencies.js +0 -281
- package/management-api/v2/dto.js +0 -143
- package/management-api/v2/handlers/authorization.js +0 -94
- package/management-api/v2/handlers/credentials.js +0 -33
- package/management-api/v2/handlers/entities.js +0 -77
- package/management-api/v2/handlers/integrations.js +0 -128
- package/management-api/v2/handlers/proxy.js +0 -34
- package/management-api/v2/request.js +0 -85
- package/management-api/v2/test-support/fake-dependencies.js +0 -103
- package/modules/domain/authorization-session.js +0 -144
- package/modules/entity-scope.js +0 -15
- package/modules/entity-type-registry.js +0 -311
- package/modules/proxy/proxy-errors.js +0 -20
- package/modules/proxy/proxy-path.js +0 -179
- package/modules/proxy/proxy-policy.js +0 -248
- package/modules/repositories/authorization-session-repository-documentdb.js +0 -112
- package/modules/repositories/authorization-session-repository-factory.js +0 -31
- package/modules/repositories/authorization-session-repository-interface.js +0 -47
- package/modules/repositories/authorization-session-repository-prisma.js +0 -87
- package/modules/repositories/entity-not-found.js +0 -18
- package/modules/requester/proxy-request.js +0 -244
- package/modules/scope-config.js +0 -192
- package/modules/scope-policy.js +0 -112
- package/modules/scope-resolution.js +0 -288
- package/modules/scope-visibility.js +0 -247
- package/modules/tests/doubles/in-memory-authorization-session-repository.js +0 -45
- package/modules/tests/doubles/ownership-matching.js +0 -18
- package/modules/use-cases/authorize-entity-for-user.js +0 -61
- package/modules/use-cases/create-entity-from-credential.js +0 -113
- package/modules/use-cases/entity-operations-for-user.js +0 -162
- package/modules/use-cases/entity-types.js +0 -139
- package/modules/use-cases/execute-entity-proxy-request.js +0 -286
- package/modules/use-cases/get-authorization-requirements.js +0 -100
- package/modules/use-cases/get-entity-module-for-user.js +0 -113
- package/modules/use-cases/manage-access.js +0 -21
- package/modules/use-cases/multi-step-authorization.js +0 -329
- package/prisma-postgresql/migrations/20261003000000_add_authorization_session/migration.sql +0 -28
- package/prisma-postgresql/migrations/20261015000000_add_organization_membership/migration.sql +0 -26
- package/prisma-postgresql/migrations/20261016000000_add_entity_integration_organization/migration.sql +0 -25
- package/prisma-postgresql/migrations/20261017000000_add_scheduled_job/migration.sql +0 -28
- package/providers/index.js +0 -23
- package/providers/resolve-provider.js +0 -93
- package/providers/runtime-detection.js +0 -124
- package/queues/providers/index.js +0 -11
- package/queues/providers/netlify-background-provider.js +0 -187
- package/queues/providers/qstash-queue-provider.js +0 -219
- package/queues/providers/sqs-queue-provider.js +0 -70
- package/queues/queue-client-interface.js +0 -55
- package/queues/queue-message-auth.js +0 -193
- package/queues/queue-provider-factory.js +0 -101
- package/queues/queue-provider.js +0 -65
- package/queues/sqs-queue-client.js +0 -81
- package/types/modules/index.d.ts +0 -197
- package/types/user/index.d.ts +0 -134
- package/user/adopter-jwt-config.js +0 -177
- package/user/adopter-jwt-errors.js +0 -59
- package/user/adopter-token-verifier.js +0 -122
- package/user/app-user-helpers.js +0 -97
- package/user/create-user-authentication.js +0 -64
- package/user/membership.js +0 -51
- package/user/repositories/organization-membership-record.js +0 -19
- package/user/repositories/organization-membership-repository-documentdb.js +0 -106
- package/user/repositories/organization-membership-repository-factory.js +0 -42
- package/user/repositories/organization-membership-repository-interface.js +0 -57
- package/user/repositories/organization-membership-repository-mongo.js +0 -13
- package/user/repositories/organization-membership-repository-postgres.js +0 -29
- package/user/repositories/organization-membership-repository-prisma.js +0 -81
- package/user/tests/doubles/adopter-jwt-fixtures.js +0 -220
- package/user/use-cases/ensure-organization-membership.js +0 -92
- package/user/use-cases/find-individual-users-by-organization.js +0 -54
|
@@ -8,7 +8,6 @@ const { getLogger } = require('../../logs');
|
|
|
8
8
|
const { redactUrl } = require('../../logs/redact');
|
|
9
9
|
const { toSanitizedSurrogate } = require('../../logs/serialize');
|
|
10
10
|
const { getLoggerScope } = require('../../logs/context');
|
|
11
|
-
const { proxyRequest } = require('./proxy-request');
|
|
12
11
|
|
|
13
12
|
const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
|
|
14
13
|
|
|
@@ -238,9 +237,7 @@ class Requester extends Delegate {
|
|
|
238
237
|
// recursion (with its own backoff sleeps) always gets a clean
|
|
239
238
|
// signal. Timer is cleared in the finally block regardless of
|
|
240
239
|
// outcome.
|
|
241
|
-
|
|
242
|
-
// Management API proxy passes what is left of its deadline).
|
|
243
|
-
const timeoutMs = options.timeoutMs ?? this.requestTimeoutMs;
|
|
240
|
+
const timeoutMs = this.requestTimeoutMs;
|
|
244
241
|
const controller = timeoutMs > 0 ? new AbortController() : null;
|
|
245
242
|
const timeoutHandle = controller
|
|
246
243
|
? setTimeout(() => controller.abort(), timeoutMs)
|
|
@@ -278,11 +275,7 @@ class Requester extends Delegate {
|
|
|
278
275
|
// stall at batch scale.
|
|
279
276
|
const isTimeout =
|
|
280
277
|
e?.name === 'AbortError' || e?.type === 'aborted';
|
|
281
|
-
if (
|
|
282
|
-
e?.code === 'ECONNRESET' &&
|
|
283
|
-
!options.noRetry &&
|
|
284
|
-
attempt < this.backOff.length
|
|
285
|
-
) {
|
|
278
|
+
if (e?.code === 'ECONNRESET' && attempt < this.backOff.length) {
|
|
286
279
|
clearRequestTimer();
|
|
287
280
|
const delay = this.backOff[attempt] * 1000;
|
|
288
281
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
@@ -308,7 +301,6 @@ class Requester extends Delegate {
|
|
|
308
301
|
// If the status is retriable and there are back off requests left, retry the request
|
|
309
302
|
if (
|
|
310
303
|
(status === 429 || status >= 500) &&
|
|
311
|
-
!options.noRetry &&
|
|
312
304
|
attempt < this.backOff.length
|
|
313
305
|
) {
|
|
314
306
|
clearRequestTimer();
|
|
@@ -394,12 +386,6 @@ class Requester extends Delegate {
|
|
|
394
386
|
// If the error wasn't retried, throw. FetchError.create reads
|
|
395
387
|
// the response body (response.text()) — timer must still be
|
|
396
388
|
// alive to catch a stalled body stream.
|
|
397
|
-
// The proxy relays upstream errors to its caller instead of
|
|
398
|
-
// throwing; 401 keeps the refresh / invalidate handling above.
|
|
399
|
-
if (status >= 400 && options.returnErrorResponses) {
|
|
400
|
-
return response;
|
|
401
|
-
}
|
|
402
|
-
|
|
403
389
|
if (status >= 400) {
|
|
404
390
|
this._logRequestFailed(encodedUrl, options, status);
|
|
405
391
|
const fetchError = await FetchError.create({
|
|
@@ -542,17 +528,6 @@ class Requester extends Delegate {
|
|
|
542
528
|
return res;
|
|
543
529
|
}
|
|
544
530
|
|
|
545
|
-
/**
|
|
546
|
-
* Generic, path-checked request for the Management API entity proxy
|
|
547
|
-
* (ADR-052 §8). The URL is always the module base URL plus a validated
|
|
548
|
-
* path; see ./proxy-request.js. Module methods are not involved.
|
|
549
|
-
*
|
|
550
|
-
* @param {Object} params - see proxyRequest()
|
|
551
|
-
*/
|
|
552
|
-
async _proxyRequest(params) {
|
|
553
|
-
return proxyRequest(this, params);
|
|
554
|
-
}
|
|
555
|
-
|
|
556
531
|
async _delete(options) {
|
|
557
532
|
const fetchOptions = {
|
|
558
533
|
method: 'DELETE',
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
const { Module } = require('../module');
|
|
2
2
|
const { mapModuleClassToModuleDTO } = require('../utils/map-module-dto');
|
|
3
|
-
const { describeRecord, visibilityClauses } = require('../scope-visibility');
|
|
4
|
-
const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
|
|
5
3
|
|
|
6
4
|
class GetEntitiesForUser {
|
|
7
|
-
constructor({ moduleRepository, moduleDefinitions
|
|
8
|
-
this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
|
|
5
|
+
constructor({ moduleRepository, moduleDefinitions }) {
|
|
9
6
|
this.moduleRepository = moduleRepository;
|
|
10
7
|
|
|
11
8
|
this.definitionMap = new Map();
|
|
@@ -14,31 +11,21 @@ class GetEntitiesForUser {
|
|
|
14
11
|
}
|
|
15
12
|
}
|
|
16
13
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
*/
|
|
21
|
-
async execute(user) {
|
|
22
|
-
const ctx = this.scopePolicy.accessContext(user);
|
|
23
|
-
const found = await this.moduleRepository.findEntitiesByOwnership(
|
|
24
|
-
visibilityClauses(ctx, 'entity')
|
|
25
|
-
);
|
|
26
|
-
const entities = (found || []).filter((entity) =>
|
|
27
|
-
describeRecord(entity, ctx, 'entity')
|
|
14
|
+
async execute(userId) {
|
|
15
|
+
const entities = await this.moduleRepository.findEntitiesByUserId(
|
|
16
|
+
userId
|
|
28
17
|
);
|
|
29
18
|
|
|
30
|
-
return
|
|
31
|
-
|
|
32
|
-
const definition = this.definitionMap.get(entity.moduleName);
|
|
19
|
+
return entities.map((entity) => {
|
|
20
|
+
const definition = this.definitionMap.get(entity.moduleName);
|
|
33
21
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
);
|
|
22
|
+
const moduleInstance = new Module({
|
|
23
|
+
userId,
|
|
24
|
+
definition: definition,
|
|
25
|
+
entity: entity,
|
|
26
|
+
});
|
|
27
|
+
return mapModuleClassToModuleDTO(moduleInstance);
|
|
28
|
+
});
|
|
42
29
|
}
|
|
43
30
|
}
|
|
44
31
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const { Module } = require('../module');
|
|
2
|
-
const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
|
|
3
2
|
|
|
4
3
|
class GetEntityOptionsById {
|
|
5
4
|
/**
|
|
@@ -7,11 +6,9 @@ class GetEntityOptionsById {
|
|
|
7
6
|
* @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
|
|
8
7
|
* @param {} params.moduleDefinitions
|
|
9
8
|
*/
|
|
10
|
-
constructor({ moduleRepository, moduleDefinitions
|
|
9
|
+
constructor({ moduleRepository, moduleDefinitions }) {
|
|
11
10
|
this.moduleRepository = moduleRepository;
|
|
12
11
|
this.moduleDefinitions = moduleDefinitions;
|
|
13
|
-
// Who may load an entity follows its scope (ADR-056 §3.6).
|
|
14
|
-
this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
|
|
15
12
|
}
|
|
16
13
|
|
|
17
14
|
/**
|
|
@@ -38,7 +35,7 @@ class GetEntityOptionsById {
|
|
|
38
35
|
|
|
39
36
|
// Validate entity ownership
|
|
40
37
|
const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
|
|
41
|
-
?
|
|
38
|
+
? userIdOrUser.ownsUserId(entity.userId)
|
|
42
39
|
: entity.userId?.toString() === userId?.toString();
|
|
43
40
|
|
|
44
41
|
if (!isOwned) {
|
|
@@ -60,11 +57,8 @@ class GetEntityOptionsById {
|
|
|
60
57
|
);
|
|
61
58
|
}
|
|
62
59
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
// update the owner's credential, not create one under the caller.
|
|
66
|
-
const module = await Module.create({
|
|
67
|
-
userId: entity.userId ?? userId,
|
|
60
|
+
const module = new Module({
|
|
61
|
+
userId,
|
|
68
62
|
entity,
|
|
69
63
|
definition: moduleDefinition,
|
|
70
64
|
});
|
|
@@ -21,7 +21,7 @@ class GetEntityOptionsByType {
|
|
|
21
21
|
if (!moduleDefinition) {
|
|
22
22
|
throw new Error(`Module definition not found for type: ${type}`);
|
|
23
23
|
}
|
|
24
|
-
const moduleInstance =
|
|
24
|
+
const moduleInstance = new Module({
|
|
25
25
|
userId,
|
|
26
26
|
definition: moduleDefinition,
|
|
27
27
|
});
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
const { Module } = require('../module');
|
|
2
|
-
const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
|
|
3
2
|
|
|
4
3
|
class GetModule {
|
|
5
|
-
constructor({ moduleRepository, moduleDefinitions
|
|
4
|
+
constructor({ moduleRepository, moduleDefinitions }) {
|
|
6
5
|
this.moduleRepository = moduleRepository;
|
|
7
6
|
this.moduleDefinitions = moduleDefinitions;
|
|
8
|
-
// Who may load an entity follows its scope (ADR-056 §3.6).
|
|
9
|
-
this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
|
|
10
7
|
}
|
|
11
8
|
|
|
12
9
|
/**
|
|
@@ -35,7 +32,7 @@ class GetModule {
|
|
|
35
32
|
// If User object provided, use ownsUserId to check linked users
|
|
36
33
|
// Otherwise fall back to simple equality check
|
|
37
34
|
const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
|
|
38
|
-
?
|
|
35
|
+
? userIdOrUser.ownsUserId(entity.userId)
|
|
39
36
|
: entity.userId?.toString() === userId?.toString();
|
|
40
37
|
|
|
41
38
|
if (!isOwned) {
|
|
@@ -56,11 +53,8 @@ class GetModule {
|
|
|
56
53
|
);
|
|
57
54
|
}
|
|
58
55
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
// update the owner's credential, not create one under the caller.
|
|
62
|
-
const module = await Module.create({
|
|
63
|
-
userId: entity.userId ?? userId,
|
|
56
|
+
const module = new Module({
|
|
57
|
+
userId,
|
|
64
58
|
entity,
|
|
65
59
|
definition: moduleDefinition,
|
|
66
60
|
});
|
|
@@ -1,16 +1,5 @@
|
|
|
1
1
|
const { Module } = require('../module');
|
|
2
2
|
const { ModuleConstants } = require('../ModuleConstants');
|
|
3
|
-
const { pickExistingEntity } = require('../scope-resolution');
|
|
4
|
-
|
|
5
|
-
/**
|
|
6
|
-
* What an entity belongs to when the caller says nothing: the person's own,
|
|
7
|
-
* outside any organization.
|
|
8
|
-
*/
|
|
9
|
-
const DEFAULT_TENANCY = Object.freeze({
|
|
10
|
-
scope: 'individual',
|
|
11
|
-
organizationId: null,
|
|
12
|
-
legacyOrgId: null,
|
|
13
|
-
});
|
|
14
3
|
const { getLogger } = require('../../logs');
|
|
15
4
|
|
|
16
5
|
const log = getLogger('frigg.modules.authorization_callback');
|
|
@@ -41,17 +30,7 @@ class ProcessAuthorizationCallback {
|
|
|
41
30
|
this.integrationRepository = integrationRepository;
|
|
42
31
|
}
|
|
43
32
|
|
|
44
|
-
|
|
45
|
-
* @param {string} userId - the OWNER of what this creates (ADR-056 §3.2): the
|
|
46
|
-
* person for `individual`, the organization's user for `organization`.
|
|
47
|
-
* Not necessarily the caller; callers resolve it from the scope.
|
|
48
|
-
* @param {string} entityType
|
|
49
|
-
* @param {Object} params - what the module's authorization needs
|
|
50
|
-
* @param {{scope: string, organizationId: (string|null), legacyOrgId: (string|null)}} [tenancy]
|
|
51
|
-
* the entity's scope and organization (§3.6); default: the person's own,
|
|
52
|
-
* with no organization
|
|
53
|
-
*/
|
|
54
|
-
async execute(userId, entityType, params, tenancy = DEFAULT_TENANCY) {
|
|
33
|
+
async execute(userId, entityType, params) {
|
|
55
34
|
log.debug('Authorization callback started', {
|
|
56
35
|
eventName: `${log.name}.started`,
|
|
57
36
|
userId,
|
|
@@ -78,7 +57,10 @@ class ProcessAuthorizationCallback {
|
|
|
78
57
|
userId,
|
|
79
58
|
entityType
|
|
80
59
|
);
|
|
81
|
-
const existingEntity =
|
|
60
|
+
const existingEntity =
|
|
61
|
+
existingEntities && existingEntities.length > 0
|
|
62
|
+
? existingEntities[0]
|
|
63
|
+
: null;
|
|
82
64
|
|
|
83
65
|
if (existingEntity) {
|
|
84
66
|
log.debug('Existing entity found', {
|
|
@@ -88,7 +70,7 @@ class ProcessAuthorizationCallback {
|
|
|
88
70
|
});
|
|
89
71
|
}
|
|
90
72
|
|
|
91
|
-
const module =
|
|
73
|
+
const module = new Module({
|
|
92
74
|
userId,
|
|
93
75
|
entity: existingEntity,
|
|
94
76
|
definition: moduleDefinition,
|
|
@@ -174,8 +156,7 @@ class ProcessAuthorizationCallback {
|
|
|
174
156
|
const persistedEntity = await this.findOrCreateEntity(
|
|
175
157
|
entityDetails,
|
|
176
158
|
entityType,
|
|
177
|
-
module.credential.id
|
|
178
|
-
tenancy
|
|
159
|
+
module.credential.id
|
|
179
160
|
);
|
|
180
161
|
log.debug('Authorization callback completed', {
|
|
181
162
|
eventName: `${log.name}.completed`,
|
|
@@ -252,12 +233,7 @@ class ProcessAuthorizationCallback {
|
|
|
252
233
|
module.credential = persisted;
|
|
253
234
|
}
|
|
254
235
|
|
|
255
|
-
async findOrCreateEntity(
|
|
256
|
-
entityDetails,
|
|
257
|
-
moduleName,
|
|
258
|
-
credentialId,
|
|
259
|
-
tenancy = DEFAULT_TENANCY
|
|
260
|
-
) {
|
|
236
|
+
async findOrCreateEntity(entityDetails, moduleName, credentialId) {
|
|
261
237
|
const { identifiers, details } = entityDetails;
|
|
262
238
|
|
|
263
239
|
// Support both 'user' and 'userId' field names from module definitions
|
|
@@ -271,16 +247,11 @@ class ProcessAuthorizationCallback {
|
|
|
271
247
|
);
|
|
272
248
|
}
|
|
273
249
|
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
user: userId,
|
|
280
|
-
moduleName: moduleName,
|
|
281
|
-
}),
|
|
282
|
-
tenancy
|
|
283
|
-
);
|
|
250
|
+
const existingEntity = await this.moduleRepository.findEntity({
|
|
251
|
+
externalId: identifiers.externalId,
|
|
252
|
+
user: userId,
|
|
253
|
+
moduleName: moduleName,
|
|
254
|
+
});
|
|
284
255
|
|
|
285
256
|
if (existingEntity) {
|
|
286
257
|
// Repoint the entity's credentialId when re-auth produced a
|
|
@@ -311,17 +282,12 @@ class ProcessAuthorizationCallback {
|
|
|
311
282
|
return existingEntity;
|
|
312
283
|
}
|
|
313
284
|
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
moduleName: moduleName,
|
|
321
|
-
credential: credentialId,
|
|
322
|
-
},
|
|
323
|
-
{ organizationId: tenancy.organizationId ?? null }
|
|
324
|
-
);
|
|
285
|
+
return await this.moduleRepository.createEntity({
|
|
286
|
+
...identifiers,
|
|
287
|
+
...details,
|
|
288
|
+
moduleName: moduleName,
|
|
289
|
+
credential: credentialId,
|
|
290
|
+
});
|
|
325
291
|
}
|
|
326
292
|
}
|
|
327
293
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const { Module } = require('../module');
|
|
2
|
-
const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
|
|
3
2
|
|
|
4
3
|
class RefreshEntityOptions {
|
|
5
4
|
/**
|
|
@@ -7,11 +6,9 @@ class RefreshEntityOptions {
|
|
|
7
6
|
* @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
|
|
8
7
|
* @param {} params.moduleDefinitions
|
|
9
8
|
*/
|
|
10
|
-
constructor({ moduleRepository, moduleDefinitions
|
|
9
|
+
constructor({ moduleRepository, moduleDefinitions }) {
|
|
11
10
|
this.moduleRepository = moduleRepository;
|
|
12
11
|
this.moduleDefinitions = moduleDefinitions;
|
|
13
|
-
// Who may load an entity follows its scope (ADR-056 §3.6).
|
|
14
|
-
this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
|
|
15
12
|
}
|
|
16
13
|
|
|
17
14
|
/**
|
|
@@ -39,7 +36,7 @@ class RefreshEntityOptions {
|
|
|
39
36
|
|
|
40
37
|
// Validate entity ownership
|
|
41
38
|
const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
|
|
42
|
-
?
|
|
39
|
+
? userIdOrUser.ownsUserId(entity.userId)
|
|
43
40
|
: entity.userId?.toString() === userId?.toString();
|
|
44
41
|
|
|
45
42
|
if (!isOwned) {
|
|
@@ -61,11 +58,8 @@ class RefreshEntityOptions {
|
|
|
61
58
|
);
|
|
62
59
|
}
|
|
63
60
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
// update the owner's credential, not create one under the caller.
|
|
67
|
-
const module = await Module.create({
|
|
68
|
-
userId: entity.userId ?? userId,
|
|
61
|
+
const module = new Module({
|
|
62
|
+
userId,
|
|
69
63
|
entity,
|
|
70
64
|
definition: moduleDefinition,
|
|
71
65
|
});
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const { Module } = require('../module');
|
|
2
|
-
const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
|
|
3
2
|
|
|
4
3
|
class TestModuleAuth {
|
|
5
4
|
/**
|
|
@@ -7,11 +6,9 @@ class TestModuleAuth {
|
|
|
7
6
|
* @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository - Repository for module data operations.
|
|
8
7
|
* @param {Array<Object>} params.moduleDefinitions - Array of module definitions.
|
|
9
8
|
*/
|
|
10
|
-
constructor({ moduleRepository, moduleDefinitions
|
|
9
|
+
constructor({ moduleRepository, moduleDefinitions }) {
|
|
11
10
|
this.moduleRepository = moduleRepository;
|
|
12
11
|
this.moduleDefinitions = moduleDefinitions;
|
|
13
|
-
// Who may load an entity follows its scope (ADR-056 §3.6).
|
|
14
|
-
this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
|
|
15
12
|
}
|
|
16
13
|
|
|
17
14
|
/**
|
|
@@ -38,7 +35,7 @@ class TestModuleAuth {
|
|
|
38
35
|
|
|
39
36
|
// Validate entity ownership
|
|
40
37
|
const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
|
|
41
|
-
?
|
|
38
|
+
? userIdOrUser.ownsUserId(entity.userId)
|
|
42
39
|
: entity.userId?.toString() === userId?.toString();
|
|
43
40
|
|
|
44
41
|
if (!isOwned) {
|
|
@@ -60,11 +57,8 @@ class TestModuleAuth {
|
|
|
60
57
|
);
|
|
61
58
|
}
|
|
62
59
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
// update the owner's credential, not create one under the caller.
|
|
66
|
-
const module = await Module.create({
|
|
67
|
-
userId: entity.userId ?? userId,
|
|
60
|
+
const module = new Module({
|
|
61
|
+
userId,
|
|
68
62
|
entity,
|
|
69
63
|
definition: moduleDefinition,
|
|
70
64
|
});
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
const { toCredentialId } = require('./to-credential-id');
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* @param {import('../module').Module} moduleInstance
|
|
3
5
|
* Convert a Module domain instance to a plain DTO suitable for JSON responses.
|
|
@@ -10,9 +12,9 @@ function mapModuleClassToModuleDTO(moduleInstance) {
|
|
|
10
12
|
name: moduleInstance.name,
|
|
11
13
|
userId: moduleInstance.userId,
|
|
12
14
|
entity: moduleInstance.entity,
|
|
13
|
-
credentialId: moduleInstance.credential
|
|
14
|
-
type: moduleInstance.getName()
|
|
15
|
+
credentialId: toCredentialId(moduleInstance.credential),
|
|
16
|
+
type: moduleInstance.getName(),
|
|
15
17
|
};
|
|
16
18
|
}
|
|
17
19
|
|
|
18
|
-
module.exports = { mapModuleClassToModuleDTO };
|
|
20
|
+
module.exports = { mapModuleClassToModuleDTO };
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolve the credential id from an entity's or module's `credential`, which
|
|
3
|
+
* repositories return as the decrypted credential object (or a bare id).
|
|
4
|
+
* @param {Object|string|number|null|undefined} credential
|
|
5
|
+
* @returns {string|null}
|
|
6
|
+
*/
|
|
7
|
+
function toCredentialId(credential) {
|
|
8
|
+
if (credential && typeof credential === 'object') {
|
|
9
|
+
return credential.id?.toString() ?? null;
|
|
10
|
+
}
|
|
11
|
+
return credential?.toString() ?? null;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
module.exports = { toCredentialId };
|
package/package.json
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@friggframework/core",
|
|
3
3
|
"prettier": "@friggframework/prettier-config",
|
|
4
|
-
"version": "2.0.0--canary.
|
|
4
|
+
"version": "2.0.0--canary.710.9045bbc.0",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
|
|
7
7
|
"@aws-sdk/client-kms": "^3.588.0",
|
|
8
8
|
"@aws-sdk/client-lambda": "^3.714.0",
|
|
9
9
|
"@aws-sdk/client-s3": "^3.588.0",
|
|
10
|
+
"@aws-sdk/client-scheduler": "^3.588.0",
|
|
10
11
|
"@aws-sdk/client-sqs": "^3.588.0",
|
|
11
12
|
"@aws-sdk/client-ssm": "^3.588.0",
|
|
12
13
|
"@aws-sdk/s3-request-presigner": "^3.588.0",
|
|
@@ -28,7 +29,6 @@
|
|
|
28
29
|
"express-async-handler": "^1.2.0",
|
|
29
30
|
"form-data": "^4.0.6",
|
|
30
31
|
"fs-extra": "^11.2.0",
|
|
31
|
-
"jose": "^5.10.0",
|
|
32
32
|
"lodash": "4.18.1",
|
|
33
33
|
"lodash.get": "^4.4.2",
|
|
34
34
|
"node-fetch": "^2.6.7",
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@friggframework/eslint-config": "2.0.0--canary.
|
|
52
|
-
"@friggframework/prettier-config": "2.0.0--canary.
|
|
53
|
-
"@friggframework/test": "2.0.0--canary.
|
|
51
|
+
"@friggframework/eslint-config": "2.0.0--canary.710.9045bbc.0",
|
|
52
|
+
"@friggframework/prettier-config": "2.0.0--canary.710.9045bbc.0",
|
|
53
|
+
"@friggframework/test": "2.0.0--canary.710.9045bbc.0",
|
|
54
54
|
"@prisma/client": "^6.19.3",
|
|
55
55
|
"@types/lodash": "4.17.15",
|
|
56
56
|
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
|
@@ -68,6 +68,7 @@
|
|
|
68
68
|
"scripts": {
|
|
69
69
|
"lint:fix": "prettier --write --loglevel error . && eslint . --fix",
|
|
70
70
|
"test": "jest --passWithNoTests # TODO",
|
|
71
|
+
"test:db": "jest --config jest.db.config.js --runInBand",
|
|
71
72
|
"prisma:generate:mongo": "npx prisma generate --schema ./prisma-mongodb/schema.prisma",
|
|
72
73
|
"prisma:generate:postgres": "npx prisma generate --schema ./prisma-postgresql/schema.prisma",
|
|
73
74
|
"prisma:generate": "npm run prisma:generate:mongo && npm run prisma:generate:postgres",
|
|
@@ -90,5 +91,5 @@
|
|
|
90
91
|
"publishConfig": {
|
|
91
92
|
"access": "public"
|
|
92
93
|
},
|
|
93
|
-
"gitHead": "
|
|
94
|
+
"gitHead": "9045bbc0a84c7c07271e8599d1600d58790537a6"
|
|
94
95
|
}
|
|
@@ -56,14 +56,6 @@ model User {
|
|
|
56
56
|
integrations Integration[]
|
|
57
57
|
processes Process[]
|
|
58
58
|
|
|
59
|
-
// Organization memberships (ADR-056 §3.6). `organizationId` above is the legacy
|
|
60
|
-
// single-org pointer: set on a person's first link, never moved afterwards, and
|
|
61
|
-
// read as an implicit membership when no row exists for it.
|
|
62
|
-
// As an individual: the organizations this person belongs to.
|
|
63
|
-
memberships OrganizationMembership[] @relation("IndividualMemberships")
|
|
64
|
-
// As an organization: the people who belong to it.
|
|
65
|
-
orgMembers OrganizationMembership[] @relation("OrganizationMemberships")
|
|
66
|
-
|
|
67
59
|
@@unique([username, appUserId])
|
|
68
60
|
@@index([type])
|
|
69
61
|
@@index([appUserId])
|
|
@@ -134,14 +126,6 @@ model Entity {
|
|
|
134
126
|
moduleName String?
|
|
135
127
|
externalId String?
|
|
136
128
|
|
|
137
|
-
// Organization this entity was connected in (ADR-056 §3.6): the active
|
|
138
|
-
// organization for `individual`, the owner for `organization`, null for
|
|
139
|
-
// `global`. Null on an `individual` entity is also what every row written
|
|
140
|
-
// before this column existed has, and what `individualAcross: 'all'` writes.
|
|
141
|
-
// Deliberately not a relation: a deleted organization must leave its rows
|
|
142
|
-
// invisible, not turn them into "unscoped" ones (SetNull would do that).
|
|
143
|
-
organizationId String? @db.ObjectId
|
|
144
|
-
|
|
145
129
|
data Json @default("{}")
|
|
146
130
|
|
|
147
131
|
createdAt DateTime @default(now())
|
|
@@ -158,7 +142,6 @@ model Entity {
|
|
|
158
142
|
associationObjects AssociationObject[]
|
|
159
143
|
|
|
160
144
|
@@index([userId])
|
|
161
|
-
@@index([userId, organizationId])
|
|
162
145
|
@@index([externalId])
|
|
163
146
|
@@index([moduleName])
|
|
164
147
|
@@index([credentialId])
|
|
@@ -176,11 +159,6 @@ model Integration {
|
|
|
176
159
|
user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
177
160
|
status IntegrationStatus @default(IN_CREATION)
|
|
178
161
|
|
|
179
|
-
// Organization this integration was created in (ADR-056 §3.6): the active
|
|
180
|
-
// organization at create time. Null for rows that predate the column. Not a
|
|
181
|
-
// relation, for the same reason as Entity.organizationId.
|
|
182
|
-
organizationId String? @db.ObjectId
|
|
183
|
-
|
|
184
162
|
// Configuration and version
|
|
185
163
|
config Json? // Integration configuration object
|
|
186
164
|
version String?
|
|
@@ -205,7 +183,6 @@ model Integration {
|
|
|
205
183
|
processes Process[]
|
|
206
184
|
|
|
207
185
|
@@index([userId])
|
|
208
|
-
@@index([userId, organizationId])
|
|
209
186
|
@@index([status])
|
|
210
187
|
@@map("Integration")
|
|
211
188
|
}
|
|
@@ -476,72 +453,3 @@ model UsageCounter {
|
|
|
476
453
|
@@index([metric, integrationType, window])
|
|
477
454
|
@@map("UsageCounter")
|
|
478
455
|
}
|
|
479
|
-
|
|
480
|
-
// ============================================================================
|
|
481
|
-
// MANAGEMENT API MODELS
|
|
482
|
-
// ============================================================================
|
|
483
|
-
|
|
484
|
-
/// Multi-step authorization state for Management API v2 (/api/v2/authorize,
|
|
485
|
-
/// /api/v2/credentials/:id/reauthorize). Short-lived: expired documents are
|
|
486
|
-
/// removed opportunistically. stepData is encrypted at rest.
|
|
487
|
-
model AuthorizationSession {
|
|
488
|
-
id String @id @default(auto()) @map("_id") @db.ObjectId
|
|
489
|
-
sessionId String @unique
|
|
490
|
-
userId String
|
|
491
|
-
entityType String
|
|
492
|
-
credentialId String?
|
|
493
|
-
currentStep Int @default(1)
|
|
494
|
-
maxSteps Int
|
|
495
|
-
stepData Json @default("{}")
|
|
496
|
-
expiresAt DateTime
|
|
497
|
-
completed Boolean @default(false)
|
|
498
|
-
|
|
499
|
-
createdAt DateTime @default(now())
|
|
500
|
-
updatedAt DateTime @updatedAt
|
|
501
|
-
|
|
502
|
-
@@index([userId, entityType])
|
|
503
|
-
@@index([expiresAt])
|
|
504
|
-
@@map("AuthorizationSession")
|
|
505
|
-
}
|
|
506
|
-
|
|
507
|
-
// ============================================================================
|
|
508
|
-
// ORGANIZATION MEMBERSHIP (ADR-056 §3.6)
|
|
509
|
-
// ============================================================================
|
|
510
|
-
|
|
511
|
-
/// One person's membership of one organization. Unique on the pair, so adding a
|
|
512
|
-
/// membership is an idempotent upsert. `orgRole` is the organization role the
|
|
513
|
-
/// adopter token carried when the membership was created (MEMBER when it named none). NoAction on delete
|
|
514
|
-
/// because MongoDB gives no referential integrity: delete a user's memberships
|
|
515
|
-
/// before the user.
|
|
516
|
-
model OrganizationMembership {
|
|
517
|
-
id String @id @default(auto()) @map("_id") @db.ObjectId
|
|
518
|
-
individualUserId String @db.ObjectId
|
|
519
|
-
organizationUserId String @db.ObjectId
|
|
520
|
-
orgRole String @default("MEMBER")
|
|
521
|
-
createdAt DateTime @default(now())
|
|
522
|
-
|
|
523
|
-
individualUser User @relation("IndividualMemberships", fields: [individualUserId], references: [id], onDelete: NoAction, onUpdate: NoAction)
|
|
524
|
-
organizationUser User @relation("OrganizationMemberships", fields: [organizationUserId], references: [id], onDelete: NoAction, onUpdate: NoAction)
|
|
525
|
-
|
|
526
|
-
@@unique([individualUserId, organizationUserId])
|
|
527
|
-
@@index([organizationUserId])
|
|
528
|
-
@@map("OrganizationMembership")
|
|
529
|
-
}
|
|
530
|
-
|
|
531
|
-
/// One-time scheduled jobs for poll-and-dispatch scheduling pattern.
|
|
532
|
-
/// Used by providers without native one-time scheduling APIs (e.g., Netlify).
|
|
533
|
-
/// A cron function queries for due jobs and dispatches them to a queue.
|
|
534
|
-
model ScheduledJob {
|
|
535
|
-
id String @id @default(auto()) @map("_id") @db.ObjectId
|
|
536
|
-
scheduleName String @unique
|
|
537
|
-
scheduledAt DateTime
|
|
538
|
-
queueResourceId String
|
|
539
|
-
payload Json?
|
|
540
|
-
state String @default("PENDING")
|
|
541
|
-
|
|
542
|
-
createdAt DateTime @default(now())
|
|
543
|
-
updatedAt DateTime @updatedAt
|
|
544
|
-
|
|
545
|
-
@@index([state, scheduledAt])
|
|
546
|
-
@@map("ScheduledJob")
|
|
547
|
-
}
|