@friggframework/core 2.0.0--canary.686.00d79d8.0 → 2.0.0--canary.688.e850868.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.
Files changed (191) hide show
  1. package/CLAUDE.md +0 -28
  2. package/README.md +0 -105
  3. package/application/commands/entity-commands.js +13 -18
  4. package/application/commands/integration-commands.js +10 -20
  5. package/application/commands/scheduler-commands.js +7 -11
  6. package/application/commands/user-commands.js +5 -17
  7. package/application/index.js +2 -6
  8. package/core/Worker.js +7 -31
  9. package/core/create-handler.js +0 -9
  10. package/credential/repositories/credential-repository-documentdb.js +0 -34
  11. package/credential/repositories/credential-repository-interface.js +0 -15
  12. package/credential/repositories/credential-repository-mongo.js +0 -23
  13. package/credential/repositories/credential-repository-postgres.js +0 -28
  14. package/database/config.js +24 -48
  15. package/database/documentdb-utils.js +0 -2
  16. package/database/encryption/encryption-schema-registry.js +12 -93
  17. package/database/prisma.js +2 -4
  18. package/errors/index.js +4 -0
  19. package/errors/mapping-already-exists-error.js +14 -0
  20. package/generated/prisma-mongodb/edge.js +4 -43
  21. package/generated/prisma-mongodb/index-browser.js +1 -40
  22. package/generated/prisma-mongodb/index.d.ts +111 -4739
  23. package/generated/prisma-mongodb/index.js +4 -43
  24. package/generated/prisma-mongodb/package.json +1 -1
  25. package/generated/prisma-mongodb/schema.prisma +0 -92
  26. package/generated/prisma-mongodb/wasm.js +4 -43
  27. package/generated/prisma-postgresql/edge.js +4 -43
  28. package/generated/prisma-postgresql/index-browser.js +1 -40
  29. package/generated/prisma-postgresql/index.d.ts +33 -4966
  30. package/generated/prisma-postgresql/index.js +4 -43
  31. package/generated/prisma-postgresql/package.json +1 -1
  32. package/generated/prisma-postgresql/schema.prisma +0 -87
  33. package/generated/prisma-postgresql/wasm.js +4 -43
  34. package/handlers/WEBHOOKS.md +29 -0
  35. package/handlers/app-definition-loader.js +19 -111
  36. package/handlers/app-handler-helpers.js +3 -25
  37. package/handlers/backend-utils.js +25 -31
  38. package/handlers/middleware/admin-auth.js +1 -14
  39. package/handlers/routers/auth.js +10 -46
  40. package/handlers/routers/health.js +4 -11
  41. package/handlers/routers/integration-defined-routers.js +92 -144
  42. package/handlers/routers/integration-webhook-routers.js +64 -102
  43. package/handlers/workers/integration-defined-workers.js +2 -5
  44. package/index.js +3 -63
  45. package/infrastructure/scheduler/index.js +6 -19
  46. package/infrastructure/scheduler/scheduler-service-factory.js +7 -55
  47. package/integrations/index.js +0 -1
  48. package/integrations/integration-base.js +29 -0
  49. package/integrations/integration-router.js +96 -131
  50. package/integrations/repositories/integration-mapping-repository-documentdb.js +50 -0
  51. package/integrations/repositories/integration-mapping-repository-interface.js +15 -0
  52. package/integrations/repositories/integration-mapping-repository-mongo.js +29 -0
  53. package/integrations/repositories/integration-mapping-repository-postgres.js +30 -0
  54. package/integrations/repositories/integration-mapping-repository.js +29 -0
  55. package/integrations/repositories/integration-repository-documentdb.js +3 -35
  56. package/integrations/repositories/integration-repository-interface.js +1 -17
  57. package/integrations/repositories/integration-repository-mongo.js +77 -60
  58. package/integrations/repositories/integration-repository-postgres.js +76 -62
  59. package/integrations/repositories/process-repository-mongo.js +1 -1
  60. package/integrations/tests/doubles/test-integration-repository.js +1 -12
  61. package/integrations/use-cases/create-integration.js +20 -55
  62. package/integrations/use-cases/get-integrations-for-user.js +40 -80
  63. package/integrations/use-cases/index.js +1 -5
  64. package/integrations/utils/map-integration-dto.js +14 -43
  65. package/modules/index.js +0 -14
  66. package/modules/module-factory.js +0 -12
  67. package/modules/module.js +2 -53
  68. package/modules/repositories/module-repository-documentdb.js +6 -51
  69. package/modules/repositories/module-repository-interface.js +2 -19
  70. package/modules/repositories/module-repository-mongo.js +74 -67
  71. package/modules/repositories/module-repository-postgres.js +74 -66
  72. package/modules/repositories/module-repository.js +1 -2
  73. package/modules/requester/requester.js +2 -27
  74. package/modules/use-cases/get-entities-for-user.js +13 -26
  75. package/modules/use-cases/get-entity-options-by-id.js +4 -10
  76. package/modules/use-cases/get-entity-options-by-type.js +1 -1
  77. package/modules/use-cases/get-module-instance-from-type.js +1 -1
  78. package/modules/use-cases/get-module.js +4 -10
  79. package/modules/use-cases/process-authorization-callback.js +19 -53
  80. package/modules/use-cases/refresh-entity-options.js +4 -10
  81. package/modules/use-cases/test-module-auth.js +4 -10
  82. package/package.json +5 -6
  83. package/prisma-mongodb/schema.prisma +0 -92
  84. package/prisma-postgresql/schema.prisma +0 -87
  85. package/queues/index.js +0 -25
  86. package/types/index.d.ts +0 -2
  87. package/user/repositories/user-repository-documentdb.js +2 -27
  88. package/user/repositories/user-repository-interface.js +0 -18
  89. package/user/repositories/user-repository-mongo.js +0 -24
  90. package/user/repositories/user-repository-postgres.js +0 -18
  91. package/user/use-cases/authenticate-user.js +1 -7
  92. package/user/use-cases/get-user-from-adopter-jwt.js +124 -95
  93. package/user/use-cases/get-user-from-x-frigg-headers.js +80 -83
  94. package/user/user.js +1 -64
  95. package/credential/use-cases/credential-operations-for-user.js +0 -202
  96. package/credential/use-cases/reauthorize-credential-for-user.js +0 -73
  97. package/database/organization-where.js +0 -18
  98. package/database/unique-violation.js +0 -25
  99. package/extensions/bootstrap-runner.js +0 -43
  100. package/extensions/extension-loader.js +0 -167
  101. package/extensions/index.js +0 -41
  102. package/extensions/initialize-app.js +0 -123
  103. package/extensions/route-mounter.js +0 -103
  104. package/extensions/schema-composer.js +0 -188
  105. package/infrastructure/scheduler/netlify-scheduler-adapter.js +0 -216
  106. package/infrastructure/scheduler/scheduled-job-repository.js +0 -118
  107. package/integrations/repositories/integration-not-found.js +0 -14
  108. package/integrations/use-cases/integration-operations-for-user.js +0 -256
  109. package/integrations/use-cases/resolve-integration-ownership.js +0 -177
  110. package/management-api/create-management-api-router.js +0 -49
  111. package/management-api/error-response.js +0 -116
  112. package/management-api/management-api-config.js +0 -151
  113. package/management-api/meta-router.js +0 -57
  114. package/management-api/openapi/build-openapi.js +0 -144
  115. package/management-api/openapi/components.js +0 -408
  116. package/management-api/openapi/v1-operations.js +0 -83
  117. package/management-api/openapi/v2-operations.js +0 -264
  118. package/management-api/route-registry.js +0 -294
  119. package/management-api/test-support/http-client.js +0 -39
  120. package/management-api/use-cases/get-management-api-meta.js +0 -57
  121. package/management-api/v1-deprecation.js +0 -120
  122. package/management-api/v2/create-v2-router.js +0 -85
  123. package/management-api/v2/dependencies.js +0 -281
  124. package/management-api/v2/dto.js +0 -143
  125. package/management-api/v2/handlers/authorization.js +0 -94
  126. package/management-api/v2/handlers/credentials.js +0 -33
  127. package/management-api/v2/handlers/entities.js +0 -77
  128. package/management-api/v2/handlers/integrations.js +0 -128
  129. package/management-api/v2/handlers/proxy.js +0 -34
  130. package/management-api/v2/request.js +0 -85
  131. package/management-api/v2/test-support/fake-dependencies.js +0 -103
  132. package/modules/domain/authorization-session.js +0 -144
  133. package/modules/entity-scope.js +0 -15
  134. package/modules/entity-type-registry.js +0 -311
  135. package/modules/proxy/proxy-errors.js +0 -20
  136. package/modules/proxy/proxy-path.js +0 -179
  137. package/modules/proxy/proxy-policy.js +0 -248
  138. package/modules/repositories/authorization-session-repository-documentdb.js +0 -112
  139. package/modules/repositories/authorization-session-repository-factory.js +0 -31
  140. package/modules/repositories/authorization-session-repository-interface.js +0 -47
  141. package/modules/repositories/authorization-session-repository-prisma.js +0 -87
  142. package/modules/repositories/entity-not-found.js +0 -18
  143. package/modules/requester/proxy-request.js +0 -244
  144. package/modules/scope-config.js +0 -192
  145. package/modules/scope-policy.js +0 -112
  146. package/modules/scope-resolution.js +0 -288
  147. package/modules/scope-visibility.js +0 -247
  148. package/modules/tests/doubles/in-memory-authorization-session-repository.js +0 -45
  149. package/modules/tests/doubles/ownership-matching.js +0 -18
  150. package/modules/use-cases/authorize-entity-for-user.js +0 -61
  151. package/modules/use-cases/create-entity-from-credential.js +0 -113
  152. package/modules/use-cases/entity-operations-for-user.js +0 -162
  153. package/modules/use-cases/entity-types.js +0 -139
  154. package/modules/use-cases/execute-entity-proxy-request.js +0 -286
  155. package/modules/use-cases/get-authorization-requirements.js +0 -100
  156. package/modules/use-cases/get-entity-module-for-user.js +0 -113
  157. package/modules/use-cases/manage-access.js +0 -21
  158. package/modules/use-cases/multi-step-authorization.js +0 -329
  159. package/prisma-postgresql/migrations/20261003000000_add_authorization_session/migration.sql +0 -28
  160. package/prisma-postgresql/migrations/20261015000000_add_organization_membership/migration.sql +0 -26
  161. package/prisma-postgresql/migrations/20261016000000_add_entity_integration_organization/migration.sql +0 -25
  162. package/prisma-postgresql/migrations/20261017000000_add_scheduled_job/migration.sql +0 -28
  163. package/providers/index.js +0 -13
  164. package/providers/resolve-provider.js +0 -93
  165. package/queues/providers/index.js +0 -11
  166. package/queues/providers/netlify-background-provider.js +0 -150
  167. package/queues/providers/qstash-queue-provider.js +0 -199
  168. package/queues/providers/sqs-queue-provider.js +0 -70
  169. package/queues/queue-client-interface.js +0 -55
  170. package/queues/queue-message-auth.js +0 -187
  171. package/queues/queue-provider-factory.js +0 -101
  172. package/queues/queue-provider.js +0 -65
  173. package/queues/sqs-queue-client.js +0 -81
  174. package/types/modules/index.d.ts +0 -197
  175. package/types/user/index.d.ts +0 -134
  176. package/user/adopter-jwt-config.js +0 -177
  177. package/user/adopter-jwt-errors.js +0 -59
  178. package/user/adopter-token-verifier.js +0 -122
  179. package/user/app-user-helpers.js +0 -97
  180. package/user/create-user-authentication.js +0 -64
  181. package/user/membership.js +0 -51
  182. package/user/repositories/organization-membership-record.js +0 -19
  183. package/user/repositories/organization-membership-repository-documentdb.js +0 -106
  184. package/user/repositories/organization-membership-repository-factory.js +0 -42
  185. package/user/repositories/organization-membership-repository-interface.js +0 -57
  186. package/user/repositories/organization-membership-repository-mongo.js +0 -13
  187. package/user/repositories/organization-membership-repository-postgres.js +0 -29
  188. package/user/repositories/organization-membership-repository-prisma.js +0 -81
  189. package/user/tests/doubles/adopter-jwt-fixtures.js +0 -220
  190. package/user/use-cases/ensure-organization-membership.js +0 -92
  191. package/user/use-cases/find-individual-users-by-organization.js +0 -54
