@terreno/api 57.3.0 → 57.6.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/.ai/skills/mongoose-schema-safety/SKILL.md +23 -10
- package/README.md +11 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/adminTypes.d.ts +7 -0
- package/dist/adminTypes.js +6 -1
- package/dist/api.d.ts +10 -0
- package/dist/api.js +601 -792
- package/dist/audit/auditApp.d.ts +30 -0
- package/dist/audit/auditApp.js +114 -0
- package/dist/audit/auditEventModel.d.ts +29 -0
- package/dist/audit/auditEventModel.js +101 -0
- package/dist/audit/cloudTasksEnqueue.d.ts +32 -0
- package/dist/audit/cloudTasksEnqueue.js +69 -0
- package/dist/audit/diff.d.ts +10 -0
- package/dist/audit/diff.js +140 -0
- package/dist/audit/processQueue.d.ts +6 -0
- package/dist/audit/processQueue.js +56 -0
- package/dist/audit/rbacSink.d.ts +2 -0
- package/dist/audit/rbacSink.js +41 -0
- package/dist/audit/record.d.ts +56 -0
- package/dist/audit/record.js +251 -0
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- package/dist/betterAuth.d.ts +6 -0
- package/dist/betterAuthApp.js +25 -26
- package/dist/betterAuthSetup.js +258 -413
- package/dist/browserLogsRoute.d.ts +6 -0
- package/dist/browserLogsRoute.js +97 -0
- package/dist/collectionRegistry.d.ts +3 -1
- package/dist/collectionRegistry.js +43 -33
- package/dist/config.js +53 -122
- package/dist/configurationApp.js +180 -361
- package/dist/configurationPlugin.js +130 -302
- package/dist/consentApp.js +276 -421
- package/dist/docLoader.js +78 -126
- package/dist/envConfigurationPlugin.js +25 -147
- package/dist/errors.js +151 -247
- package/dist/example.js +28 -34
- package/dist/expressServer.d.ts +10 -0
- package/dist/expressServer.js +109 -255
- package/dist/frameworkModelNames.d.ts +24 -0
- package/dist/frameworkModelNames.js +31 -0
- package/dist/githubAuth.js +152 -216
- package/dist/httpClient.js +176 -264
- package/dist/index.d.ts +28 -1
- package/dist/index.js +53 -2
- package/dist/logger.js +145 -278
- package/dist/mcp/auth.js +76 -128
- package/dist/mcp/createMCPRequest.js +4 -5
- package/dist/mcp/handlers.js +268 -480
- package/dist/mcp/query.d.ts +0 -13
- package/dist/mcp/query.js +57 -151
- package/dist/mcp/registry.js +17 -30
- package/dist/mcp/schemaGenerator.js +95 -181
- package/dist/mcp/server.js +28 -100
- package/dist/mcp/serviceTokens.js +102 -191
- package/dist/mcp/toolGenerator.js +78 -191
- package/dist/middleware.js +15 -27
- package/dist/migrations/fixtures/all-down/20260910120000-one.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +9 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +9 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.d.ts +3 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +7 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.d.ts +3 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +7 -0
- package/dist/migrations/fixtures/missing-up/20260910120000-noup.d.ts +2 -0
- package/dist/migrations/fixtures/missing-up/20260910120000-noup.js +5 -0
- package/dist/migrations/fixtures/valid/20260910120000-alpha.d.ts +3 -0
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +7 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.d.ts +4 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +9 -0
- package/dist/migrations/generate.d.ts +17 -0
- package/dist/migrations/generate.js +155 -0
- package/dist/migrations/load.d.ts +20 -0
- package/dist/migrations/load.js +110 -0
- package/dist/migrations/lock.d.ts +13 -0
- package/dist/migrations/lock.js +73 -0
- package/dist/migrations/runner.d.ts +42 -0
- package/dist/migrations/runner.js +249 -0
- package/dist/migrations/schemaCatalog.d.ts +44 -0
- package/dist/migrations/schemaCatalog.js +185 -0
- package/dist/migrations/types.d.ts +87 -0
- package/dist/migrations/types.js +7 -0
- package/dist/models/consentForm.js +6 -6
- package/dist/models/consentResponse.js +5 -5
- package/dist/models/mcpServiceToken.js +66 -156
- package/dist/models/notification.d.ts +2 -0
- package/dist/models/notification.js +62 -0
- package/dist/models/notificationPreference.d.ts +2 -0
- package/dist/models/notificationPreference.js +49 -0
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.d.ts +40 -0
- package/dist/notifications/notificationService.js +183 -0
- package/dist/notifications/notificationsApp.d.ts +18 -0
- package/dist/notifications/notificationsApp.js +156 -0
- package/dist/notifications/notificationsBeforeSend.d.ts +14 -0
- package/dist/notifications/notificationsBeforeSend.js +32 -0
- package/dist/notifiers/googleChatNotifier.js +36 -117
- package/dist/notifiers/slackNotifier.d.ts +31 -2
- package/dist/notifiers/slackNotifier.js +170 -119
- package/dist/notifiers/zoomNotifier.js +60 -111
- package/dist/openApi.d.ts +1 -7
- package/dist/openApi.js +113 -127
- package/dist/openApiBuilder.d.ts +14 -3
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.d.ts +13 -1
- package/dist/openApiValidator.js +301 -246
- package/dist/orgs/orgContext.d.ts +23 -0
- package/dist/orgs/orgContext.js +128 -0
- package/dist/orgs/orgPermissions.d.ts +4 -0
- package/dist/orgs/orgPermissions.js +38 -0
- package/dist/orgs/orgPlugin.d.ts +13 -0
- package/dist/orgs/orgPlugin.js +66 -0
- package/dist/orgs/organizationModel.d.ts +13 -0
- package/dist/orgs/organizationModel.js +200 -0
- package/dist/orgs/organizationSettings.d.ts +19 -0
- package/dist/orgs/organizationSettings.js +113 -0
- package/dist/orgs/orgsApp.d.ts +28 -0
- package/dist/orgs/orgsApp.js +416 -0
- package/dist/permissions.d.ts +7 -13
- package/dist/permissions.js +95 -211
- package/dist/plugins.js +125 -218
- package/dist/populate.js +130 -240
- package/dist/rateLimit/applyTrustProxy.js +1 -1
- package/dist/rateLimit/createStore.js +7 -8
- package/dist/rateLimit/memoryStore.js +22 -100
- package/dist/rateLimit/middleware.d.ts +0 -8
- package/dist/rateLimit/middleware.js +49 -101
- package/dist/rateLimit/mongoStore.d.ts +1 -0
- package/dist/rateLimit/mongoStore.js +55 -112
- package/dist/rateLimit/policies.d.ts +0 -4
- package/dist/rateLimit/policies.js +44 -80
- package/dist/rateLimit/redisStore.d.ts +1 -0
- package/dist/rateLimit/redisStore.js +40 -133
- package/dist/rbac/access.js +122 -253
- package/dist/rbac/assertAllowed.js +95 -171
- package/dist/rbac/auditModel.js +14 -58
- package/dist/rbac/backfillAdmins.js +24 -130
- package/dist/rbac/fieldViews.js +46 -141
- package/dist/rbac/membershipOrgAdminSource.d.ts +6 -0
- package/dist/rbac/membershipOrgAdminSource.js +51 -0
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.d.ts +3 -0
- package/dist/rbac/modelRouterAccess.js +133 -307
- package/dist/rbac/permissionUtils.js +40 -179
- package/dist/rbac/realtimeAccess.js +81 -147
- package/dist/rbac/resolve.d.ts +1 -1
- package/dist/rbac/resolve.js +154 -319
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.d.ts +2 -5
- package/dist/rbac/roleModel.js +60 -173
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.d.ts +10 -1
- package/dist/rbac/statements.js +42 -93
- package/dist/rbac/types.d.ts +5 -0
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.d.ts +10 -4
- package/dist/realtime/changeStreamWatcher.js +499 -764
- package/dist/realtime/deprecation.d.ts +1 -0
- package/dist/realtime/deprecation.js +9 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.d.ts +1 -0
- package/dist/realtime/realtimeApp.js +248 -401
- package/dist/realtime/registry.js +19 -30
- package/dist/realtime/sessionRevalidation.js +132 -358
- package/dist/realtime/socketAuth.js +89 -208
- package/dist/realtime/socketUser.js +10 -56
- package/dist/requestContext.js +93 -139
- package/dist/schemaMetadata.js +181 -265
- package/dist/scriptRunner.js +96 -266
- package/dist/scrubAdminFields.js +36 -108
- package/dist/secretProviders.js +130 -299
- package/dist/seedRunner.js +221 -514
- package/dist/sync/adminBroadcastScope.d.ts +40 -0
- package/dist/sync/adminBroadcastScope.js +82 -0
- package/dist/sync/adminWindowAccess.d.ts +13 -0
- package/dist/sync/adminWindowAccess.js +25 -0
- package/dist/sync/adminWindowMutation.d.ts +88 -0
- package/dist/sync/adminWindowMutation.js +176 -0
- package/dist/sync/executors.d.ts +9 -3
- package/dist/sync/executors.js +425 -598
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.d.ts +5 -2
- package/dist/sync/mutationHandler.js +549 -697
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +31 -47
- package/dist/sync/routes.d.ts +13 -0
- package/dist/sync/routes.js +484 -760
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.d.ts +8 -2
- package/dist/sync/socketHandlers.js +271 -402
- package/dist/sync/streams.d.ts +2 -0
- package/dist/sync/streams.js +54 -116
- package/dist/sync/syncApp.d.ts +2 -1
- package/dist/sync/syncApp.js +14 -16
- package/dist/sync/syncBatch.d.ts +5 -2
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/sync/types.d.ts +18 -0
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.d.ts +29 -0
- package/dist/terrenoApp.js +184 -257
- package/dist/tests/createTestData.d.ts +1 -3
- package/dist/tests/createTestData.js +147 -259
- package/dist/tests/models.d.ts +1 -0
- package/dist/tests/models.js +23 -56
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.d.ts +0 -5
- package/dist/tests/testHelper.js +32 -101
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- package/dist/types/authToken.d.ts +3 -3
- package/dist/types/mcpServiceToken.d.ts +2 -2
- package/dist/types/membership.d.ts +23 -0
- package/dist/types/membership.js +2 -0
- package/dist/types/notification.d.ts +28 -0
- package/dist/types/notification.js +2 -0
- package/dist/types/notificationPreference.d.ts +20 -0
- package/dist/types/notificationPreference.js +2 -0
- package/dist/types/organization.d.ts +36 -0
- package/dist/types/organization.js +2 -0
- package/dist/utils.js +31 -93
- package/dist/vendor/wesleytodd-openapi/index.js +37 -51
- package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
- package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
- package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
- package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
- package/dist/versionCheckPlugin.js +52 -100
- package/dist/webhooks/headerValue.js +2 -2
- package/dist/webhooks/idempotency/memoryStore.js +16 -59
- package/dist/webhooks/idempotency/mongoStore.js +55 -130
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +4 -49
- package/dist/webhooks/idempotency/webhookReceipt.js +14 -14
- package/dist/webhooks/rawBody.d.ts +1 -0
- package/dist/webhooks/rawBody.js +2 -1
- package/dist/webhooks/timingSafeEqual.js +4 -5
- package/dist/webhooks/verifiers/hmac.js +17 -18
- package/dist/webhooks/verifiers/sendgrid.js +20 -22
- package/dist/webhooks/verifiers/stripe.js +31 -65
- package/dist/webhooks/verifiers/twilio.js +23 -73
- package/dist/webhooks/webhooksApp.js +78 -177
- package/dist/zodOpenApi.js +2 -2
- package/package.json +34 -28
- package/src/__snapshots__/openApi.test.ts.snap +192 -54
- package/src/__snapshots__/openApiBuilder.test.ts.snap +0 -18
- package/src/__snapshots__/schemaMetadata.test.ts.snap +0 -1
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/adminTypes.ts +8 -0
- package/src/api.test.ts +39 -2
- package/src/api.ts +68 -0
- package/src/audit/auditApp.test.ts +243 -0
- package/src/audit/auditApp.ts +139 -0
- package/src/audit/auditEventModel.ts +160 -0
- package/src/audit/auditRouter.test.ts +456 -0
- package/src/audit/cloudTasksEnqueue.test.ts +124 -0
- package/src/audit/cloudTasksEnqueue.ts +104 -0
- package/src/audit/diff.ts +163 -0
- package/src/audit/processQueue.ts +69 -0
- package/src/audit/rbacSink.test.ts +86 -0
- package/src/audit/rbacSink.ts +42 -0
- package/src/audit/record.test.ts +402 -0
- package/src/audit/record.ts +329 -0
- package/src/auth.test.ts +1 -1
- package/src/auth.ts +1 -1
- package/src/authRecovery.test.ts +43 -0
- package/src/authRecovery.ts +16 -10
- package/src/authTokens.ts +6 -2
- package/src/authVerification.test.ts +22 -0
- package/src/betterAuth.ts +7 -0
- package/src/betterAuthSetup.test.ts +27 -0
- package/src/betterAuthSetup.ts +1 -0
- package/src/browserLogsRoute.ts +110 -0
- package/src/collectionRegistry.test.ts +8 -9
- package/src/collectionRegistry.ts +21 -1
- package/src/configurationPlugin.test.ts +1 -11
- package/src/express.d.ts +2 -0
- package/src/expressServer.test.ts +50 -2
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +76 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/mcp/handlers.test.ts +275 -0
- package/src/mcp/query.ts +3 -3
- package/src/mcp/toolGenerator.test.ts +81 -0
- package/src/migrations/cli.test.ts +353 -0
- package/src/migrations/cli.ts +283 -0
- package/src/migrations/fixtures/all-down/20260910120000-one.ts +6 -0
- package/src/migrations/fixtures/all-down/20260910120001-two.ts +6 -0
- package/src/migrations/fixtures/bad-id/20260910120000-mismatch.ts +4 -0
- package/src/migrations/fixtures/bad-name/not-a-migration.ts +4 -0
- package/src/migrations/fixtures/missing-up/20260910120000-noup.ts +2 -0
- package/src/migrations/fixtures/valid/20260910120000-alpha.ts +4 -0
- package/src/migrations/fixtures/valid/20260910120001-beta.ts +6 -0
- package/src/migrations/generate.test.ts +333 -0
- package/src/migrations/generate.ts +216 -0
- package/src/migrations/load.test.ts +103 -0
- package/src/migrations/load.ts +124 -0
- package/src/migrations/lock.test.ts +133 -0
- package/src/migrations/lock.ts +118 -0
- package/src/migrations/runner.test.ts +504 -0
- package/src/migrations/runner.ts +358 -0
- package/src/migrations/schemaCatalog.test.ts +159 -0
- package/src/migrations/schemaCatalog.ts +262 -0
- package/src/migrations/types.ts +94 -0
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +69 -0
- package/src/models/notificationPreference.ts +62 -0
- package/src/notifications/notificationService.ts +254 -0
- package/src/notifications/notificationsApp.test.ts +528 -0
- package/src/notifications/notificationsApp.ts +200 -0
- package/src/notifications/notificationsBeforeSend.ts +51 -0
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/openApi.test.ts +0 -1
- package/src/openApi.ts +2 -1
- package/src/openApiBuilder.ts +14 -3
- package/src/openApiValidator.test.ts +221 -2
- package/src/openApiValidator.ts +218 -33
- package/src/orgs/orgAccessOptIn.test.ts +87 -0
- package/src/orgs/orgContext.test.ts +259 -0
- package/src/orgs/orgContext.ts +151 -0
- package/src/orgs/orgPermissions.test.ts +105 -0
- package/src/orgs/orgPermissions.ts +40 -0
- package/src/orgs/orgPlugin.test.ts +130 -0
- package/src/orgs/orgPlugin.ts +70 -0
- package/src/orgs/orgRbac.test.ts +267 -0
- package/src/orgs/orgSecurityDefects.test.ts +415 -0
- package/src/orgs/organizationModel.test.ts +205 -0
- package/src/orgs/organizationModel.ts +262 -0
- package/src/orgs/organizationSettings.test.ts +113 -0
- package/src/orgs/organizationSettings.ts +126 -0
- package/src/orgs/orgsApp.test.ts +382 -0
- package/src/orgs/orgsApp.ts +563 -0
- package/src/permissions.test.ts +62 -36
- package/src/permissions.ts +8 -30
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/rateLimit/middleware.ts +1 -1
- package/src/rateLimit/mongoStore.ts +1 -0
- package/src/rateLimit/policies.ts +2 -2
- package/src/rateLimit/redisStore.ts +1 -0
- package/src/rbac/access.ts +11 -3
- package/src/rbac/membershipOrgAdminSource.ts +59 -0
- package/src/rbac/modelRouterAccess.ts +3 -0
- package/src/rbac/permissionUtils.test.ts +26 -5
- package/src/rbac/resolve.test.ts +34 -2
- package/src/rbac/resolve.ts +26 -7
- package/src/rbac/roleModel.test.ts +34 -1
- package/src/rbac/roleModel.ts +17 -1
- package/src/rbac/statements.test.ts +19 -0
- package/src/rbac/statements.ts +19 -1
- package/src/rbac/types.ts +5 -0
- package/src/realtime/changeStreamWatcher.ts +73 -33
- package/src/realtime/deprecation.ts +1 -0
- package/src/realtime/realtime.test.ts +357 -185
- package/src/realtime/realtimeApp.ts +2 -1
- package/src/schemaMetadata.test.ts +14 -0
- package/src/schemaMetadata.ts +5 -5
- package/src/sync/adminBroadcastConfig.test.ts +96 -0
- package/src/sync/adminBroadcastScope.test.ts +155 -0
- package/src/sync/adminBroadcastScope.ts +123 -0
- package/src/sync/adminWindowAccess.test.ts +57 -0
- package/src/sync/adminWindowAccess.ts +32 -0
- package/src/sync/adminWindowMutation.test.ts +450 -0
- package/src/sync/adminWindowMutation.ts +283 -0
- package/src/sync/executors.ts +33 -6
- package/src/sync/integration.test.ts +2 -2
- package/src/sync/mutationHandler.test.ts +277 -1
- package/src/sync/mutationHandler.ts +171 -29
- package/src/sync/registry.ts +4 -0
- package/src/sync/routes.ts +52 -8
- package/src/sync/socketHandlers.ts +154 -58
- package/src/sync/streams.ts +6 -0
- package/src/sync/sync.test.ts +3 -2
- package/src/sync/syncApp.ts +2 -1
- package/src/sync/syncBatch.ts +7 -2
- package/src/sync/syncRoutes.test.ts +297 -3
- package/src/sync/syncSocket.test.ts +229 -0
- package/src/sync/types.ts +20 -0
- package/src/terrenoApp.migrations.test.ts +114 -0
- package/src/terrenoApp.test.ts +41 -0
- package/src/terrenoApp.ts +97 -31
- package/src/tests/createTestData.ts +2 -2
- package/src/tests/models.ts +10 -2
- package/src/tests/testHelper.ts +1 -7
- package/src/types/authToken.ts +2 -4
- package/src/types/mcpServiceToken.ts +1 -7
- package/src/types/membership.ts +48 -0
- package/src/types/notification.ts +34 -0
- package/src/types/notificationPreference.ts +28 -0
- package/src/types/organization.ts +49 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +8 -10
- package/src/webhooks/rawBody.test.ts +33 -0
- package/src/webhooks/rawBody.ts +1 -0
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +4 -1
- package/dist/vendor/wesleytodd-openapi/lib/convert-yaml.d.ts +0 -2
- package/dist/vendor/wesleytodd-openapi/lib/convert-yaml.js +0 -13
- package/src/vendor/wesleytodd-openapi/lib/convert-yaml.js +0 -13
|
@@ -19,8 +19,22 @@ import {
|
|
|
19
19
|
applySyncRegistrationSideEffects,
|
|
20
20
|
clearSyncIndexCreationTasks,
|
|
21
21
|
} from "./sync/registrationSideEffects";
|
|
22
|
+
import type {SyncConfig} from "./sync/types";
|
|
22
23
|
|
|
23
|
-
|
|
24
|
+
const withAdminBroadcastDefault = (config: SyncConfig): SyncConfig => ({
|
|
25
|
+
...config,
|
|
26
|
+
adminBroadcast: config.adminBroadcast === true,
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
/** Store `adminBroadcast: false` when the host omitted the flag (default). */
|
|
30
|
+
const applyAdminBroadcastDefault = (options: ModelRouterOptions<unknown>): void => {
|
|
31
|
+
if (!options.sync) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
options.sync = withAdminBroadcastDefault(options.sync);
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
interface CollectionSurfaces {
|
|
24
38
|
mcp: boolean;
|
|
25
39
|
realtime: boolean;
|
|
26
40
|
sync: boolean;
|
|
@@ -55,10 +69,14 @@ export const registerCollection = <T>({
|
|
|
55
69
|
options: ModelRouterOptions<T>;
|
|
56
70
|
routePath: string;
|
|
57
71
|
}): void => {
|
|
72
|
+
applyAdminBroadcastDefault(options as ModelRouterOptions<unknown>);
|
|
58
73
|
const existing = collectionRegistry.get(routePath);
|
|
59
74
|
const wasSyncEnabled = existing?.surfaces.sync ?? false;
|
|
60
75
|
|
|
61
76
|
if (options.sync && wasSyncEnabled) {
|
|
77
|
+
if (existing?.model.modelName === model.modelName) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
62
80
|
const collectionTag = routePath.replace(/^\//, "");
|
|
63
81
|
throw new APIError({
|
|
64
82
|
status: 500,
|
|
@@ -100,9 +118,11 @@ export const replaceCollectionOptions = (
|
|
|
100
118
|
if (!existing) {
|
|
101
119
|
return;
|
|
102
120
|
}
|
|
121
|
+
applyAdminBroadcastDefault(options);
|
|
103
122
|
existing.options = options;
|
|
104
123
|
};
|
|
105
124
|
|
|
125
|
+
/** @internal */
|
|
106
126
|
export const getCollection = (routePath: string): CollectionRecord | undefined =>
|
|
107
127
|
collectionRegistry.get(routePath);
|
|
108
128
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {beforeAll, beforeEach, describe, expect, it, spyOn} from "bun:test";
|
|
2
2
|
import mongoose, {model, Schema} from "mongoose";
|
|
3
3
|
import type {ConfigurationModel, Paths, SecretProvider} from "./configurationPlugin";
|
|
4
4
|
import {configurationPlugin, flattenToDotPaths} from "./configurationPlugin";
|
|
@@ -300,16 +300,6 @@ describe("configurationPlugin", () => {
|
|
|
300
300
|
}
|
|
301
301
|
});
|
|
302
302
|
|
|
303
|
-
afterAll(async () => {
|
|
304
|
-
if (dbConnected && mongoose.connection.readyState === 1) {
|
|
305
|
-
try {
|
|
306
|
-
await mongoose.connection.db?.dropDatabase();
|
|
307
|
-
} catch {
|
|
308
|
-
// ignore
|
|
309
|
-
}
|
|
310
|
-
}
|
|
311
|
-
});
|
|
312
|
-
|
|
313
303
|
beforeEach(async () => {
|
|
314
304
|
if (!dbConnected) {
|
|
315
305
|
return;
|
package/src/express.d.ts
CHANGED
|
@@ -904,8 +904,8 @@ describe("expressServer", () => {
|
|
|
904
904
|
skipListen: false,
|
|
905
905
|
userModel: typedUserModel,
|
|
906
906
|
}).start();
|
|
907
|
-
// start()
|
|
908
|
-
// exit-on-listen-error path settles asynchronously.
|
|
907
|
+
// start() binds listen first, then awaits ensureSyncIndexes(), so the
|
|
908
|
+
// exit-on-listen-error path still settles asynchronously if listen throws.
|
|
909
909
|
const deadline = Date.now() + 2_000;
|
|
910
910
|
while (exit.mock.calls.length === 0 && Date.now() < deadline) {
|
|
911
911
|
await new Promise((resolve) => setTimeout(resolve, 5));
|
|
@@ -972,6 +972,54 @@ describe("expressServer", () => {
|
|
|
972
972
|
expect(app).toBeDefined();
|
|
973
973
|
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
974
974
|
});
|
|
975
|
+
|
|
976
|
+
it("attaches the Express app to an already-listening httpServer", async () => {
|
|
977
|
+
const http = await import("node:http");
|
|
978
|
+
const holder = http.createServer((_req, res) => {
|
|
979
|
+
res.writeHead(503);
|
|
980
|
+
res.end("starting");
|
|
981
|
+
});
|
|
982
|
+
await new Promise<void>((resolve) => {
|
|
983
|
+
holder.listen(0, "127.0.0.1", () => {
|
|
984
|
+
resolve();
|
|
985
|
+
});
|
|
986
|
+
});
|
|
987
|
+
const address = holder.address();
|
|
988
|
+
const port = typeof address === "object" && address ? address.port : 0;
|
|
989
|
+
try {
|
|
990
|
+
new TerrenoApp({
|
|
991
|
+
configureApp: (app) => {
|
|
992
|
+
app.get("/ping", (_req, res) => {
|
|
993
|
+
res.json({ok: true});
|
|
994
|
+
});
|
|
995
|
+
},
|
|
996
|
+
httpServer: holder,
|
|
997
|
+
skipListen: false,
|
|
998
|
+
userModel: typedUserModel,
|
|
999
|
+
}).start();
|
|
1000
|
+
const deadline = Date.now() + 2_000;
|
|
1001
|
+
let status = 0;
|
|
1002
|
+
while (Date.now() < deadline) {
|
|
1003
|
+
const response = await fetch(`http://127.0.0.1:${port}/ping`);
|
|
1004
|
+
status = response.status;
|
|
1005
|
+
if (status === 200) {
|
|
1006
|
+
break;
|
|
1007
|
+
}
|
|
1008
|
+
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
1009
|
+
}
|
|
1010
|
+
expect(status).toBe(200);
|
|
1011
|
+
} finally {
|
|
1012
|
+
await new Promise<void>((resolve, reject) => {
|
|
1013
|
+
holder.close((error) => {
|
|
1014
|
+
if (error) {
|
|
1015
|
+
reject(error);
|
|
1016
|
+
return;
|
|
1017
|
+
}
|
|
1018
|
+
resolve();
|
|
1019
|
+
});
|
|
1020
|
+
});
|
|
1021
|
+
}
|
|
1022
|
+
});
|
|
975
1023
|
});
|
|
976
1024
|
|
|
977
1025
|
describe("wrapScript timeout callbacks", () => {
|
package/src/expressServer.ts
CHANGED
|
@@ -219,6 +219,16 @@ export interface AuthOptions {
|
|
|
219
219
|
generateJWTPayload?: (user: User) => Record<string, unknown>;
|
|
220
220
|
generateTokenExpiration?: (user: User) => number | jwt.SignOptions["expiresIn"];
|
|
221
221
|
generateRefreshTokenExpiration?: (user: User) => number | jwt.SignOptions["expiresIn"];
|
|
222
|
+
/** Register JWT forgot-password and token-reset routes. Default true. */
|
|
223
|
+
passwordReset?: boolean;
|
|
224
|
+
/**
|
|
225
|
+
* Register the deprecated `POST /resetPassword` RTK compatibility alias.
|
|
226
|
+
* Default true. Set false when the host owns that path; `/auth/resetPassword`
|
|
227
|
+
* remains available when `passwordReset` is enabled.
|
|
228
|
+
*/
|
|
229
|
+
legacyResetPasswordRoute?: boolean;
|
|
230
|
+
/** Register JWT send-verification and verify-email routes. Default true. */
|
|
231
|
+
emailVerification?: boolean;
|
|
222
232
|
/** Public web/app origin used in password-reset and verification links. */
|
|
223
233
|
publicAppUrl?: string;
|
|
224
234
|
/**
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import {afterAll, describe, it} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
import mongoose from "mongoose";
|
|
4
|
+
|
|
5
|
+
import {createAuditEventModel} from "./audit/auditEventModel";
|
|
6
|
+
import {AuthToken} from "./authTokens";
|
|
7
|
+
import {FRAMEWORK_MODEL_PUBLIC_NAMES, publicFrameworkModelName} from "./frameworkModelNames";
|
|
8
|
+
import {McpServiceToken} from "./models/mcpServiceToken";
|
|
9
|
+
import {Notification} from "./models/notification";
|
|
10
|
+
import {NotificationPreference} from "./models/notificationPreference";
|
|
11
|
+
import {getMembershipModel, getOrganizationModel} from "./orgs/organizationModel";
|
|
12
|
+
import {getWebhookReceiptModel} from "./webhooks/idempotency/webhookReceipt";
|
|
13
|
+
|
|
14
|
+
const CONSUMER_MODEL_NAMES = [
|
|
15
|
+
"AuditEvent",
|
|
16
|
+
"AuthToken",
|
|
17
|
+
"McpServiceToken",
|
|
18
|
+
"Membership",
|
|
19
|
+
"Notification",
|
|
20
|
+
"NotificationPreference",
|
|
21
|
+
"Organization",
|
|
22
|
+
"WebhookReceipt",
|
|
23
|
+
] as const;
|
|
24
|
+
|
|
25
|
+
afterAll(() => {
|
|
26
|
+
for (const modelName of CONSUMER_MODEL_NAMES) {
|
|
27
|
+
if (mongoose.models[modelName]) {
|
|
28
|
+
mongoose.deleteModel(modelName);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
describe("framework model names", () => {
|
|
34
|
+
it("uses Terreno-specific names without changing existing collection names", () => {
|
|
35
|
+
const models = [
|
|
36
|
+
[createAuditEventModel(mongoose.connection), "TerrenoAuditEvent", "auditevents"],
|
|
37
|
+
[AuthToken, "TerrenoAuthToken", "authtokens"],
|
|
38
|
+
[McpServiceToken, "TerrenoMcpServiceToken", "mcpservicetokens"],
|
|
39
|
+
[getMembershipModel(), "TerrenoMembership", "memberships"],
|
|
40
|
+
[Notification, "TerrenoInboxNotification", "notifications"],
|
|
41
|
+
[NotificationPreference, "TerrenoNotificationPreference", "notificationpreferences"],
|
|
42
|
+
[getOrganizationModel(), "TerrenoOrganization", "organizations"],
|
|
43
|
+
[getWebhookReceiptModel(), "TerrenoWebhookReceipt", "webhookReceipts"],
|
|
44
|
+
] as const;
|
|
45
|
+
|
|
46
|
+
for (const [model, modelName, collectionName] of models) {
|
|
47
|
+
assert.equal(model.modelName, modelName);
|
|
48
|
+
assert.equal(model.collection.collectionName, collectionName);
|
|
49
|
+
assert.equal(publicFrameworkModelName(modelName), FRAMEWORK_MODEL_PUBLIC_NAMES[modelName]);
|
|
50
|
+
}
|
|
51
|
+
assert.equal(publicFrameworkModelName("Todo"), "Todo");
|
|
52
|
+
assert.equal(publicFrameworkModelName("TerrenoInboxNotification"), "Notification");
|
|
53
|
+
assert.equal(publicFrameworkModelName("TerrenoAnnouncement"), "Announcement");
|
|
54
|
+
assert.equal(publicFrameworkModelName("TerrenoJob"), "Job");
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("allows consumers to register the former generic model names", () => {
|
|
58
|
+
for (const modelName of CONSUMER_MODEL_NAMES) {
|
|
59
|
+
assert.doesNotThrow(() => mongoose.model(modelName, new mongoose.Schema({})));
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
});
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/** Mongoose compiled names for framework models that used to be generic. */
|
|
2
|
+
export const FRAMEWORK_MODEL_PUBLIC_NAMES = {
|
|
3
|
+
TerrenoAnnouncement: "Announcement",
|
|
4
|
+
TerrenoAnnouncementAcknowledgement: "AnnouncementAcknowledgement",
|
|
5
|
+
TerrenoAnnouncementClickEvent: "AnnouncementClickEvent",
|
|
6
|
+
TerrenoAnnouncementImpression: "AnnouncementImpression",
|
|
7
|
+
TerrenoAuditEvent: "AuditEvent",
|
|
8
|
+
TerrenoAuthToken: "AuthToken",
|
|
9
|
+
TerrenoInboxNotification: "Notification",
|
|
10
|
+
TerrenoJob: "Job",
|
|
11
|
+
TerrenoJobSchedule: "JobSchedule",
|
|
12
|
+
TerrenoMcpServiceToken: "McpServiceToken",
|
|
13
|
+
TerrenoMembership: "Membership",
|
|
14
|
+
TerrenoNotificationPreference: "NotificationPreference",
|
|
15
|
+
TerrenoOrganization: "Organization",
|
|
16
|
+
TerrenoWebhookReceipt: "WebhookReceipt",
|
|
17
|
+
} as const;
|
|
18
|
+
|
|
19
|
+
export type FrameworkModelCompiledName = keyof typeof FRAMEWORK_MODEL_PUBLIC_NAMES;
|
|
20
|
+
|
|
21
|
+
export type FrameworkModelPublicName =
|
|
22
|
+
(typeof FRAMEWORK_MODEL_PUBLIC_NAMES)[FrameworkModelCompiledName];
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Admin UI keys and `admin<ModelName>` RBAC resources keep the pre-namespace names so
|
|
26
|
+
* consumer statements and `/admin/AuditEvent` routes stay stable.
|
|
27
|
+
*/
|
|
28
|
+
export const publicFrameworkModelName = (modelName: string): string => {
|
|
29
|
+
if (modelName in FRAMEWORK_MODEL_PUBLIC_NAMES) {
|
|
30
|
+
return FRAMEWORK_MODEL_PUBLIC_NAMES[modelName as FrameworkModelCompiledName];
|
|
31
|
+
}
|
|
32
|
+
return modelName;
|
|
33
|
+
};
|
package/src/index.ts
CHANGED
|
@@ -1,12 +1,42 @@
|
|
|
1
1
|
export * from "./actions";
|
|
2
2
|
export * from "./adminTypes";
|
|
3
3
|
export * from "./api";
|
|
4
|
+
export {AuditApp, type AuditAppOptions} from "./audit/auditApp";
|
|
5
|
+
export {
|
|
6
|
+
type AuditEventDocument,
|
|
7
|
+
type AuditEventModel,
|
|
8
|
+
type AuditEventOperation,
|
|
9
|
+
type AuditEventSource,
|
|
10
|
+
type AuditEventVerb,
|
|
11
|
+
createAuditEventModel,
|
|
12
|
+
} from "./audit/auditEventModel";
|
|
13
|
+
export {
|
|
14
|
+
AUDIT_SECRET_HEADER,
|
|
15
|
+
auditEnqueueFromEnv,
|
|
16
|
+
type CloudTasksAuditEnqueueOptions,
|
|
17
|
+
createCloudTasksAuditEnqueue,
|
|
18
|
+
} from "./audit/cloudTasksEnqueue";
|
|
19
|
+
export {persistRbacAuditToAuditEvent} from "./audit/rbacSink";
|
|
20
|
+
export {
|
|
21
|
+
type AuditEnqueue,
|
|
22
|
+
type AuditEventWrite,
|
|
23
|
+
type AuditRecorderOptions,
|
|
24
|
+
flushAuditRecorderForTests,
|
|
25
|
+
isAuditRecorderInstalled,
|
|
26
|
+
type ModelRouterAuditConfig,
|
|
27
|
+
type ModelRouterAuditOptions,
|
|
28
|
+
maybeRecordAdminAudit,
|
|
29
|
+
persistEnqueuedAuditEvent,
|
|
30
|
+
recordAuditEvent,
|
|
31
|
+
resetAuditRecorderForTests,
|
|
32
|
+
} from "./audit/record";
|
|
4
33
|
export * from "./auth";
|
|
5
34
|
export * from "./authRecovery";
|
|
6
35
|
export * from "./authTokens";
|
|
7
36
|
export * from "./betterAuth";
|
|
8
37
|
export * from "./betterAuthApp";
|
|
9
38
|
export * from "./betterAuthSetup";
|
|
39
|
+
export * from "./browserLogsRoute";
|
|
10
40
|
export * from "./config";
|
|
11
41
|
export * from "./configurationApp";
|
|
12
42
|
export * from "./configurationPlugin";
|
|
@@ -14,6 +44,12 @@ export * from "./consentApp";
|
|
|
14
44
|
export * from "./envConfigurationPlugin";
|
|
15
45
|
export * from "./errors";
|
|
16
46
|
export * from "./expressServer";
|
|
47
|
+
export {
|
|
48
|
+
FRAMEWORK_MODEL_PUBLIC_NAMES,
|
|
49
|
+
type FrameworkModelCompiledName,
|
|
50
|
+
type FrameworkModelPublicName,
|
|
51
|
+
publicFrameworkModelName,
|
|
52
|
+
} from "./frameworkModelNames";
|
|
17
53
|
export * from "./githubAuth";
|
|
18
54
|
export * from "./httpClient";
|
|
19
55
|
export * from "./logger";
|
|
@@ -50,10 +86,36 @@ export type {
|
|
|
50
86
|
MCPToolResult,
|
|
51
87
|
} from "./mcp/types";
|
|
52
88
|
export * from "./middleware";
|
|
89
|
+
export * from "./migrations/generate";
|
|
90
|
+
export * from "./migrations/load";
|
|
91
|
+
export * from "./migrations/lock";
|
|
92
|
+
export * from "./migrations/runner";
|
|
93
|
+
export * from "./migrations/schemaCatalog";
|
|
94
|
+
export * from "./migrations/types";
|
|
53
95
|
export * from "./models/consentForm";
|
|
54
96
|
export * from "./models/consentResponse";
|
|
55
97
|
export * from "./models/mcpServiceToken";
|
|
98
|
+
export * from "./models/notification";
|
|
99
|
+
export * from "./models/notificationPreference";
|
|
56
100
|
export * from "./models/versionConfig";
|
|
101
|
+
export {
|
|
102
|
+
configureNotificationService,
|
|
103
|
+
createNotificationService,
|
|
104
|
+
getNotificationService,
|
|
105
|
+
type NotificationService,
|
|
106
|
+
type NotificationServiceOptions,
|
|
107
|
+
type NotificationsCommsService,
|
|
108
|
+
} from "./notifications/notificationService";
|
|
109
|
+
export {
|
|
110
|
+
NotificationsApp,
|
|
111
|
+
type NotificationsAppOptions,
|
|
112
|
+
} from "./notifications/notificationsApp";
|
|
113
|
+
export {
|
|
114
|
+
type NotificationsBeforeSendChannel,
|
|
115
|
+
type NotificationsBeforeSendContext,
|
|
116
|
+
type NotificationsBeforeSendResult,
|
|
117
|
+
notificationsBeforeSend,
|
|
118
|
+
} from "./notifications/notificationsBeforeSend";
|
|
57
119
|
export * from "./notifiers/googleChatNotifier";
|
|
58
120
|
export * from "./notifiers/slackNotifier";
|
|
59
121
|
export * from "./notifiers/zoomNotifier";
|
|
@@ -61,6 +123,12 @@ export * from "./openApiBuilder";
|
|
|
61
123
|
export * from "./openApiCompat";
|
|
62
124
|
export * from "./openApiEtag";
|
|
63
125
|
export * from "./openApiValidator";
|
|
126
|
+
export * from "./orgs/organizationModel";
|
|
127
|
+
export * from "./orgs/organizationSettings";
|
|
128
|
+
export * from "./orgs/orgContext";
|
|
129
|
+
export * from "./orgs/orgPermissions";
|
|
130
|
+
export * from "./orgs/orgPlugin";
|
|
131
|
+
export * from "./orgs/orgsApp";
|
|
64
132
|
export * from "./permissions";
|
|
65
133
|
export * from "./plugins";
|
|
66
134
|
export * from "./populate";
|
|
@@ -88,11 +156,17 @@ export {
|
|
|
88
156
|
backfillAdmins,
|
|
89
157
|
} from "./rbac/backfillAdmins";
|
|
90
158
|
export * from "./rbac/fieldViews";
|
|
159
|
+
export {
|
|
160
|
+
MEMBERSHIP_ORG_ADMIN_PERMISSION_SOURCE_NAME,
|
|
161
|
+
membershipOrgAdminPermissionSource,
|
|
162
|
+
ORG_ADMIN_PERMISSION_BUNDLE,
|
|
163
|
+
} from "./rbac/membershipOrgAdminSource";
|
|
91
164
|
export * from "./rbac/middleware";
|
|
92
165
|
export * from "./rbac/permissionUtils";
|
|
93
166
|
export {
|
|
94
167
|
createRbacRoleModel,
|
|
95
168
|
expandRolePermissions,
|
|
169
|
+
organizationOperatorRole,
|
|
96
170
|
type RbacRoleDocument,
|
|
97
171
|
type RbacRoleModel,
|
|
98
172
|
READ_ONLY_ROLE_PERMISSIONS,
|
|
@@ -192,6 +266,8 @@ export * from "./scriptRunner";
|
|
|
192
266
|
export {adminBodyFieldsToStrip, scrubAdminFields, stripAdminBodyFields} from "./scrubAdminFields";
|
|
193
267
|
export * from "./secretProviders";
|
|
194
268
|
export * from "./seedRunner";
|
|
269
|
+
export * from "./sync/adminBroadcastScope";
|
|
270
|
+
export * from "./sync/adminWindowMutation";
|
|
195
271
|
export * from "./sync/executors";
|
|
196
272
|
export * from "./sync/models";
|
|
197
273
|
export * from "./sync/mutationHandler";
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Isolated because `runMigrateCli` disconnects the default mongoose connection
|
|
3
|
+
* when it opens Mongo from a URI. Sharing that with the rest of `bun test` races
|
|
4
|
+
* org/notification/MCP suites.
|
|
5
|
+
*/
|
|
6
|
+
import {describe, it} from "bun:test";
|
|
7
|
+
import {join} from "node:path";
|
|
8
|
+
import {assert} from "chai";
|
|
9
|
+
import mongoose from "mongoose";
|
|
10
|
+
import {runMigrateCli} from "../migrations/cli";
|
|
11
|
+
import {setupDb} from "../tests";
|
|
12
|
+
|
|
13
|
+
const fixtures = (...parts: string[]): string => {
|
|
14
|
+
return join(import.meta.dir, "..", "migrations", "fixtures", ...parts);
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
describe("runMigrateCli Mongo URI connect", () => {
|
|
18
|
+
it("connects and disconnects itself when given a Mongo URI", async () => {
|
|
19
|
+
await setupDb();
|
|
20
|
+
const {host, name, port} = mongoose.connection;
|
|
21
|
+
const uri = `mongodb://${host}:${port}/${name}`;
|
|
22
|
+
await mongoose.disconnect();
|
|
23
|
+
assert.equal(mongoose.connection.readyState, 0);
|
|
24
|
+
|
|
25
|
+
try {
|
|
26
|
+
const out: string[] = [];
|
|
27
|
+
const err: string[] = [];
|
|
28
|
+
const code = await runMigrateCli({
|
|
29
|
+
argv: ["status", "--dir", fixtures("valid")],
|
|
30
|
+
env: {MONGODB_URI: uri, NODE_ENV: "test"},
|
|
31
|
+
stderr: {
|
|
32
|
+
write: (chunk: string): void => {
|
|
33
|
+
err.push(chunk);
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
stdout: {
|
|
37
|
+
write: (chunk: string): void => {
|
|
38
|
+
out.push(chunk);
|
|
39
|
+
},
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
assert.equal(code, 0);
|
|
43
|
+
assert.include(out.join(""), "Applied (0)");
|
|
44
|
+
assert.include(out.join(""), "Pending (2)");
|
|
45
|
+
assert.equal(err.join(""), "");
|
|
46
|
+
assert.equal(mongoose.connection.readyState, 0);
|
|
47
|
+
} finally {
|
|
48
|
+
await mongoose.connect(uri);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
});
|
package/src/mcp/auth.test.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {beforeEach, describe, expect, it} from "bun:test";
|
|
1
|
+
import {beforeEach, describe, expect, it, spyOn} from "bun:test";
|
|
2
2
|
import {assert} from "chai";
|
|
3
3
|
import jwt from "jsonwebtoken";
|
|
4
4
|
import mongoose, {Schema} from "mongoose";
|
|
@@ -234,6 +234,39 @@ describe("extractUserFromHeaders", () => {
|
|
|
234
234
|
expect(user).toBeUndefined();
|
|
235
235
|
});
|
|
236
236
|
|
|
237
|
+
it("returns undefined when the JWT references a user that no longer exists", async () => {
|
|
238
|
+
const token = signToken({id: new mongoose.Types.ObjectId().toString()});
|
|
239
|
+
|
|
240
|
+
const user = await extractUserFromHeaders({authorization: `Bearer ${token}`}, {userModel});
|
|
241
|
+
|
|
242
|
+
assert.isUndefined(user);
|
|
243
|
+
});
|
|
244
|
+
|
|
245
|
+
it("still resolves the MCP service token owner when the last-used update fails", async () => {
|
|
246
|
+
const created = await UserTestModel.create({email: "last-used-fails@example.com"});
|
|
247
|
+
const issued = await McpServiceToken.issueFor({_id: created._id}, {name: "Flaky"});
|
|
248
|
+
const updateSpy = spyOn(McpServiceToken, "updateOne").mockImplementation(
|
|
249
|
+
() =>
|
|
250
|
+
({
|
|
251
|
+
catch: (handler: (error: unknown) => void) => {
|
|
252
|
+
handler(new Error("write failed"));
|
|
253
|
+
},
|
|
254
|
+
}) as unknown as ReturnType<typeof McpServiceToken.updateOne>
|
|
255
|
+
);
|
|
256
|
+
|
|
257
|
+
try {
|
|
258
|
+
const user = await extractUserFromHeaders(
|
|
259
|
+
{authorization: `Bearer ${issued.token}`},
|
|
260
|
+
{mcpServiceTokens: true, userModel}
|
|
261
|
+
);
|
|
262
|
+
|
|
263
|
+
assert.equal(String((user as unknown as MCPAuthUserFields)?._id), created._id.toString());
|
|
264
|
+
assert.equal(updateSpy.mock.calls.length, 1);
|
|
265
|
+
} finally {
|
|
266
|
+
updateSpy.mockRestore();
|
|
267
|
+
}
|
|
268
|
+
});
|
|
269
|
+
|
|
237
270
|
it("returns undefined when Better Auth has no session and no JWT is present", async () => {
|
|
238
271
|
const betterAuth = fakeBetterAuth(async () => null);
|
|
239
272
|
|