@friggframework/core 2.0.0--canary.686.3e27a92.0 → 2.0.0--canary.663.8de669c.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/CLAUDE.md +0 -28
- package/README.md +0 -105
- package/application/commands/integration-commands.js +10 -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-utils.js +1 -6
- package/database/encryption/encryption-config.js +31 -10
- package/database/encryption/encryption-schema-registry.js +12 -93
- package/database/prisma.js +2 -4
- 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/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 +1 -65
- 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-router.js +96 -131
- package/integrations/repositories/integration-repository-documentdb.js +3 -35
- package/integrations/repositories/integration-repository-interface.js +1 -17
- package/integrations/repositories/integration-repository-mongo.js +76 -59
- package/integrations/repositories/integration-repository-postgres.js +76 -62
- package/integrations/tests/doubles/test-integration-repository.js +1 -12
- package/integrations/use-cases/create-integration.js +20 -55
- package/integrations/use-cases/get-integrations-for-user.js +40 -80
- package/integrations/use-cases/index.js +1 -7
- package/integrations/utils/map-integration-dto.js +14 -43
- 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/package.json +5 -6
- package/prisma-mongodb/schema.prisma +0 -92
- package/prisma-postgresql/schema.prisma +0 -87
- package/queues/index.js +0 -25
- 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/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-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/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 -216
- 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 -150
- 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
|
@@ -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
|
});
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
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.663.8de669c.0",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
|
|
7
7
|
"@aws-sdk/client-kms": "^3.588.0",
|
|
@@ -28,7 +28,6 @@
|
|
|
28
28
|
"express-async-handler": "^1.2.0",
|
|
29
29
|
"form-data": "^4.0.6",
|
|
30
30
|
"fs-extra": "^11.2.0",
|
|
31
|
-
"jose": "^5.10.0",
|
|
32
31
|
"lodash": "4.18.1",
|
|
33
32
|
"lodash.get": "^4.4.2",
|
|
34
33
|
"node-fetch": "^2.6.7",
|
|
@@ -48,9 +47,9 @@
|
|
|
48
47
|
}
|
|
49
48
|
},
|
|
50
49
|
"devDependencies": {
|
|
51
|
-
"@friggframework/eslint-config": "2.0.0--canary.
|
|
52
|
-
"@friggframework/prettier-config": "2.0.0--canary.
|
|
53
|
-
"@friggframework/test": "2.0.0--canary.
|
|
50
|
+
"@friggframework/eslint-config": "2.0.0--canary.663.8de669c.0",
|
|
51
|
+
"@friggframework/prettier-config": "2.0.0--canary.663.8de669c.0",
|
|
52
|
+
"@friggframework/test": "2.0.0--canary.663.8de669c.0",
|
|
54
53
|
"@prisma/client": "^6.19.3",
|
|
55
54
|
"@types/lodash": "4.17.15",
|
|
56
55
|
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
|
@@ -90,5 +89,5 @@
|
|
|
90
89
|
"publishConfig": {
|
|
91
90
|
"access": "public"
|
|
92
91
|
},
|
|
93
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "8de669cbe925abbcd0908be6e792e38e2a14ffd8"
|
|
94
93
|
}
|
|
@@ -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
|
-
}
|
|
@@ -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])
|
|
@@ -131,14 +123,6 @@ model Entity {
|
|
|
131
123
|
moduleName String?
|
|
132
124
|
externalId String?
|
|
133
125
|
|
|
134
|
-
// Organization this entity was connected in (ADR-056 §3.6): the active
|
|
135
|
-
// organization for `individual`, the owner for `organization`, null for
|
|
136
|
-
// `global`. Null on an `individual` entity is also what every row written
|
|
137
|
-
// before this column existed has, and what `individualAcross: 'all'` writes.
|
|
138
|
-
// Deliberately not a relation: a deleted organization must leave its rows
|
|
139
|
-
// invisible, not turn them into "unscoped" ones (SetNull would do that).
|
|
140
|
-
organizationId Int?
|
|
141
|
-
|
|
142
126
|
data Json @default("{}")
|
|
143
127
|
|
|
144
128
|
createdAt DateTime @default(now())
|
|
@@ -152,7 +136,6 @@ model Entity {
|
|
|
152
136
|
associationObjects AssociationObject[]
|
|
153
137
|
|
|
154
138
|
@@index([userId])
|
|
155
|
-
@@index([userId, organizationId])
|
|
156
139
|
@@index([externalId])
|
|
157
140
|
@@index([moduleName])
|
|
158
141
|
@@index([credentialId])
|
|
@@ -169,11 +152,6 @@ model Integration {
|
|
|
169
152
|
user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
170
153
|
status IntegrationStatus @default(IN_CREATION)
|
|
171
154
|
|
|
172
|
-
// Organization this integration was created in (ADR-056 §3.6): the active
|
|
173
|
-
// organization at create time. Null for rows that predate the column. Not a
|
|
174
|
-
// relation, for the same reason as Entity.organizationId.
|
|
175
|
-
organizationId Int?
|
|
176
|
-
|
|
177
155
|
// Configuration and version
|
|
178
156
|
config Json? // Integration configuration object
|
|
179
157
|
version String?
|
|
@@ -197,7 +175,6 @@ model Integration {
|
|
|
197
175
|
processes Process[]
|
|
198
176
|
|
|
199
177
|
@@index([userId])
|
|
200
|
-
@@index([userId, organizationId])
|
|
201
178
|
@@index([status])
|
|
202
179
|
}
|
|
203
180
|
|
|
@@ -457,67 +434,3 @@ model UsageCounter {
|
|
|
457
434
|
// Covers series() (metric + integrationType + window range).
|
|
458
435
|
@@index([metric, integrationType, window])
|
|
459
436
|
}
|
|
460
|
-
|
|
461
|
-
// ============================================================================
|
|
462
|
-
// MANAGEMENT API MODELS
|
|
463
|
-
// ============================================================================
|
|
464
|
-
|
|
465
|
-
/// Multi-step authorization state for Management API v2 (/api/v2/authorize,
|
|
466
|
-
/// /api/v2/credentials/:id/reauthorize). Short-lived: expired rows are removed
|
|
467
|
-
/// opportunistically. stepData is encrypted at rest.
|
|
468
|
-
model AuthorizationSession {
|
|
469
|
-
id Int @id @default(autoincrement())
|
|
470
|
-
sessionId String @unique
|
|
471
|
-
userId String
|
|
472
|
-
entityType String
|
|
473
|
-
credentialId String?
|
|
474
|
-
currentStep Int @default(1)
|
|
475
|
-
maxSteps Int
|
|
476
|
-
stepData Json @default("{}")
|
|
477
|
-
expiresAt DateTime
|
|
478
|
-
completed Boolean @default(false)
|
|
479
|
-
|
|
480
|
-
createdAt DateTime @default(now())
|
|
481
|
-
updatedAt DateTime @updatedAt
|
|
482
|
-
|
|
483
|
-
@@index([userId, entityType])
|
|
484
|
-
@@index([expiresAt])
|
|
485
|
-
}
|
|
486
|
-
|
|
487
|
-
// ============================================================================
|
|
488
|
-
// ORGANIZATION MEMBERSHIP (ADR-056 §3.6)
|
|
489
|
-
// ============================================================================
|
|
490
|
-
|
|
491
|
-
/// One person's membership of one organization. Unique on the pair, so adding a
|
|
492
|
-
/// membership is an idempotent upsert. `orgRole` is the organization role the
|
|
493
|
-
/// adopter token carried when the membership was created (MEMBER when it named none).
|
|
494
|
-
model OrganizationMembership {
|
|
495
|
-
id Int @id @default(autoincrement())
|
|
496
|
-
individualUserId Int
|
|
497
|
-
organizationUserId Int
|
|
498
|
-
orgRole String @default("MEMBER")
|
|
499
|
-
createdAt DateTime @default(now())
|
|
500
|
-
|
|
501
|
-
individualUser User @relation("IndividualMemberships", fields: [individualUserId], references: [id], onDelete: Cascade, onUpdate: NoAction)
|
|
502
|
-
organizationUser User @relation("OrganizationMemberships", fields: [organizationUserId], references: [id], onDelete: Cascade, onUpdate: NoAction)
|
|
503
|
-
|
|
504
|
-
@@unique([individualUserId, organizationUserId])
|
|
505
|
-
@@index([organizationUserId])
|
|
506
|
-
}
|
|
507
|
-
|
|
508
|
-
/// One-time scheduled jobs for poll-and-dispatch scheduling pattern.
|
|
509
|
-
/// Used by providers without native one-time scheduling APIs (e.g., Netlify).
|
|
510
|
-
/// A cron function queries for due jobs and dispatches them to a queue.
|
|
511
|
-
model ScheduledJob {
|
|
512
|
-
id Int @id @default(autoincrement())
|
|
513
|
-
scheduleName String @unique
|
|
514
|
-
scheduledAt DateTime
|
|
515
|
-
queueResourceId String
|
|
516
|
-
payload Json?
|
|
517
|
-
state String @default("PENDING")
|
|
518
|
-
|
|
519
|
-
createdAt DateTime @default(now())
|
|
520
|
-
updatedAt DateTime @updatedAt
|
|
521
|
-
|
|
522
|
-
@@index([state, scheduledAt])
|
|
523
|
-
}
|
package/queues/index.js
CHANGED
|
@@ -1,29 +1,4 @@
|
|
|
1
1
|
const { QueuerUtil } = require('./queuer-util');
|
|
2
|
-
const { QueueProvider } = require('./queue-provider');
|
|
3
|
-
const { QueueClientInterface } = require('./queue-client-interface');
|
|
4
|
-
const {
|
|
5
|
-
createQueueProvider,
|
|
6
|
-
determineProvider,
|
|
7
|
-
QUEUE_PROVIDERS,
|
|
8
|
-
} = require('./queue-provider-factory');
|
|
9
|
-
const {
|
|
10
|
-
NetlifyBackgroundProvider,
|
|
11
|
-
QStashQueueProvider,
|
|
12
|
-
} = require('./providers');
|
|
13
|
-
|
|
14
2
|
module.exports = {
|
|
15
3
|
QueuerUtil,
|
|
16
|
-
QueueProvider,
|
|
17
|
-
QueueClientInterface,
|
|
18
|
-
createQueueProvider,
|
|
19
|
-
determineProvider,
|
|
20
|
-
QUEUE_PROVIDERS,
|
|
21
|
-
NetlifyBackgroundProvider,
|
|
22
|
-
QStashQueueProvider,
|
|
23
|
-
get SqsQueueProvider() {
|
|
24
|
-
return require('./providers/sqs-queue-provider').SqsQueueProvider;
|
|
25
|
-
},
|
|
26
|
-
get SqsQueueClient() {
|
|
27
|
-
return require('./sqs-queue-client').SqsQueueClient;
|
|
28
|
-
},
|
|
29
4
|
};
|
package/types/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ const {
|
|
|
4
4
|
toObjectId,
|
|
5
5
|
fromObjectId,
|
|
6
6
|
findOne,
|
|
7
|
-
|
|
7
|
+
findMany,
|
|
8
8
|
insertOne,
|
|
9
9
|
updateOne,
|
|
10
10
|
deleteOne,
|
|
@@ -72,9 +72,7 @@ class UserRepositoryDocumentDB extends UserRepositoryInterface {
|
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
async findIndividualUsersByOrganizationId(organizationUserId) {
|
|
75
|
-
|
|
76
|
-
// drop people from a large organization.
|
|
77
|
-
const docs = await findManyDrained(this.prisma, 'User', {
|
|
75
|
+
const docs = await findMany(this.prisma, 'User', {
|
|
78
76
|
organizationId: toObjectId(organizationUserId),
|
|
79
77
|
type: 'INDIVIDUAL',
|
|
80
78
|
});
|
|
@@ -423,29 +421,6 @@ class UserRepositoryDocumentDB extends UserRepositoryInterface {
|
|
|
423
421
|
);
|
|
424
422
|
return this._mapUser(decrypted);
|
|
425
423
|
}
|
|
426
|
-
|
|
427
|
-
/**
|
|
428
|
-
* Set the legacy organizationId only if it is still null or absent (see the
|
|
429
|
-
* interface): the filter carries the condition, so it is one atomic update.
|
|
430
|
-
* @param {string} individualUserId
|
|
431
|
-
* @param {string} organizationUserId
|
|
432
|
-
* @returns {Promise<Object|null>} The individual user as stored afterwards
|
|
433
|
-
*/
|
|
434
|
-
async linkIndividualToOrganizationIfUnset(individualUserId, organizationUserId) {
|
|
435
|
-
await updateOne(
|
|
436
|
-
this.prisma,
|
|
437
|
-
'User',
|
|
438
|
-
{
|
|
439
|
-
_id: toObjectId(individualUserId),
|
|
440
|
-
type: 'INDIVIDUAL',
|
|
441
|
-
// Raw MongoDB query (not Prisma): `{ field: null }` matches both a
|
|
442
|
-
// null value and a missing field, so no `$exists` branch is needed.
|
|
443
|
-
organizationId: null,
|
|
444
|
-
},
|
|
445
|
-
{ $set: { organizationId: toObjectId(organizationUserId) } }
|
|
446
|
-
);
|
|
447
|
-
return this.findIndividualUserById(individualUserId);
|
|
448
|
-
}
|
|
449
424
|
}
|
|
450
425
|
|
|
451
426
|
module.exports = { UserRepositoryDocumentDB };
|
|
@@ -209,24 +209,6 @@ class UserRepositoryInterface {
|
|
|
209
209
|
'Method linkIndividualToOrganization must be implemented by subclass'
|
|
210
210
|
);
|
|
211
211
|
}
|
|
212
|
-
|
|
213
|
-
/**
|
|
214
|
-
* Set an individual user's legacy `organizationId` pointer only if it is
|
|
215
|
-
* not set yet (their first link), decided by the database in the same
|
|
216
|
-
* statement so two concurrent first logins cannot overwrite each other.
|
|
217
|
-
* Never changes an existing pointer (ADR-056 §3.6).
|
|
218
|
-
*
|
|
219
|
-
* @param {string|number} individualUserId - Individual user ID
|
|
220
|
-
* @param {string|number} organizationUserId - Organization user ID
|
|
221
|
-
* @returns {Promise<Object|null>} The individual user as stored afterwards
|
|
222
|
-
* (null if there is no such individual)
|
|
223
|
-
* @abstract
|
|
224
|
-
*/
|
|
225
|
-
async linkIndividualToOrganizationIfUnset(individualUserId, organizationUserId) {
|
|
226
|
-
throw new Error(
|
|
227
|
-
'Method linkIndividualToOrganizationIfUnset must be implemented by subclass'
|
|
228
|
-
);
|
|
229
|
-
}
|
|
230
212
|
}
|
|
231
213
|
|
|
232
214
|
module.exports = { UserRepositoryInterface };
|
|
@@ -318,30 +318,6 @@ class UserRepositoryMongo extends UserRepositoryInterface {
|
|
|
318
318
|
},
|
|
319
319
|
});
|
|
320
320
|
}
|
|
321
|
-
|
|
322
|
-
/**
|
|
323
|
-
* Set the legacy organizationId only if it is still null (see the interface).
|
|
324
|
-
* @param {string} individualUserId
|
|
325
|
-
* @param {string} organizationUserId
|
|
326
|
-
* @returns {Promise<Object|null>} The individual user as stored afterwards
|
|
327
|
-
*/
|
|
328
|
-
async linkIndividualToOrganizationIfUnset(individualUserId, organizationUserId) {
|
|
329
|
-
await this.prisma.user.updateMany({
|
|
330
|
-
where: {
|
|
331
|
-
id: individualUserId,
|
|
332
|
-
type: 'INDIVIDUAL',
|
|
333
|
-
// Prisma on MongoDB: `null` matches only an explicit null, and
|
|
334
|
-
// `isSet: false` only a missing field. An individual created
|
|
335
|
-
// without the field is the common case, so match both.
|
|
336
|
-
OR: [
|
|
337
|
-
{ organizationId: null },
|
|
338
|
-
{ organizationId: { isSet: false } },
|
|
339
|
-
],
|
|
340
|
-
},
|
|
341
|
-
data: { organizationId: organizationUserId },
|
|
342
|
-
});
|
|
343
|
-
return this.findIndividualUserById(individualUserId);
|
|
344
|
-
}
|
|
345
321
|
}
|
|
346
322
|
|
|
347
323
|
module.exports = { UserRepositoryMongo };
|