@friggframework/core 2.0.0--canary.680.d670696.0 → 2.0.0--canary.686.df38e8e.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 +5 -3
- package/CLAUDE.md +28 -0
- package/README.md +105 -0
- package/application/commands/integration-commands.js +2 -2
- package/application/commands/scheduler-commands.js +11 -7
- package/application/commands/user-commands.js +17 -5
- package/core/Worker.js +31 -7
- package/core/create-handler.js +9 -0
- package/credential/use-cases/credential-operations-for-user.js +110 -25
- package/credential/use-cases/reauthorize-credential-for-user.js +15 -8
- package/database/config.js +48 -24
- package/database/documentdb-encryption-service.js +1 -0
- package/database/documentdb-utils.js +6 -1
- package/database/encryption/encryption-config.js +13 -44
- package/database/encryption/encryption-schema-registry.js +88 -31
- package/database/organization-where.js +18 -0
- package/database/prisma.js +4 -2
- package/database/unique-violation.js +25 -0
- package/extensions/bootstrap-runner.js +43 -0
- package/extensions/extension-loader.js +187 -0
- package/extensions/index.js +41 -0
- package/extensions/initialize-app.js +123 -0
- package/extensions/route-mounter.js +103 -0
- package/extensions/schema-composer.js +188 -0
- package/generated/prisma-mongodb/edge.js +27 -4
- package/generated/prisma-mongodb/index-browser.js +24 -1
- package/generated/prisma-mongodb/index.d.ts +3227 -47
- package/generated/prisma-mongodb/index.js +27 -4
- package/generated/prisma-mongodb/package.json +1 -1
- package/generated/prisma-mongodb/schema.prisma +65 -0
- package/generated/prisma-mongodb/wasm.js +27 -4
- package/generated/prisma-postgresql/edge.js +27 -4
- package/generated/prisma-postgresql/index-browser.js +24 -1
- package/generated/prisma-postgresql/index.d.ts +3519 -67
- package/generated/prisma-postgresql/index.js +27 -4
- package/generated/prisma-postgresql/package.json +1 -1
- package/generated/prisma-postgresql/schema.prisma +61 -0
- package/generated/prisma-postgresql/wasm.js +27 -4
- package/handlers/app-definition-loader.js +103 -12
- package/handlers/routers/auth.js +40 -12
- package/handlers/routers/health.js +4 -2
- package/handlers/routers/integration-defined-routers.js +144 -92
- package/handlers/routers/integration-webhook-routers.js +102 -64
- package/index.js +63 -1
- package/infrastructure/scheduler/index.js +19 -6
- package/infrastructure/scheduler/netlify-scheduler-adapter.js +220 -0
- package/infrastructure/scheduler/scheduled-job-repository.js +118 -0
- package/infrastructure/scheduler/scheduler-service-factory.js +55 -7
- package/integrations/index.js +5 -0
- package/integrations/integration-router.js +115 -73
- package/integrations/repositories/integration-not-found.js +14 -0
- package/integrations/repositories/integration-repository-documentdb.js +35 -3
- package/integrations/repositories/integration-repository-interface.js +17 -1
- package/integrations/repositories/integration-repository-mongo.js +59 -76
- package/integrations/repositories/integration-repository-postgres.js +62 -76
- package/integrations/schedule-config.js +80 -0
- package/integrations/tests/doubles/test-integration-repository.js +12 -1
- package/integrations/use-cases/create-integration.js +55 -20
- package/integrations/use-cases/dispatch-ongoing-syncs.js +100 -0
- package/integrations/use-cases/get-integrations-for-user.js +80 -40
- package/integrations/use-cases/index.js +7 -1
- package/integrations/use-cases/integration-operations-for-user.js +55 -24
- package/integrations/use-cases/resolve-integration-ownership.js +177 -0
- package/integrations/utils/map-integration-dto.js +44 -1
- package/management-api/management-api-config.js +71 -2
- package/management-api/meta-router.js +21 -2
- package/management-api/openapi/components.js +40 -0
- package/management-api/openapi/v2-operations.js +16 -4
- package/management-api/route-registry.js +123 -6
- package/management-api/v2/dependencies.js +40 -15
- package/management-api/v2/dto.js +20 -0
- package/management-api/v2/handlers/authorization.js +1 -0
- package/management-api/v2/handlers/credentials.js +6 -2
- package/management-api/v2/handlers/entities.js +10 -7
- package/management-api/v2/handlers/integrations.js +6 -3
- package/management-api/v2/request.js +32 -1
- package/modules/entity-scope.js +15 -0
- package/modules/index.js +8 -0
- package/modules/module-factory.js +12 -0
- package/modules/module.js +53 -2
- package/modules/repositories/entity-not-found.js +18 -0
- package/modules/repositories/module-repository-documentdb.js +51 -6
- package/modules/repositories/module-repository-interface.js +19 -2
- package/modules/repositories/module-repository-mongo.js +67 -74
- package/modules/repositories/module-repository-postgres.js +66 -74
- package/modules/repositories/module-repository.js +2 -1
- package/modules/scope-config.js +192 -0
- package/modules/scope-policy.js +112 -0
- package/modules/scope-resolution.js +288 -0
- package/modules/scope-visibility.js +247 -0
- package/modules/tests/doubles/ownership-matching.js +18 -0
- package/modules/use-cases/authorize-entity-for-user.js +61 -0
- package/modules/use-cases/create-entity-from-credential.js +113 -0
- package/modules/use-cases/entity-operations-for-user.js +50 -13
- package/modules/use-cases/entity-types.js +31 -7
- package/modules/use-cases/execute-entity-proxy-request.js +50 -3
- package/modules/use-cases/get-authorization-requirements.js +2 -2
- package/modules/use-cases/get-entities-for-user.js +26 -13
- package/modules/use-cases/get-entity-module-for-user.js +34 -7
- package/modules/use-cases/get-entity-options-by-id.js +10 -4
- 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 +10 -4
- package/modules/use-cases/manage-access.js +21 -0
- package/modules/use-cases/multi-step-authorization.js +40 -13
- package/modules/use-cases/process-authorization-callback.js +53 -19
- package/modules/use-cases/refresh-entity-options.js +10 -4
- package/modules/use-cases/test-module-auth.js +10 -4
- package/package.json +6 -5
- package/prisma-mongodb/schema.prisma +65 -0
- package/prisma-postgresql/migrations/20261015000000_add_organization_membership/migration.sql +26 -0
- package/prisma-postgresql/migrations/20261016000000_add_entity_integration_organization/migration.sql +25 -0
- package/prisma-postgresql/migrations/20261017000000_add_scheduled_job/migration.sql +28 -0
- package/prisma-postgresql/schema.prisma +61 -0
- package/providers/index.js +23 -0
- package/providers/resolve-provider.js +93 -0
- package/providers/runtime-detection.js +124 -0
- package/queues/index.js +25 -0
- package/queues/providers/index.js +11 -0
- package/queues/providers/netlify-background-provider.js +187 -0
- package/queues/providers/qstash-queue-provider.js +219 -0
- package/queues/providers/sqs-queue-provider.js +70 -0
- package/queues/queue-client-interface.js +55 -0
- package/queues/queue-message-auth.js +193 -0
- package/queues/queue-provider-factory.js +101 -0
- package/queues/queue-provider.js +65 -0
- package/queues/sqs-queue-client.js +81 -0
- package/types/index.d.ts +1 -0
- package/types/modules/index.d.ts +139 -0
- package/types/user/index.d.ts +134 -0
- package/user/adopter-jwt-config.js +177 -0
- package/user/adopter-jwt-errors.js +59 -0
- package/user/adopter-token-verifier.js +122 -0
- package/user/app-user-helpers.js +97 -0
- package/user/create-user-authentication.js +64 -0
- package/user/membership.js +51 -0
- package/user/repositories/organization-membership-record.js +19 -0
- package/user/repositories/organization-membership-repository-documentdb.js +106 -0
- package/user/repositories/organization-membership-repository-factory.js +42 -0
- package/user/repositories/organization-membership-repository-interface.js +57 -0
- package/user/repositories/organization-membership-repository-mongo.js +13 -0
- package/user/repositories/organization-membership-repository-postgres.js +29 -0
- package/user/repositories/organization-membership-repository-prisma.js +81 -0
- package/user/repositories/user-repository-documentdb.js +27 -2
- package/user/repositories/user-repository-interface.js +18 -0
- package/user/repositories/user-repository-mongo.js +24 -0
- package/user/repositories/user-repository-postgres.js +18 -0
- package/user/tests/doubles/adopter-jwt-fixtures.js +220 -0
- package/user/use-cases/authenticate-user.js +7 -1
- package/user/use-cases/ensure-organization-membership.js +92 -0
- package/user/use-cases/find-individual-users-by-organization.js +54 -0
- package/user/use-cases/get-user-from-adopter-jwt.js +95 -124
- package/user/use-cases/get-user-from-x-frigg-headers.js +83 -80
- package/user/user.js +64 -1
package/database/config.js
CHANGED
|
@@ -3,6 +3,39 @@
|
|
|
3
3
|
* Manages configuration for Prisma ORM operations
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
+
/**
|
|
7
|
+
* Maps an app definition's `database` block to a Prisma database type.
|
|
8
|
+
*
|
|
9
|
+
* @param {Object|undefined} database - `Definition.database`
|
|
10
|
+
* @param {string} where - where the definition lives, for the error message
|
|
11
|
+
* @returns {'mongodb'|'postgresql'|'documentdb'}
|
|
12
|
+
*/
|
|
13
|
+
function databaseTypeFromConfig(database, where) {
|
|
14
|
+
if (!database) {
|
|
15
|
+
throw new Error(
|
|
16
|
+
'[Frigg] App definition missing database configuration. ' +
|
|
17
|
+
`Add database: { postgres: { enable: true } } (or mongoDB/documentDB) to ${where}`
|
|
18
|
+
);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
// Determine database type from enabled database
|
|
22
|
+
// Priority order: postgres > mongoDB > documentDB
|
|
23
|
+
if (database.postgres?.enable === true) {
|
|
24
|
+
return 'postgresql';
|
|
25
|
+
}
|
|
26
|
+
if (database.mongoDB?.enable === true) {
|
|
27
|
+
return 'mongodb';
|
|
28
|
+
}
|
|
29
|
+
if (database.documentDB?.enable === true) {
|
|
30
|
+
return 'documentdb';
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
throw new Error(
|
|
34
|
+
'[Frigg] No database enabled in app definition. ' +
|
|
35
|
+
'Set one of: database.postgres.enable, database.mongoDB.enable, or database.documentDB.enable to true'
|
|
36
|
+
);
|
|
37
|
+
}
|
|
38
|
+
|
|
6
39
|
/**
|
|
7
40
|
* Determines database type from environment or app definition
|
|
8
41
|
*
|
|
@@ -21,6 +54,20 @@ function getDatabaseType() {
|
|
|
21
54
|
|
|
22
55
|
// Fallback: Load app definition
|
|
23
56
|
try {
|
|
57
|
+
// A definition preset with setAppDefinition() (provider-netlify's
|
|
58
|
+
// function preamble) wins: on Netlify process.cwd() is the function
|
|
59
|
+
// root at runtime, so discovery cannot find the backend.
|
|
60
|
+
const {
|
|
61
|
+
getPresetAppDefinition,
|
|
62
|
+
} = require('../handlers/app-definition-loader');
|
|
63
|
+
const preset = getPresetAppDefinition();
|
|
64
|
+
if (preset) {
|
|
65
|
+
return databaseTypeFromConfig(
|
|
66
|
+
preset.database,
|
|
67
|
+
'your backend/index.js'
|
|
68
|
+
);
|
|
69
|
+
}
|
|
70
|
+
|
|
24
71
|
const path = require('node:path');
|
|
25
72
|
const fs = require('node:fs');
|
|
26
73
|
const { findNearestBackendPackageJson } = require('../utils');
|
|
@@ -76,30 +123,7 @@ function getDatabaseType() {
|
|
|
76
123
|
}
|
|
77
124
|
|
|
78
125
|
database = backendModule?.Definition?.database;
|
|
79
|
-
|
|
80
|
-
if (!database) {
|
|
81
|
-
throw new Error(
|
|
82
|
-
'[Frigg] App definition missing database configuration. ' +
|
|
83
|
-
`Add database: { postgres: { enable: true } } (or mongoDB/documentDB) to ${backendIndexPath}`
|
|
84
|
-
);
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
// Determine database type from enabled database
|
|
88
|
-
// Priority order: postgres > mongoDB > documentDB
|
|
89
|
-
if (database.postgres?.enable === true) {
|
|
90
|
-
return 'postgresql';
|
|
91
|
-
}
|
|
92
|
-
if (database.mongoDB?.enable === true) {
|
|
93
|
-
return 'mongodb';
|
|
94
|
-
}
|
|
95
|
-
if (database.documentDB?.enable === true) {
|
|
96
|
-
return 'documentdb';
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
throw new Error(
|
|
100
|
-
'[Frigg] No database enabled in app definition. ' +
|
|
101
|
-
'Set one of: database.postgres.enable, database.mongoDB.enable, or database.documentDB.enable to true'
|
|
102
|
-
);
|
|
126
|
+
return databaseTypeFromConfig(database, backendIndexPath);
|
|
103
127
|
} catch (error) {
|
|
104
128
|
// Re-throw with context if it's our error
|
|
105
129
|
if (error.message.includes('[Frigg]')) {
|
|
@@ -58,7 +58,12 @@ async function insertOne(client, collection, document) {
|
|
|
58
58
|
|
|
59
59
|
// Provide helpful context for common errors
|
|
60
60
|
if (error.code === 11000) {
|
|
61
|
-
|
|
61
|
+
// `code` lets callers recognise a lost race without parsing text
|
|
62
|
+
// (see database/unique-violation.js).
|
|
63
|
+
throw Object.assign(
|
|
64
|
+
new Error(`${errorMsg} - Duplicate key violation`),
|
|
65
|
+
{ code: 11000 }
|
|
66
|
+
);
|
|
62
67
|
}
|
|
63
68
|
throw new Error(errorMsg);
|
|
64
69
|
}
|
|
@@ -18,6 +18,9 @@
|
|
|
18
18
|
*/
|
|
19
19
|
|
|
20
20
|
const { logger } = require('./logger');
|
|
21
|
+
const {
|
|
22
|
+
isDeployedRuntime: isDeployedProviderRuntime,
|
|
23
|
+
} = require('../../providers/runtime-detection');
|
|
21
24
|
|
|
22
25
|
const LOCAL_BYPASS_STAGES = ['dev', 'test', 'local'];
|
|
23
26
|
const OPT_OUT_VAR = 'FRIGG_ENCRYPTION_DISABLED';
|
|
@@ -40,42 +43,18 @@ function isTrue(value) {
|
|
|
40
43
|
}
|
|
41
44
|
|
|
42
45
|
/**
|
|
43
|
-
* True when the process runs as a deployed function, on AWS Lambda or on
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
* CLI commands run from CI must not trip the deployed-stage check.
|
|
50
|
-
* - Other providers: FRIGG_PROVIDER names a non-AWS provider. Frigg's
|
|
51
|
-
* generated function entry points for that provider set it (provider-netlify
|
|
52
|
-
* sets 'netlify'), so it is present in every deployed function. Netlify
|
|
53
|
-
* exposes SITE_ID, CONTEXT and NETLIFY at build time only, so they cannot
|
|
54
|
-
* tell a running function from a laptop.
|
|
55
|
-
*
|
|
56
|
-
* A local run is never deployed: serverless-offline and `serverless invoke
|
|
57
|
-
* local` (which set the Lambda variables themselves) mark IS_OFFLINE /
|
|
58
|
-
* IS_LOCAL, `netlify dev` marks NETLIFY_DEV, and Jest marks JEST_WORKER_ID.
|
|
46
|
+
* True when the process runs as a deployed function, on AWS Lambda or on the
|
|
47
|
+
* active provider's platform (provider-netlify: FRIGG_PROVIDER=netlify, set by
|
|
48
|
+
* its generated entry points), and not under a local emulator or test runner.
|
|
49
|
+
* One rule for encryption and queue authentication: core/providers/
|
|
50
|
+
* runtime-detection asks the provider's detect(), and fails closed when a
|
|
51
|
+
* named non-AWS provider cannot be loaded.
|
|
59
52
|
*
|
|
60
53
|
* @param {Object} [env=process.env]
|
|
61
54
|
* @returns {boolean}
|
|
62
55
|
*/
|
|
63
56
|
function isDeployedRuntime(env = process.env) {
|
|
64
|
-
|
|
65
|
-
isTrue(env.IS_OFFLINE) ||
|
|
66
|
-
isTrue(env.IS_LOCAL) ||
|
|
67
|
-
isTrue(env.NETLIFY_DEV) ||
|
|
68
|
-
isSet(env.JEST_WORKER_ID);
|
|
69
|
-
if (localRun) return false;
|
|
70
|
-
|
|
71
|
-
const onAwsRuntime =
|
|
72
|
-
isSet(env.AWS_LAMBDA_FUNCTION_NAME) ||
|
|
73
|
-
isSet(env.LAMBDA_TASK_ROOT) ||
|
|
74
|
-
String(env.AWS_EXECUTION_ENV ?? '').startsWith('AWS_Lambda_');
|
|
75
|
-
if (onAwsRuntime) return true;
|
|
76
|
-
|
|
77
|
-
const provider = String(env.FRIGG_PROVIDER ?? '').trim().toLowerCase();
|
|
78
|
-
return provider !== '' && provider !== 'aws';
|
|
57
|
+
return isDeployedProviderRuntime(env);
|
|
79
58
|
}
|
|
80
59
|
|
|
81
60
|
function missingKeyMessage(stage) {
|
|
@@ -121,10 +100,6 @@ function resolveEncryptionConfig(env = process.env) {
|
|
|
121
100
|
const runtime = isDeployedRuntime(env) ? 'deployed' : 'local';
|
|
122
101
|
const hasKMS = isSet(env.KMS_KEY_ARN);
|
|
123
102
|
const hasAES = isSet(env.AES_KEY_ID);
|
|
124
|
-
// AES needs the key as well as its id, locally too: a cryptor built from
|
|
125
|
-
// the id alone cannot encrypt, and a local run reads failed decrypts as
|
|
126
|
-
// stored values, so an incomplete pair would hand back blobs as tokens.
|
|
127
|
-
const hasCompleteAES = hasAES && isSet(env.AES_KEY);
|
|
128
103
|
const optOutRequested = isTrue(env[OPT_OUT_VAR]);
|
|
129
104
|
|
|
130
105
|
const base = {
|
|
@@ -145,13 +120,14 @@ function resolveEncryptionConfig(env = process.env) {
|
|
|
145
120
|
if (LOCAL_BYPASS_STAGES.includes(String(stage).toLowerCase())) {
|
|
146
121
|
return { ...base, bypassed: true };
|
|
147
122
|
}
|
|
148
|
-
if (hasKMS ||
|
|
123
|
+
if (hasKMS || hasAES) {
|
|
149
124
|
const method = hasKMS ? 'kms' : 'aes';
|
|
150
125
|
return { ...base, enabled: true, method, mode: method };
|
|
151
126
|
}
|
|
152
127
|
return base;
|
|
153
128
|
}
|
|
154
129
|
|
|
130
|
+
const hasCompleteAES = hasAES && isSet(env.AES_KEY);
|
|
155
131
|
if (hasKMS || hasCompleteAES) {
|
|
156
132
|
const method = hasKMS ? 'kms' : 'aes';
|
|
157
133
|
return {
|
|
@@ -215,14 +191,7 @@ function getEncryptionConfig(env = process.env) {
|
|
|
215
191
|
);
|
|
216
192
|
}
|
|
217
193
|
|
|
218
|
-
if (config.runtime === 'local' && !config.enabled && !config.bypassed
|
|
219
|
-
warnOnce(
|
|
220
|
-
'local-incomplete-aes',
|
|
221
|
-
`AES_KEY_ID is set but AES_KEY is not for local stage "${config.stage}". ` +
|
|
222
|
-
'Field-level encryption disabled for this local run; set both to encrypt. ' +
|
|
223
|
-
'A deployed stage refuses to start without both.'
|
|
224
|
-
);
|
|
225
|
-
} else if (config.runtime === 'local' && !config.enabled && !config.bypassed) {
|
|
194
|
+
if (config.runtime === 'local' && !config.enabled && !config.bypassed) {
|
|
226
195
|
warnOnce(
|
|
227
196
|
'local-no-keys',
|
|
228
197
|
`No encryption keys configured (KMS_KEY_ARN or AES_KEY_ID) for local stage "${config.stage}". ` +
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
const { logger } = require('./logger');
|
|
12
|
-
const { isDeployedRuntime } = require('./encryption-config');
|
|
13
12
|
const { registerDeniedKeys } = require('../../logs/denied-keys');
|
|
14
13
|
const {
|
|
15
14
|
getEntityTypeRegistry,
|
|
@@ -230,35 +229,85 @@ function loadModuleEncryptionSchemas(integrations, entities) {
|
|
|
230
229
|
*
|
|
231
230
|
* Used by both Prisma (MongoDB/PostgreSQL) and DocumentDB encryption services.
|
|
232
231
|
*/
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
232
|
+
/**
|
|
233
|
+
* Registers encryption schemas declared by app-level extensions
|
|
234
|
+
* (`appDefinition.coreExtensions[].encryption`), e.g. the db-credentials
|
|
235
|
+
* extension's `OAuthAppCredential.clientSecret`.
|
|
236
|
+
*
|
|
237
|
+
* @param {Array<Object>} extensions - Normalized extensions (extension-loader)
|
|
238
|
+
*/
|
|
239
|
+
function loadExtensionEncryptionSchemas(extensions) {
|
|
240
|
+
if (!extensions || !Array.isArray(extensions) || extensions.length === 0) {
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
239
243
|
|
|
240
|
-
|
|
241
|
-
if (!
|
|
242
|
-
|
|
244
|
+
for (const ext of extensions) {
|
|
245
|
+
if (!ext.encryption || typeof ext.encryption !== 'object') {
|
|
246
|
+
continue;
|
|
243
247
|
}
|
|
244
248
|
|
|
245
|
-
const
|
|
246
|
-
const
|
|
249
|
+
const schema = {};
|
|
250
|
+
for (const [modelName, config] of Object.entries(ext.encryption)) {
|
|
251
|
+
if (config && Array.isArray(config.fields) && config.fields.length > 0) {
|
|
252
|
+
schema[modelName] = { fields: config.fields };
|
|
253
|
+
}
|
|
254
|
+
}
|
|
247
255
|
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
256
|
+
if (Object.keys(schema).length > 0) {
|
|
257
|
+
logger.info(
|
|
258
|
+
`Registering encryption schema from extension "${ext.name}" for models: ${Object.keys(schema).join(', ')}`
|
|
259
|
+
);
|
|
260
|
+
// registerCustomSchema replaces the registered schema, so merge:
|
|
261
|
+
// an extension adds its models to the app's encryption.schema
|
|
262
|
+
// rather than dropping it.
|
|
263
|
+
const merged = { ...customSchema };
|
|
264
|
+
for (const [modelName, config] of Object.entries(schema)) {
|
|
265
|
+
const existing = merged[modelName]?.fields || [];
|
|
266
|
+
merged[modelName] = {
|
|
267
|
+
...merged[modelName],
|
|
268
|
+
fields: [...new Set([...existing, ...config.fields])],
|
|
269
|
+
};
|
|
270
|
+
}
|
|
271
|
+
registerCustomSchema(merged);
|
|
272
|
+
}
|
|
255
273
|
}
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
function readAppDefinitionForEncryption() {
|
|
277
|
+
// Lazy require to avoid circular dependency issues
|
|
278
|
+
const {
|
|
279
|
+
getPresetAppDefinition,
|
|
280
|
+
} = require('../../handlers/app-definition-loader');
|
|
281
|
+
// A definition preset with setAppDefinition() (provider-netlify's
|
|
282
|
+
// preamble) wins: on Netlify process.cwd() cannot find the backend.
|
|
283
|
+
const preset = getPresetAppDefinition();
|
|
284
|
+
if (preset) {
|
|
285
|
+
return preset;
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
const path = require('node:path');
|
|
289
|
+
const { findNearestBackendPackageJson } = require('../../utils');
|
|
256
290
|
|
|
257
|
-
|
|
258
|
-
|
|
291
|
+
const backendPackagePath = findNearestBackendPackageJson();
|
|
292
|
+
if (!backendPackagePath) {
|
|
293
|
+
return null; // No backend found, skip custom schema
|
|
259
294
|
}
|
|
260
295
|
|
|
296
|
+
const backendDir = path.dirname(backendPackagePath);
|
|
297
|
+
const backendIndexPath = path.join(backendDir, 'index.js');
|
|
298
|
+
|
|
299
|
+
const backendModule = require(backendIndexPath);
|
|
300
|
+
return backendModule?.Definition || null;
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
function loadCustomEncryptionSchema() {
|
|
261
304
|
try {
|
|
305
|
+
const appDefinition = readAppDefinitionForEncryption();
|
|
306
|
+
|
|
307
|
+
if (!appDefinition) {
|
|
308
|
+
return; // No app definition found
|
|
309
|
+
}
|
|
310
|
+
|
|
262
311
|
// Load app-level custom schema
|
|
263
312
|
const customSchema = appDefinition.encryption?.schema;
|
|
264
313
|
if (customSchema && Object.keys(customSchema).length > 0) {
|
|
@@ -273,6 +322,15 @@ function loadCustomEncryptionSchema() {
|
|
|
273
322
|
registerEncryptionOptOut(disable);
|
|
274
323
|
}
|
|
275
324
|
|
|
325
|
+
// Load app-level extension encryption schemas. Before the module
|
|
326
|
+
// schemas: loadModuleEncryptionSchemas currently throws (see the
|
|
327
|
+
// NOTE inside it) and the throw would skip anything after it.
|
|
328
|
+
const { loadExtensions } = require('../../extensions/extension-loader');
|
|
329
|
+
const extensions = loadExtensions(appDefinition);
|
|
330
|
+
if (extensions.length > 0) {
|
|
331
|
+
loadExtensionEncryptionSchemas(extensions);
|
|
332
|
+
}
|
|
333
|
+
|
|
276
334
|
// Load module-level encryption schemas from integrations
|
|
277
335
|
const integrations = appDefinition.integrations;
|
|
278
336
|
if (Array.isArray(integrations) || appDefinition.entities) {
|
|
@@ -282,16 +340,14 @@ function loadCustomEncryptionSchema() {
|
|
|
282
340
|
);
|
|
283
341
|
}
|
|
284
342
|
} catch (error) {
|
|
285
|
-
//
|
|
286
|
-
|
|
287
|
-
//
|
|
288
|
-
//
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
logger.
|
|
293
|
-
`Encryption schema from the app definition could not be registered; those fields stay plaintext in this local run: ${error.message}`
|
|
294
|
-
);
|
|
343
|
+
// A bad entity registry is a configuration error, not "no custom schema".
|
|
344
|
+
if (error instanceof EntityRegistryError) throw error;
|
|
345
|
+
// Silently ignore errors - custom schema is optional
|
|
346
|
+
// This handles cases like:
|
|
347
|
+
// - Backend package.json not found (tests, standalone usage)
|
|
348
|
+
// - No appDefinition defined
|
|
349
|
+
// - No custom encryption schema specified
|
|
350
|
+
logger.debug('Could not load custom encryption schema:', error.message);
|
|
295
351
|
}
|
|
296
352
|
}
|
|
297
353
|
|
|
@@ -436,6 +492,7 @@ module.exports = {
|
|
|
436
492
|
registerEncryptionOptOut,
|
|
437
493
|
loadCustomEncryptionSchema,
|
|
438
494
|
loadModuleEncryptionSchemas,
|
|
495
|
+
loadExtensionEncryptionSchemas,
|
|
439
496
|
extractCredentialFieldsFromModules,
|
|
440
497
|
validateCustomSchema,
|
|
441
498
|
validateOptOut,
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The Prisma `where` fragment for an `organizationId` on MongoDB (ADR-056
|
|
3
|
+
* §3.6), shared by the entity and integration adapters.
|
|
4
|
+
*
|
|
5
|
+
* Prisma on MongoDB: `null` matches only an explicit null and `isSet: false`
|
|
6
|
+
* only a missing field. A row written before the column existed is the common
|
|
7
|
+
* "no organization" case, so `null` here means both.
|
|
8
|
+
*/
|
|
9
|
+
function organizationWhere(organizationId) {
|
|
10
|
+
if (organizationId === null) {
|
|
11
|
+
return {
|
|
12
|
+
OR: [{ organizationId: null }, { organizationId: { isSet: false } }],
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
return { organizationId };
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
module.exports = { organizationWhere };
|
package/database/prisma.js
CHANGED
|
@@ -41,13 +41,15 @@ const prismaClientSingleton = () => {
|
|
|
41
41
|
const paths = [
|
|
42
42
|
// Lambda layer location (when using Prisma Lambda layer)
|
|
43
43
|
`/opt/nodejs/node_modules/generated/prisma-${dbType}`,
|
|
44
|
+
// __dirname-based absolute path (Netlify functions and bundlers)
|
|
45
|
+
require('node:path').resolve(__dirname, `../generated/prisma-${dbType}`),
|
|
44
46
|
// Local development location (relative to core package)
|
|
45
47
|
`../generated/prisma-${dbType}`,
|
|
46
48
|
];
|
|
47
49
|
|
|
48
|
-
for (const
|
|
50
|
+
for (const candidate of paths) {
|
|
49
51
|
try {
|
|
50
|
-
return require(
|
|
52
|
+
return require(candidate).PrismaClient;
|
|
51
53
|
} catch (err) {
|
|
52
54
|
// Continue to next path
|
|
53
55
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/** Mongo/DocumentDB duplicate-key error code. */
|
|
2
|
+
const DUPLICATE_KEY_CODE = 11000;
|
|
3
|
+
/** Prisma's unique-constraint error code (PostgreSQL and MongoDB). */
|
|
4
|
+
const PRISMA_UNIQUE_CODE = 'P2002';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Whether `error` is a unique-constraint violation, however the database
|
|
8
|
+
* layer raised it: a Prisma `P2002`, or a duplicate-key `11000`
|
|
9
|
+
* (`documentdb-utils` `insertOne` sets `code` on the error it throws).
|
|
10
|
+
* Matches on the code only, never on message text.
|
|
11
|
+
*
|
|
12
|
+
* @param {unknown} error
|
|
13
|
+
* @returns {boolean}
|
|
14
|
+
*/
|
|
15
|
+
function isUniqueViolation(error) {
|
|
16
|
+
return (
|
|
17
|
+
error?.code === PRISMA_UNIQUE_CODE || error?.code === DUPLICATE_KEY_CODE
|
|
18
|
+
);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
module.exports = {
|
|
22
|
+
isUniqueViolation,
|
|
23
|
+
DUPLICATE_KEY_CODE,
|
|
24
|
+
PRISMA_UNIQUE_CODE,
|
|
25
|
+
};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bootstrap Runner
|
|
3
|
+
*
|
|
4
|
+
* Runs extension bootstrap functions in sequence.
|
|
5
|
+
* Bootstrap hooks execute AFTER database connection but BEFORE integration
|
|
6
|
+
* router creation. This is the right place for extensions to:
|
|
7
|
+
*
|
|
8
|
+
* - Load credentials from database into integration definitions
|
|
9
|
+
* - Register additional middleware or services
|
|
10
|
+
* - Perform one-time initialization
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* await runExtensionBootstraps(extensions, { prisma, appDefinition });
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Runs all extension bootstrap functions in sequence.
|
|
18
|
+
*
|
|
19
|
+
* @param {Array<Object>} extensions - Normalized extensions (from extension-loader)
|
|
20
|
+
* @param {Object} context
|
|
21
|
+
* @param {Object} context.prisma - Prisma client instance
|
|
22
|
+
* @param {Object} context.appDefinition - Full app definition
|
|
23
|
+
* @throws {Error} If any bootstrap function fails (fails fast)
|
|
24
|
+
*/
|
|
25
|
+
async function runExtensionBootstraps(extensions, context = {}) {
|
|
26
|
+
if (!extensions || extensions.length === 0) return;
|
|
27
|
+
|
|
28
|
+
const { prisma, appDefinition } = context;
|
|
29
|
+
|
|
30
|
+
for (const ext of extensions) {
|
|
31
|
+
if (!ext.bootstrap) continue;
|
|
32
|
+
|
|
33
|
+
try {
|
|
34
|
+
await ext.bootstrap(prisma, appDefinition);
|
|
35
|
+
} catch (error) {
|
|
36
|
+
throw new Error(
|
|
37
|
+
`Extension "${ext.name}" bootstrap failed: ${error.message}`
|
|
38
|
+
);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
module.exports = { runExtensionBootstraps };
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Extension Loader
|
|
3
|
+
*
|
|
4
|
+
* Validates and normalizes the core extensions of the app definition
|
|
5
|
+
* (`appDefinition.coreExtensions`, an array). Core extensions add custom
|
|
6
|
+
* Prisma models, encryption schemas, admin routes and bootstrap logic to a
|
|
7
|
+
* Frigg app. The key is `coreExtensions`, not `extensions`: ADR-017 keeps
|
|
8
|
+
* `appDefinition.extensions` for its keyed object form.
|
|
9
|
+
*
|
|
10
|
+
* @example
|
|
11
|
+
* const extensions = loadExtensions(appDefinition);
|
|
12
|
+
* // extensions is a normalized array, safe to iterate
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
const path = require('path');
|
|
16
|
+
const {
|
|
17
|
+
coreExtensionRoutePathError,
|
|
18
|
+
} = require('../management-api/route-registry');
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Validates a single extension definition.
|
|
22
|
+
* @param {Object} ext - Raw extension config from app definition
|
|
23
|
+
* @param {number} index - Position in the coreExtensions array (for error messages)
|
|
24
|
+
* @returns {{valid: boolean, errors: string[]}}
|
|
25
|
+
*/
|
|
26
|
+
function validateExtension(ext, index) {
|
|
27
|
+
const prefix = `coreExtensions[${index}]`;
|
|
28
|
+
const errors = [];
|
|
29
|
+
|
|
30
|
+
if (!ext || typeof ext !== 'object') {
|
|
31
|
+
errors.push(`${prefix}: must be an object`);
|
|
32
|
+
return { valid: false, errors };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
if (!ext.name || typeof ext.name !== 'string') {
|
|
36
|
+
errors.push(`${prefix}.name: required string`);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
// schema is optional — path to a .prisma file
|
|
40
|
+
if (ext.schema !== undefined) {
|
|
41
|
+
if (typeof ext.schema !== 'string') {
|
|
42
|
+
errors.push(`${prefix}.schema: must be a string (path to .prisma file)`);
|
|
43
|
+
} else if (!ext.schema.endsWith('.prisma')) {
|
|
44
|
+
errors.push(`${prefix}.schema: must end with .prisma`);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
// encryption is optional — object with model names → { fields: [...] }
|
|
49
|
+
if (ext.encryption !== undefined) {
|
|
50
|
+
if (!ext.encryption || typeof ext.encryption !== 'object') {
|
|
51
|
+
errors.push(`${prefix}.encryption: must be an object`);
|
|
52
|
+
} else {
|
|
53
|
+
for (const [model, config] of Object.entries(ext.encryption)) {
|
|
54
|
+
if (!config || !Array.isArray(config.fields)) {
|
|
55
|
+
errors.push(
|
|
56
|
+
`${prefix}.encryption.${model}: must have a "fields" array`
|
|
57
|
+
);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
// routes is optional — { path, handler }
|
|
64
|
+
if (ext.routes !== undefined) {
|
|
65
|
+
if (!ext.routes || typeof ext.routes !== 'object') {
|
|
66
|
+
errors.push(`${prefix}.routes: must be an object with { path, handler }`);
|
|
67
|
+
} else {
|
|
68
|
+
if (!ext.routes.path || typeof ext.routes.path !== 'string') {
|
|
69
|
+
errors.push(`${prefix}.routes.path: required string`);
|
|
70
|
+
} else {
|
|
71
|
+
const pathError = coreExtensionRoutePathError(ext.routes.path);
|
|
72
|
+
if (pathError) {
|
|
73
|
+
errors.push(`${prefix}.routes.path: ${pathError}`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (!ext.routes.handler) {
|
|
77
|
+
errors.push(`${prefix}.routes.handler: required (function or module path)`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// bootstrap is optional — function or module path
|
|
83
|
+
if (ext.bootstrap !== undefined) {
|
|
84
|
+
if (typeof ext.bootstrap !== 'function' && typeof ext.bootstrap !== 'string') {
|
|
85
|
+
errors.push(
|
|
86
|
+
`${prefix}.bootstrap: must be a function or a string (module path)`
|
|
87
|
+
);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
return { valid: errors.length === 0, errors };
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Loads and validates extensions from the app definition.
|
|
96
|
+
*
|
|
97
|
+
* @param {Object} appDefinition - The full app definition
|
|
98
|
+
* @returns {Array<Object>} Normalized extensions array (empty if none)
|
|
99
|
+
* @throws {Error} If any extension fails validation
|
|
100
|
+
*/
|
|
101
|
+
function loadExtensions(appDefinition) {
|
|
102
|
+
if (!appDefinition) return [];
|
|
103
|
+
|
|
104
|
+
// The array this loader reads used to be `appDefinition.extensions`;
|
|
105
|
+
// that key now belongs to ADR-017's keyed object. An array there is the
|
|
106
|
+
// old spelling: stop at load rather than silently dropping the extensions.
|
|
107
|
+
if (Array.isArray(appDefinition.extensions)) {
|
|
108
|
+
throw new Error(
|
|
109
|
+
'appDefinition.extensions (array) was renamed to appDefinition.coreExtensions; ' +
|
|
110
|
+
'move the array to coreExtensions'
|
|
111
|
+
);
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
const raw = appDefinition.coreExtensions;
|
|
115
|
+
if (!raw) return [];
|
|
116
|
+
|
|
117
|
+
if (!Array.isArray(raw)) {
|
|
118
|
+
throw new Error('appDefinition.coreExtensions must be an array');
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if (raw.length === 0) return [];
|
|
122
|
+
|
|
123
|
+
const allErrors = [];
|
|
124
|
+
|
|
125
|
+
const normalized = raw.map((ext, index) => {
|
|
126
|
+
const { valid, errors } = validateExtension(ext, index);
|
|
127
|
+
if (!valid) {
|
|
128
|
+
allErrors.push(...errors);
|
|
129
|
+
return null;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
// Normalize bootstrap — resolve string paths to functions
|
|
133
|
+
let bootstrapFn = null;
|
|
134
|
+
if (typeof ext.bootstrap === 'function') {
|
|
135
|
+
bootstrapFn = ext.bootstrap;
|
|
136
|
+
} else if (typeof ext.bootstrap === 'string') {
|
|
137
|
+
bootstrapFn = require(ext.bootstrap);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
// Normalize route handler — resolve string paths to functions
|
|
141
|
+
let routeHandler = null;
|
|
142
|
+
if (ext.routes) {
|
|
143
|
+
if (typeof ext.routes.handler === 'function') {
|
|
144
|
+
routeHandler = ext.routes.handler;
|
|
145
|
+
} else if (typeof ext.routes.handler === 'string') {
|
|
146
|
+
routeHandler = require(ext.routes.handler);
|
|
147
|
+
} else {
|
|
148
|
+
routeHandler = ext.routes.handler;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
return {
|
|
153
|
+
name: ext.name,
|
|
154
|
+
schema: ext.schema || null,
|
|
155
|
+
encryption: ext.encryption || null,
|
|
156
|
+
routes: ext.routes
|
|
157
|
+
? { path: ext.routes.path, handler: routeHandler }
|
|
158
|
+
: null,
|
|
159
|
+
bootstrap: bootstrapFn,
|
|
160
|
+
};
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
if (allErrors.length > 0) {
|
|
164
|
+
throw new Error(
|
|
165
|
+
`Invalid extension configuration:\n- ${allErrors.join('\n- ')}`
|
|
166
|
+
);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
return normalized.filter(Boolean);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
/**
|
|
173
|
+
* Get extension schema file paths from loaded extensions.
|
|
174
|
+
* @param {Array<Object>} extensions - Normalized extensions
|
|
175
|
+
* @returns {string[]} Array of absolute paths to .prisma schema files
|
|
176
|
+
*/
|
|
177
|
+
function getExtensionSchemaPaths(extensions) {
|
|
178
|
+
return extensions
|
|
179
|
+
.filter((ext) => ext.schema)
|
|
180
|
+
.map((ext) => ext.schema);
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
module.exports = {
|
|
184
|
+
loadExtensions,
|
|
185
|
+
validateExtension,
|
|
186
|
+
getExtensionSchemaPaths,
|
|
187
|
+
};
|