package/CLAUDE.md CHANGED
@@ -332,14 +332,12 @@ class MyIntegration extends IntegrationBase {
332
332
  - Password-based (bcrypt hashed)
333
333
  - Token-based (Bearer tokens)
334
334
  - App-based (external app user IDs)
335
- - Adopter JWT (`authModes.adopterJwt`, `jwtConfig`; `jose`, JWKS or HMAC; see `README.md`)
336
335
 
337
336
  **Use Cases**:
338
337
  - `login-user.js` - User authentication
339
338
  - `create-individual-user.js` - Create personal account
340
339
  - `create-organization-user.js` - Create business account
341
340
  - `get-user-from-bearer-token.js` - Token authentication
342
- - `get-user-from-adopter-jwt.js` - Adopter JWT verification, find-or-create (ADR-056 §2); `adopter-jwt-config.js` validates `jwtConfig` at load
343
341
 
344
342
  **Repositories**:
345
343
  - `user-repository-factory.js` - Creates database-specific repositories
@@ -502,29 +500,6 @@ The single source of the max receive count is
502
500
  devtools integration builder uses it for the queue's `RedrivePolicy` and sets
503
501
  it as `FRIGG_QUEUE_MAX_RECEIVE_COUNT` on the queue worker function.
504
502
 
505
- ### Management API v2 notes (`/management-api`)
506
-
507
- - Handlers in `management-api/v2/handlers/` call use cases only; dependencies are wired in
508
- `management-api/v2/dependencies.js`. Errors are `{ error: { code, message, details? } }`.
509
- - `appDefinition.managementApi` is resolved by `resolveManagementApiConfig`, which `loadAppDefinition`
510
- also calls so a bad value stops the app at load. Numeric proxy limits fall back to their defaults;
511
- `proxy.scopes` (ADR-056 §3.5, default `['individual']`) never does: an unknown scope, `'global'`, a
512
- non-list, an empty list or a repeated scope throws `ManagementApiConfigError`
513
- (`MANAGEMENT_API_CONFIG_INVALID`).
514
- - **Entity proxy** (`ExecuteEntityProxyRequest`): visibility in the active organization comes from
515
- `GetEntityModuleForUser` (404), then `assertProxyable` reads the same `{ scope, access }` description
516
- the v2 lists return: `grantsUse(access)` (`use` or `manage`, from `modules/scope-visibility.js`) or 403
517
- `PROXY_NOT_ALLOWED` `reason: 'access'`, and the scope must be in `proxy.scopes` or 403 `reason: 'scope'`.
518
- Do not add a second ownership rule for the proxy; change the description instead.
519
- - **Not visible is 404, and so is missing.** Module repositories throw `entityNotFoundError(id)`
520
- (`modules/repositories/entity-not-found.js`) for a missing row and use cases match it with
521
- `isEntityNotFound`. A 500 for a missing id next to a 404 for another tenant's id tells a caller which
522
- ids exist. A test double that resolves `findEntityById` to `null` hides this: no adapter does that.
523
- - **Tenant isolation on real PostgreSQL**: `management-api/v2/tenant-isolation.postgres.test.js`, run with
524
- `FRIGG_TEST_POSTGRES_URL=<a database it may wipe>`. It applies the migrations, truncates every table
525
- before each test, and drives real adopter-JWT auth through the real router and Prisma repositories.
526
- Without the variable it is skipped (and says so), not passed. See `docs/guides/entity-scopes.md`.
527
-
528
503
  ### 8. Error Handling (`/errors`)
529
504
 
530
505
  **Purpose**: Standardized error types with proper HTTP semantics.
@@ -775,9 +750,6 @@ Use test doubles from `@friggframework/test` package for consistent mocking.
775
750
  - `SECRET_ARN` - AWS Secrets Manager ARN for auto-injection
776
751
  - `FRIGG_LOG_LEVEL` - Minimum log level (`TRACE` … `FATAL`, default `INFO`; `DEBUG` on local runs)
777
752
  - `FRIGG_QUEUE_MAX_RECEIVE_COUNT` - Set by devtools on integration queue workers whose queue the stack owns; feeds `delivery.maxReceiveCount`
778
- - `FRIGG_QUEUE_SIGNING_SECRET` - Required for HTTP-delivered queues (Netlify Background Functions). `NetlifyBackgroundProvider` signs each message (HMAC-SHA256 over `timestamp.rawBody`, `x-frigg-queue-signature` / `x-frigg-queue-timestamp`) and `verifyEvent()` refuses anything unsigned, tampered, signed with another secret or older than 5 minutes. Unset → `send()` throws and every event is refused (`queues/queue-message-auth.js`)
779
- - `FRIGG_QUEUE_ALLOW_UNSIGNED` - `true` accepts unsigned queue messages when no secret is set, outside production only (`STAGE` dev/test/local, `NODE_ENV` development/test, or `NETLIFY_DEV`); ignored in production
780
- - `QSTASH_CURRENT_SIGNING_KEY` / `QSTASH_NEXT_SIGNING_KEY` - Required with the QStash queue: `QStashQueueProvider.verifyEvent()` checks the `Upstash-Signature` JWT with them
781
753
 
782
754
  ## Version Information
783
755
 
package/README.md CHANGED
@@ -305,7 +305,6 @@ Comprehensive user authentication and authorization system supporting both indiv
305
305
  - **Password-based**: Traditional username/password authentication
306
306
  - **Token-based**: Bearer token authentication with session management
307
307
  - **App-based**: External app user ID authentication (passwordless)
308
- - **Adopter token (JWT)**: A token issued by your own identity system, verified by Frigg and safe to send from a browser (see below)
309
308
 
310
309
  **Usage:**
311
310
  ```javascript
@@ -353,110 +352,6 @@ console.log('Individual user:', user.getIndividualUser());
353
352
  console.log('Organization user:', user.getOrganizationUser());
354
353
  ```
355
354
 
356
- #### Adopter token (JWT) authentication
357
-
358
- For a multi-tenant product (ADR-056 §2), let the browser send the token your identity system
359
- already issues. Frigg verifies the signature and claims, then finds or creates the individual
360
- user and the organization user the token names. Unlike `sharedSecret` (`x-frigg-*` headers), a
361
- token cannot name a user other than the one it was issued for, so it is safe in a browser.
362
-
363
- ```javascript
364
- // backend/index.js
365
- const appDefinition = {
366
- user: {
367
- primary: 'organization',
368
- individualUserRequired: true,
369
- organizationUserRequired: true,
370
- authModes: { adopterJwt: true, friggToken: false, sharedSecret: false },
371
- jwtConfig: {
372
- jwksUri: 'https://login.example.com/.well-known/jwks.json',
373
- issuer: 'https://login.example.com/',
374
- audience: 'my-frigg-api', // required with jwksUri
375
- },
376
- },
377
- };
378
- ```
379
-
380
- The client sends `Authorization: Bearer <token>`. `x-frigg-appuserid` / `x-frigg-apporgid`, if
381
- also sent, must match the token or the request is refused with 403. That match rule lives in
382
- `user/use-cases/authenticate-user.js` (`validateUserMatch`), not in the token verifier. A bearer
383
- value that is not a three-part JWT is not offered to the verifier at all; it falls through to
384
- `friggToken` (or is a 401 when that mode is off).
385
-
386
- | `jwtConfig` field | Default | Meaning |
387
- |---|---|---|
388
- | `jwksUri` | | Remote JWKS (rotating keys, one per verifier, cached by jose). Must be `https`; `http` only for `localhost`, `127.0.0.0/8` or `::1`. Set exactly one of this and `secret`. |
389
- | `secret` | | Shared HMAC secret. Read it from an environment variable. |
390
- | `issuer` | not checked | Required `iss`. With `jwksUri`, a startup warning is logged when it is unset. |
391
- | `audience` | not checked with `secret`; **required with `jwksUri`** | Accepted `aud` (a string or a list). |
392
- | `algorithms` | `['ES256','RS256']` with `jwksUri`, `['HS256']` with `secret` | Allow-list. HS* is only accepted with `secret`, never with `jwksUri`. The older single `algorithm` is a deprecated alias; setting both is an error. |
393
- | `clockToleranceSec` | `30` | Skew allowed on `exp` and `nbf`. |
394
- | `userIdClaim` | `sub` | App user id (required in the token). |
395
- | `orgIdClaim` | `org_id` | App organization id (optional). |
396
- | `roleClaim` | `org_role` | Exposed as `user.getOrgRole()` for the request, and stored as the `orgRole` of a person's membership the first time they join that organization (`MEMBER` when the token names none). For permissions the token's role wins; a token with none uses the role stored on the person's membership of the active organization, and is a member when there is none: it cannot create or change organization-level entities or integrations. `user.orgAdminRoles` (default `['ADMIN']`) names the roles that can. Frigg bearer tokens are not gated unless `user.orgAdminGateBearerTokens: true`. |
397
-
398
- Rules worth knowing:
399
-
400
- - Tokens must carry `exp`. `alg: none` and any algorithm outside the allow-list are refused.
401
- - Startup fails (`loadAppDefinition` throws) when `adopterJwt` is on and the config is unusable:
402
- neither or both of `jwksUri` and `secret`, a `jwksUri` that is not https (or loopback http),
403
- no `audience` with `jwksUri`, or an algorithm list that does not fit the key type.
404
- - Failures are `401` with a stable `data.reason`: `token_expired`, `token_not_yet_valid`,
405
- `token_invalid_signature`, `token_wrong_issuer`, `token_wrong_audience`,
406
- `token_missing_user_claim`, `token_malformed`. The message never contains the token or its claims.
407
- Any other verification failure, such as an unreachable or unresolvable JWKS, is `503`
408
- `jwks_unavailable`, not a 401, so clients do not drop good sessions.
409
- - **The token's organization is the request's active organization**, and a person can belong to
410
- several (ADR-056 §3.6). The first time a person presents a token for an organization they are
411
- not a member of, Frigg adds an `OrganizationMembership` and the request runs as that
412
- organization (`user.getActiveOrganizationId()`; `user.getId()` under `primary: 'organization'`).
413
- Nothing is moved: `IndividualUser.organizationId` is a legacy pointer, set only on a person's
414
- first link and read as an implicit membership. The same applies to `x-frigg-apporgid` with
415
- `sharedSecret`. With `user.strictMembership: true` those headers cannot add anyone to an organization
416
- that already existed (400 for a non-member, a brand-new `appUserId` included); only an organization
417
- the request itself creates is allowed. `strictUserValidation` is a deprecated alias with that same
418
- meaning. See
419
- [Organization memberships](../../docs/guides/organization-memberships.md). A token naming a second
420
- organization is no longer a `403` (`multi_org_unsupported` is gone).
421
- - Two first logins for the same new person or organization, even in different organizations, both
422
- succeed: a create that loses to a unique constraint finds the winner's row.
423
-
424
- #### Entity scopes and ownership (ADR-056 §3)
425
-
426
- Who owns an entity (a connected account) or an integration follows its **scope**, not `user.primary`:
427
-
428
- | Scope | Owned by | Created with |
429
- |---|---|---|
430
- | `individual` | the person (`individualUser`) | the active organization (`organizationId`), or none under `individualAcross: 'all'` |
431
- | `organization` | the active organization's user | that organization |
432
- | `global` | nobody (the app owner) | none; refused by the tenant API (admin routes only) |
433
-
434
- The scope of a new connection is the first of: the request (`scope` on `POST /api/v2/authorize`, only from
435
- the deciding level's `allow` list), the integration binding (`Definition.modules[key].scope` or
436
- `Definition.entities[key].scope`), `Definition.ownership.scope`, the entity type
437
- (`appDefinition.entities[name].scope`), `appDefinition.ownership.scope`, then `organization` for an
438
- organization-primary app and `individual` otherwise. A setting is `'organization'` or
439
- `{ default: 'individual', allow: ['individual', 'organization'] }`.
440
-
441
- ```javascript
442
- const appDefinition = {
443
- user: { primary: 'individual', authModes: { adopterJwt: true } },
444
- ownership: { scope: 'individual', individualAcross: 'organization' }, // the defaults
445
- entities: {
446
- google: { definition: google, scope: 'individual' },
447
- xero: { definition: xero, scope: { default: 'organization', allow: ['organization', 'individual'] } },
448
- },
449
- integrations: [Sync], // Sync.Definition.ownership = { owner: 'derive' }
450
- };
451
- ```
452
-
453
- `GET /api/v2/entities` and `/integrations` return, for the active organization, its own
454
- rows and the caller's, each with `scope`, `owner`, `organizationId` and `access`, and take `?scope=` and
455
- `?owner=me|org`. An individual entity is only visible and usable in the organization it was connected in
456
- (or in all of them, with `individualAcross: 'all'`). Rows written before this existed keep working: see
457
- [Entity scopes](../../docs/guides/entity-scopes.md), which also covers the schema (`organizationId` on
458
- `Entity` and `Integration`, no `scope` column) and what is deferred.
459
-
460
355
  ### 8. Lambda Utilities (`/lambda`)
461
356
 
462
357
  AWS Lambda-specific utilities and helpers.
@@ -7,6 +7,13 @@ const ERROR_CODE_MAP = {
7
7
  INVALID_ENTITY_DATA: 400,
8
8
  };
9
9
 
10
+ function toCredentialId(credential) {
11
+ if (credential && typeof credential === 'object') {
12
+ return (credential.id ?? credential._id)?.toString() ?? null;
13
+ }
14
+ return credential ?? null;
15
+ }
16
+
10
17
  function mapErrorToResponse(error) {
11
18
  const status = ERROR_CODE_MAP[error?.code] || 500;
12
19
  return {
@@ -72,9 +79,7 @@ function createEntityCommands() {
72
79
  externalId: entity.externalId,
73
80
  name: entity.name,
74
81
  moduleName: entity.moduleName,
75
- credentialId: entity.credential?._id
76
- ? entity.credential._id.toString()
77
- : entity.credential,
82
+ credentialId: toCredentialId(entity.credential),
78
83
  };
79
84
  } catch (error) {
80
85
  return mapErrorToResponse(error);
@@ -115,9 +120,7 @@ function createEntityCommands() {
115
120
  externalId: entity.externalId,
116
121
  name: entity.name,
117
122
  moduleName: entity.moduleName,
118
- credentialId: entity.credential?._id
119
- ? entity.credential._id.toString()
120
- : entity.credential,
123
+ credentialId: toCredentialId(entity.credential),
121
124
  };
122
125
  } catch (error) {
123
126
  return mapErrorToResponse(error);
@@ -145,9 +148,7 @@ function createEntityCommands() {
145
148
  externalId: entity.externalId,
146
149
  name: entity.name,
147
150
  moduleName: entity.moduleName,
148
- credentialId: entity.credential?._id
149
- ? entity.credential._id.toString()
150
- : entity.credential,
151
+ credentialId: toCredentialId(entity.credential),
151
152
  }));
152
153
  } catch (error) {
153
154
  if (error.code) {
@@ -186,9 +187,7 @@ function createEntityCommands() {
186
187
  externalId: entity.externalId,
187
188
  name: entity.name,
188
189
  moduleName: entity.moduleName,
189
- credentialId: entity.credential?._id
190
- ? entity.credential._id.toString()
191
- : entity.credential,
190
+ credentialId: toCredentialId(entity.credential),
192
191
  }));
193
192
  } catch (error) {
194
193
  if (error.code) {
@@ -219,9 +218,7 @@ function createEntityCommands() {
219
218
  externalId: entity.externalId,
220
219
  name: entity.name,
221
220
  moduleName: entity.moduleName,
222
- credentialId: entity.credential?._id
223
- ? entity.credential._id.toString()
224
- : entity.credential,
221
+ credentialId: toCredentialId(entity.credential),
225
222
  };
226
223
  } catch (error) {
227
224
  return mapErrorToResponse(error);
@@ -256,9 +253,7 @@ function createEntityCommands() {
256
253
  externalId: entity.externalId,
257
254
  name: entity.name,
258
255
  moduleName: entity.moduleName,
259
- credentialId: entity.credential?._id
260
- ? entity.credential._id.toString()
261
- : entity.credential,
256
+ credentialId: toCredentialId(entity.credential),
262
257
  };
263
258
  } catch (error) {
264
259
  return mapErrorToResponse(error);
@@ -18,7 +18,7 @@ const {
18
18
  ListIntegrationsByEntityExternalIdUseCase,
19
19
  } = require('../../integrations/use-cases/list-integrations-by-entity-external-id');
20
20
  const {
21
- GetIntegrationsByUserId,
21
+ GetIntegrationsForUser,
22
22
  } = require('../../integrations/use-cases/get-integrations-for-user');
23
23
  const {
24
24
  CreateIntegration,
@@ -30,9 +30,8 @@ const {
30
30
  PatchIntegrationConfig,
31
31
  } = require('../../integrations/use-cases/patch-integration-config');
32
32
  const {
33
- getEntityTypeRegistry,
34
- getEntityTypeDefinitions,
35
- } = require('../../modules/entity-type-registry');
33
+ getModulesDefinitionFromIntegrationClasses,
34
+ } = require('../../integrations/utils/map-integration-dto');
36
35
 
37
36
  const ERROR_CODE_MAP = {
38
37
  ENTITY_NOT_FOUND: 401,
@@ -52,16 +51,7 @@ function mapErrorToResponse(error) {
52
51
  };
53
52
  }
54
53
 
55
- /**
56
- * @param {Object} [params]
57
- * @param {Function} [params.integrationClass]
58
- * @param {Array<object>} [params.moduleDefinitions] - the app's offered module
59
- * definitions (`loadAppDefinition().moduleDefinitions`). Integration code
60
- * calls this from a constructor with no app definition in hand, so when it
61
- * is omitted the commands hydrate with this integration's own modules only
62
- * (a registry built from `{ integrations: [integrationClass] }`).
63
- */
64
- function createIntegrationCommands({ integrationClass, moduleDefinitions } = {}) {
54
+ function createIntegrationCommands({ integrationClass } = {}) {
65
55
  // Always use Frigg's default repositories and use cases
66
56
  const integrationRepository = createIntegrationRepository();
67
57
 
@@ -118,13 +108,13 @@ function createIntegrationCommands({ integrationClass, moduleDefinitions } = {})
118
108
 
119
109
  const moduleRepository = createModuleRepository();
120
110
 
111
+ const moduleDefinitions = getModulesDefinitionFromIntegrationClasses([
112
+ integrationClass,
113
+ ]);
114
+
121
115
  const moduleFactory = new ModuleFactory({
122
116
  moduleRepository,
123
- moduleDefinitions:
124
- moduleDefinitions ??
125
- getEntityTypeDefinitions(
126
- getEntityTypeRegistry({ integrations: [integrationClass] })
127
- ),
117
+ moduleDefinitions,
128
118
  });
129
119
 
130
120
  const loadIntegrationContextUseCase = new LoadIntegrationContextUseCase({
@@ -152,7 +142,7 @@ function createIntegrationCommands({ integrationClass, moduleDefinitions } = {})
152
142
  moduleRepository,
153
143
  });
154
144
 
155
- const getIntegrationsForUserUseCase = new GetIntegrationsByUserId({
145
+ const getIntegrationsForUserUseCase = new GetIntegrationsForUser({
156
146
  integrationRepository,
157
147
  integrationClasses: [integrationClass],
158
148
  moduleFactory,
@@ -121,19 +121,17 @@ function createSchedulerCommands({ integrationName, schedulerService }) {
121
121
  throw error;
122
122
  }
123
123
 
124
- // An adapter with its own notion of a queue target (Netlify:
125
- // the worker function) resolves it; otherwise the target is
126
- // an SQS queue and its URL is required.
127
- const service = getSchedulerService();
128
- const resolvesOwnTarget =
129
- typeof service?.toQueueResourceId === 'function';
130
-
131
- if (!queueUrl && !resolvesOwnTarget) {
124
+ if (!queueUrl) {
132
125
  const error = new Error('queueUrl is required');
133
126
  error.code = 'INVALID_JOB_DATA';
134
127
  throw error;
135
128
  }
136
129
 
130
+ // Derive ARN from URL (business logic - transformation)
131
+ const queueArn = deriveArnFromQueueUrl(queueUrl);
132
+
133
+ // Get scheduler service (via DI or factory)
134
+ const service = getSchedulerService();
137
135
  if (!service) {
138
136
  console.warn(
139
137
  `[${integrationName}] Scheduler not configured, skipping job schedule`
@@ -159,9 +157,7 @@ function createSchedulerCommands({ integrationName, schedulerService }) {
159
157
  const result = await service.scheduleOneTime({
160
158
  scheduleName: jobId,
161
159
  scheduleAt: scheduledAt,
162
- queueResourceId: resolvesOwnTarget
163
- ? service.toQueueResourceId(queueUrl)
164
- : deriveArnFromQueueUrl(queueUrl),
160
+ queueResourceId: queueArn,
165
161
  payload: sqsPayload,
166
162
  });
167
163
 
@@ -1,12 +1,6 @@
1
1
  const {
2
2
  createUserRepository,
3
3
  } = require('../../user/repositories/user-repository-factory');
4
- const {
5
- createOrganizationMembershipRepository,
6
- } = require('../../user/repositories/organization-membership-repository-factory');
7
- const {
8
- FindIndividualUsersByOrganization,
9
- } = require('../../user/use-cases/find-individual-users-by-organization');
10
4
 
11
5
  const ERROR_CODE_MAP = {
12
6
  USER_NOT_FOUND: 404,
@@ -32,12 +26,6 @@ function mapErrorToResponse(error) {
32
26
  */
33
27
  function createUserCommands() {
34
28
  const userRepository = createUserRepository();
35
- const findIndividualUsersByOrganization =
36
- new FindIndividualUsersByOrganization({
37
- userRepository,
38
- organizationMembershipRepository:
39
- createOrganizationMembershipRepository(),
40
- });
41
29
 
42
30
  return {
43
31
  /**
@@ -182,8 +170,7 @@ function createUserCommands() {
182
170
  },
183
171
 
184
172
  /**
185
- * Find all individual users who belong to an organization user: those with
186
- * a membership and those the legacy organizationId pointer places there.
173
+ * Find all individual users linked to an organization user
187
174
  * @param {string} organizationUserId - Organization user ID to search for
188
175
  * @returns {Promise<Object[]>} Array of individual user objects (empty if none)
189
176
  */
@@ -195,9 +182,10 @@ function createUserCommands() {
195
182
  throw error;
196
183
  }
197
184
 
198
- const users = await findIndividualUsersByOrganization.execute(
199
- organizationUserId
200
- );
185
+ const users =
186
+ await userRepository.findIndividualUsersByOrganizationId(
187
+ organizationUserId
188
+ );
201
189
 
202
190
  return (users || []).map((user) => ({
203
191
  id: user._id?.toString() || user.id,
@@ -17,7 +17,6 @@ const { createUsageCommands } = require('./commands/usage-commands');
17
17
  *
18
18
  * @param {Object} params
19
19
  * @param {Object} params.integrationClass - Integration class (required)
20
- * @param {Array<object>} [params.moduleDefinitions] - the app's offered module definitions; defaults to the integration's own modules
21
20
  * @returns {Object} Unified commands object with all CRUD operations
22
21
  *
23
22
  * @example
@@ -25,12 +24,9 @@ const { createUsageCommands } = require('./commands/usage-commands');
25
24
  * const user = await commands.createUser({ username: 'user@example.com' });
26
25
  * const credential = await commands.createCredential({ userId: user.id, ... });
27
26
  */
28
- function createFriggCommands({ integrationClass, moduleDefinitions }) {
27
+ function createFriggCommands({ integrationClass }) {
29
28
  // All commands use Frigg's default repositories and use cases
30
- const integrationCommands = createIntegrationCommands({
31
- integrationClass,
32
- moduleDefinitions,
33
- });
29
+ const integrationCommands = createIntegrationCommands({ integrationClass });
34
30
 
35
31
  const userCommands = createUserCommands();
36
32
 
package/core/Worker.js CHANGED
@@ -1,3 +1,4 @@
1
+ const { SQSClient, GetQueueUrlCommand, SendMessageCommand } = require('@aws-sdk/client-sqs');
1
2
  const _ = require('lodash');
2
3
  const { RequiredPropertyError } = require('../errors');
3
4
  const { get } = require('../assertions');
@@ -5,44 +6,18 @@ const { readQueueDelivery } = require('../queues/queue-delivery');
5
6
  const { runMessageScope } = require('./invocation-scope');
6
7
  const { getLogger } = require('../logs');
7
8
 
9
+ const sqs = new SQSClient({ region: process.env.AWS_REGION });
8
10
  const log = getLogger('frigg.worker');
9
11
 
10
- /**
11
- * Worker - queue message producer/consumer base class.
12
- *
13
- * Subclass and override _run(). The queue transport is behind
14
- * QueueClientInterface and can be injected (friggframework/frigg#545):
15
- * `new MyWorker({ queueClient })`. Unlike #545 it is not required: without
16
- * one the worker uses an SqsQueueClient configured exactly as before
17
- * (AWS_REGION), created on first use rather than at module load, so
18
- * requiring core constructs no AWS client and a Netlify/QStash worker that
19
- * only calls _run() never touches SQS.
20
- */
21
12
  class Worker {
22
- /**
23
- * @param {Object} [options]
24
- * @param {import('../queues/queue-client-interface').QueueClientInterface} [options.queueClient]
25
- */
26
- constructor(options = {}) {
27
- this._queueClient = options.queueClient || null;
28
- }
29
-
30
- _getQueueClient() {
31
- if (!this._queueClient) {
32
- const { SqsQueueClient } = require('../queues/sqs-queue-client');
33
- this._queueClient = new SqsQueueClient({
34
- clientConfig: { region: process.env.AWS_REGION },
35
- });
36
- }
37
- return this._queueClient;
38
- }
39
-
40
13
  async getQueueURL(params) {
41
14
  // Passing params in because there will be multiple QueueNames
42
15
  // let params = {
43
16
  // QueueName: process.env.QueueName
44
17
  // };
45
- return this._getQueueClient().getQueueUrl(params);
18
+ const command = new GetQueueUrlCommand(params);
19
+ const data = await sqs.send(command);
20
+ return data.QueueUrl;
46
21
  }
47
22
 
48
23
  async run(params, context = {}) {
@@ -116,7 +91,8 @@ class Worker {
116
91
  }
117
92
 
118
93
  async sendAsyncSQSMessage(params) {
119
- const data = await this._getQueueClient().sendMessage(params);
94
+ const command = new SendMessageCommand(params);
95
+ const data = await sqs.send(command);
120
96
  return data.MessageId;
121
97
  }
122
98
 
@@ -81,15 +81,6 @@ const createHandler = (optionByName = {}) => {
81
81
  if (shouldUseDatabase) {
82
82
  const { connectPrisma } = require('../database/prisma');
83
83
  await connectPrisma();
84
-
85
- // Extension bootstraps (e.g. db-credentials swapping a
86
- // module's env for its DB loader) run once per
87
- // process, after the connect and before any request
88
- // builds a module. AWS and Netlify both reach here.
89
- const {
90
- initializeApp,
91
- } = require('../extensions/initialize-app');
92
- await initializeApp();
93
84
  }
94
85
 
95
86
  // Helps reuse the database connection. Lowers response times.
@@ -186,40 +186,6 @@ class CredentialRepositoryDocumentDB extends CredentialRepositoryInterface {
186
186
  return this._mapCredential(decryptedCredential);
187
187
  }
188
188
 
189
- /**
190
- * All credentials owned by a user, newest first.
191
- *
192
- * @param {string} userId - User ID
193
- * @returns {Promise<Array<Object>>} Credentials with string IDs
194
- */
195
- async findCredentialsByUserId(userId) {
196
- const userObjectId = toObjectId(userId);
197
- if (!userObjectId) return [];
198
- const docs = await findManyDrained(
199
- this.prisma,
200
- 'Credential',
201
- { userId: userObjectId },
202
- { sort: { createdAt: -1 } }
203
- );
204
- const credentials = [];
205
- for (const doc of docs) {
206
- const decrypted = await this.encryptionService.decryptFields(
207
- 'Credential',
208
- doc
209
- );
210
- credentials.push({
211
- ...this._mapCredential(decrypted),
212
- id: fromObjectId(doc._id),
213
- userId: fromObjectId(doc.userId) ?? doc.userId,
214
- externalId: doc.externalId ?? null,
215
- authIsValid: doc.authIsValid ?? null,
216
- createdAt: doc.createdAt ?? null,
217
- updatedAt: doc.updatedAt ?? null,
218
- });
219
- }
220
- return credentials;
221
- }
222
-
223
189
  async updateCredential(credentialId, updates) {
224
190
  const objectId = toObjectId(credentialId);
225
191
  if (!objectId) return null;
@@ -80,21 +80,6 @@ class CredentialRepositoryInterface {
80
80
  );
81
81
  }
82
82
 
83
- /**
84
- * All credentials owned by a user, newest first.
85
- *
86
- * @param {string|number} userId - User ID (string from application layer)
87
- * @returns {Promise<Array<Object>>} Credentials with string IDs, `createdAt`
88
- * and `updatedAt`, and the (decrypted) data fields spread in, as
89
- * findCredentialById returns them. Empty when the user has none.
90
- * @abstract
91
- */
92
- async findCredentialsByUserId(userId) {
93
- throw new Error(
94
- 'Method findCredentialsByUserId must be implemented by subclass'
95
- );
96
- }
97
-
98
83
  /**
99
84
  * Update a credential by ID
100
85
  *
@@ -188,29 +188,6 @@ class CredentialRepositoryMongo extends CredentialRepositoryInterface {
188
188
  };
189
189
  }
190
190
 
191
- /**
192
- * All credentials owned by a user, newest first.
193
- *
194
- * @param {string} userId - User ID
195
- * @returns {Promise<Array<Object>>} Credentials with string IDs
196
- */
197
- async findCredentialsByUserId(userId) {
198
- if (!userId) return [];
199
- const credentials = await this.prisma.credential.findMany({
200
- where: { userId: String(userId) },
201
- orderBy: { createdAt: 'desc' },
202
- });
203
- return credentials.map((credential) => ({
204
- ...(credential.data || {}),
205
- id: credential.id,
206
- userId: credential.userId,
207
- externalId: credential.externalId,
208
- authIsValid: credential.authIsValid,
209
- createdAt: credential.createdAt,
210
- updatedAt: credential.updatedAt,
211
- }));
212
- }
213
-
214
191
  /**
215
192
  * Update a credential by ID
216
193
  * Replaces: Credential.findByIdAndUpdate(credentialId, { $set: updates })
@@ -205,34 +205,6 @@ class CredentialRepositoryPostgres extends CredentialRepositoryInterface {
205
205
  };
206
206
  }
207
207
 
208
- /**
209
- * All credentials owned by a user, newest first.
210
- *
211
- * @param {string} userId - User ID (string from application layer)
212
- * @returns {Promise<Array<Object>>} Credentials with string IDs
213
- */
214
- async findCredentialsByUserId(userId) {
215
- let intUserId;
216
- try {
217
- intUserId = this._convertId(userId);
218
- } catch {
219
- return [];
220
- }
221
- const credentials = await this.prisma.credential.findMany({
222
- where: { userId: intUserId },
223
- orderBy: { createdAt: 'desc' },
224
- });
225
- return credentials.map((credential) => ({
226
- ...(credential.data || {}),
227
- id: credential.id.toString(),
228
- userId: credential.userId?.toString(),
229
- externalId: credential.externalId,
230
- authIsValid: credential.authIsValid,
231
- createdAt: credential.createdAt,
232
- updatedAt: credential.updatedAt,
233
- }));
234
- }
235
-
236
208
  /**
237
209
  * Update a credential by ID
238
210
  *