@dyrected/core 2.6.2 → 2.6.4
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/dist/__tests__/access-features.test.d.ts +2 -0
- package/dist/__tests__/access-features.test.d.ts.map +1 -0
- package/dist/__tests__/access-features.test.js +159 -0
- package/dist/__tests__/access-features.test.js.map +1 -0
- package/dist/__tests__/access-parity.test.d.ts +2 -0
- package/dist/__tests__/access-parity.test.d.ts.map +1 -0
- package/dist/__tests__/access-parity.test.js +338 -0
- package/dist/__tests__/access-parity.test.js.map +1 -0
- package/dist/__tests__/access.test.d.ts +2 -0
- package/dist/__tests__/access.test.d.ts.map +1 -0
- package/dist/__tests__/access.test.js +137 -0
- package/dist/__tests__/access.test.js.map +1 -0
- package/dist/__tests__/admin-auth.test.d.ts +2 -0
- package/dist/__tests__/admin-auth.test.d.ts.map +1 -0
- package/dist/__tests__/admin-auth.test.js +440 -0
- package/dist/__tests__/admin-auth.test.js.map +1 -0
- package/dist/__tests__/app.test.d.ts +2 -0
- package/dist/__tests__/app.test.d.ts.map +1 -0
- package/dist/__tests__/app.test.js +112 -0
- package/dist/__tests__/app.test.js.map +1 -0
- package/dist/__tests__/audit.test.d.ts +2 -0
- package/dist/__tests__/audit.test.d.ts.map +1 -0
- package/dist/__tests__/audit.test.js +125 -0
- package/dist/__tests__/audit.test.js.map +1 -0
- package/dist/__tests__/auth-hydration.test.d.ts +2 -0
- package/dist/__tests__/auth-hydration.test.d.ts.map +1 -0
- package/dist/__tests__/auth-hydration.test.js +90 -0
- package/dist/__tests__/auth-hydration.test.js.map +1 -0
- package/dist/__tests__/auth-invite.test.d.ts +2 -0
- package/dist/__tests__/auth-invite.test.d.ts.map +1 -0
- package/dist/__tests__/auth-invite.test.js +152 -0
- package/dist/__tests__/auth-invite.test.js.map +1 -0
- package/dist/__tests__/auth-lockout.test.d.ts +2 -0
- package/dist/__tests__/auth-lockout.test.d.ts.map +1 -0
- package/dist/__tests__/auth-lockout.test.js +154 -0
- package/dist/__tests__/auth-lockout.test.js.map +1 -0
- package/dist/__tests__/auth-sessions.test.d.ts +2 -0
- package/dist/__tests__/auth-sessions.test.d.ts.map +1 -0
- package/dist/__tests__/auth-sessions.test.js +118 -0
- package/dist/__tests__/auth-sessions.test.js.map +1 -0
- package/dist/__tests__/config.test.d.ts +2 -0
- package/dist/__tests__/config.test.d.ts.map +1 -0
- package/dist/__tests__/config.test.js +402 -0
- package/dist/__tests__/config.test.js.map +1 -0
- package/dist/__tests__/define-field.test.d.ts +2 -0
- package/dist/__tests__/define-field.test.d.ts.map +1 -0
- package/dist/__tests__/define-field.test.js +121 -0
- package/dist/__tests__/define-field.test.js.map +1 -0
- package/dist/__tests__/deleteMany.test.d.ts +2 -0
- package/dist/__tests__/deleteMany.test.d.ts.map +1 -0
- package/dist/__tests__/deleteMany.test.js +75 -0
- package/dist/__tests__/deleteMany.test.js.map +1 -0
- package/dist/__tests__/depth.test.d.ts +2 -0
- package/dist/__tests__/depth.test.d.ts.map +1 -0
- package/dist/__tests__/depth.test.js +115 -0
- package/dist/__tests__/depth.test.js.map +1 -0
- package/dist/__tests__/dynamic-options.test.d.ts +2 -0
- package/dist/__tests__/dynamic-options.test.d.ts.map +1 -0
- package/dist/__tests__/dynamic-options.test.js +168 -0
- package/dist/__tests__/dynamic-options.test.js.map +1 -0
- package/dist/__tests__/email.service.test.d.ts +2 -0
- package/dist/__tests__/email.service.test.d.ts.map +1 -0
- package/dist/__tests__/email.service.test.js +52 -0
- package/dist/__tests__/email.service.test.js.map +1 -0
- package/dist/__tests__/field-inference.test-types.d.ts +161 -0
- package/dist/__tests__/field-inference.test-types.d.ts.map +1 -0
- package/dist/__tests__/field-inference.test-types.js +87 -0
- package/dist/__tests__/field-inference.test-types.js.map +1 -0
- package/dist/__tests__/fixtures/editorial-workflow.d.ts +14 -0
- package/dist/__tests__/fixtures/editorial-workflow.d.ts.map +1 -0
- package/dist/__tests__/fixtures/editorial-workflow.js +12 -0
- package/dist/__tests__/fixtures/editorial-workflow.js.map +1 -0
- package/dist/__tests__/hooks.test.d.ts +2 -0
- package/dist/__tests__/hooks.test.d.ts.map +1 -0
- package/dist/__tests__/hooks.test.js +320 -0
- package/dist/__tests__/hooks.test.js.map +1 -0
- package/dist/__tests__/mocks.d.ts +75 -0
- package/dist/__tests__/mocks.d.ts.map +1 -0
- package/dist/__tests__/mocks.js +170 -0
- package/dist/__tests__/mocks.js.map +1 -0
- package/dist/__tests__/observability.test.d.ts +2 -0
- package/dist/__tests__/observability.test.d.ts.map +1 -0
- package/dist/__tests__/observability.test.js +233 -0
- package/dist/__tests__/observability.test.js.map +1 -0
- package/dist/__tests__/openapi.test.d.ts +2 -0
- package/dist/__tests__/openapi.test.d.ts.map +1 -0
- package/dist/__tests__/openapi.test.js +105 -0
- package/dist/__tests__/openapi.test.js.map +1 -0
- package/dist/__tests__/parse-sort.test.d.ts +2 -0
- package/dist/__tests__/parse-sort.test.d.ts.map +1 -0
- package/dist/__tests__/parse-sort.test.js +24 -0
- package/dist/__tests__/parse-sort.test.js.map +1 -0
- package/dist/__tests__/preferences.test.d.ts +2 -0
- package/dist/__tests__/preferences.test.d.ts.map +1 -0
- package/dist/__tests__/preferences.test.js +168 -0
- package/dist/__tests__/preferences.test.js.map +1 -0
- package/dist/__tests__/router.test.d.ts +2 -0
- package/dist/__tests__/router.test.d.ts.map +1 -0
- package/dist/__tests__/router.test.js +70 -0
- package/dist/__tests__/router.test.js.map +1 -0
- package/dist/__tests__/search.test.d.ts +2 -0
- package/dist/__tests__/search.test.d.ts.map +1 -0
- package/dist/__tests__/search.test.js +174 -0
- package/dist/__tests__/search.test.js.map +1 -0
- package/dist/__tests__/upload-validation.test.d.ts +2 -0
- package/dist/__tests__/upload-validation.test.d.ts.map +1 -0
- package/dist/__tests__/upload-validation.test.js +41 -0
- package/dist/__tests__/upload-validation.test.js.map +1 -0
- package/dist/__tests__/where.test.d.ts +2 -0
- package/dist/__tests__/where.test.d.ts.map +1 -0
- package/dist/__tests__/where.test.js +105 -0
- package/dist/__tests__/where.test.js.map +1 -0
- package/dist/__tests__/workflow.test.d.ts +2 -0
- package/dist/__tests__/workflow.test.d.ts.map +1 -0
- package/dist/__tests__/workflow.test.js +684 -0
- package/dist/__tests__/workflow.test.js.map +1 -0
- package/dist/app-config-C9VJ6rTv.d.cts +2092 -0
- package/dist/app-config-C9VJ6rTv.d.ts +2092 -0
- package/dist/app-config-CYV70eoF.d.cts +2100 -0
- package/dist/app-config-CYV70eoF.d.ts +2100 -0
- package/dist/app.d.ts +35 -0
- package/dist/app.d.ts.map +1 -0
- package/dist/app.js +164 -0
- package/dist/app.js.map +1 -0
- package/dist/auth/access.d.ts +5 -0
- package/dist/auth/access.d.ts.map +1 -0
- package/dist/auth/access.js +59 -0
- package/dist/auth/access.js.map +1 -0
- package/dist/auth/jexl.d.ts +13 -0
- package/dist/auth/jexl.d.ts.map +1 -0
- package/dist/auth/jexl.js +30 -0
- package/dist/auth/jexl.js.map +1 -0
- package/dist/auth/lockout.d.ts +11 -0
- package/dist/auth/lockout.d.ts.map +1 -0
- package/dist/auth/lockout.js +37 -0
- package/dist/auth/lockout.js.map +1 -0
- package/dist/auth/password.d.ts +10 -0
- package/dist/auth/password.d.ts.map +1 -0
- package/dist/auth/password.js +28 -0
- package/dist/auth/password.js.map +1 -0
- package/dist/auth/sessions.d.ts +39 -0
- package/dist/auth/sessions.d.ts.map +1 -0
- package/dist/auth/sessions.js +126 -0
- package/dist/auth/sessions.js.map +1 -0
- package/dist/auth/token.d.ts +23 -0
- package/dist/auth/token.d.ts.map +1 -0
- package/dist/auth/token.js +40 -0
- package/dist/auth/token.js.map +1 -0
- package/dist/chunk-23NM4LDU.js +2883 -0
- package/dist/chunk-2TKDCCIR.js +2622 -0
- package/dist/chunk-3SFITPX4.js +2628 -0
- package/dist/chunk-CQVTQ67D.js +2632 -0
- package/dist/chunk-ELHRRPKX.js +2863 -0
- package/dist/chunk-HRLSFTLR.js +3061 -0
- package/dist/chunk-QTIAQBNH.js +3097 -0
- package/dist/chunk-T2DGC4MD.js +3008 -0
- package/dist/chunk-TLU77TLE.js +3203 -0
- package/dist/chunk-YEBCT77K.js +3269 -0
- package/dist/chunk-YXEKNN5X.js +3085 -0
- package/dist/controllers/admin-auth.controller.d.ts +71 -0
- package/dist/controllers/admin-auth.controller.d.ts.map +1 -0
- package/dist/controllers/admin-auth.controller.js +450 -0
- package/dist/controllers/admin-auth.controller.js.map +1 -0
- package/dist/controllers/audit.controller.d.ts +42 -0
- package/dist/controllers/audit.controller.d.ts.map +1 -0
- package/dist/controllers/audit.controller.js +149 -0
- package/dist/controllers/audit.controller.js.map +1 -0
- package/dist/controllers/auth.controller.d.ts +143 -0
- package/dist/controllers/auth.controller.d.ts.map +1 -0
- package/dist/controllers/auth.controller.js +572 -0
- package/dist/controllers/auth.controller.js.map +1 -0
- package/dist/controllers/collection.controller.d.ts +170 -0
- package/dist/controllers/collection.controller.d.ts.map +1 -0
- package/dist/controllers/collection.controller.js +1033 -0
- package/dist/controllers/collection.controller.js.map +1 -0
- package/dist/controllers/global.controller.d.ts +20 -0
- package/dist/controllers/global.controller.d.ts.map +1 -0
- package/dist/controllers/global.controller.js +182 -0
- package/dist/controllers/global.controller.js.map +1 -0
- package/dist/controllers/media.controller.d.ts +39 -0
- package/dist/controllers/media.controller.d.ts.map +1 -0
- package/dist/controllers/media.controller.js +178 -0
- package/dist/controllers/media.controller.js.map +1 -0
- package/dist/controllers/preview.controller.d.ts +37 -0
- package/dist/controllers/preview.controller.d.ts.map +1 -0
- package/dist/controllers/preview.controller.js +48 -0
- package/dist/controllers/preview.controller.js.map +1 -0
- package/dist/index.cjs +707 -27
- package/dist/index.d.cts +77 -5
- package/dist/index.d.ts +77 -5
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +37 -1
- package/dist/index.js.map +1 -0
- package/dist/middleware/auth.d.ts +19 -0
- package/dist/middleware/auth.d.ts.map +1 -0
- package/dist/middleware/auth.js +157 -0
- package/dist/middleware/auth.js.map +1 -0
- package/dist/middleware/rate-limit.d.ts +9 -0
- package/dist/middleware/rate-limit.d.ts.map +1 -0
- package/dist/middleware/rate-limit.js +75 -0
- package/dist/middleware/rate-limit.js.map +1 -0
- package/dist/network.d.ts +6 -0
- package/dist/network.d.ts.map +1 -0
- package/dist/network.js +70 -0
- package/dist/network.js.map +1 -0
- package/dist/observability.d.ts +113 -0
- package/dist/observability.d.ts.map +1 -0
- package/dist/observability.js +497 -0
- package/dist/observability.js.map +1 -0
- package/dist/router.d.ts +8 -0
- package/dist/router.d.ts.map +1 -0
- package/dist/router.js +704 -0
- package/dist/router.js.map +1 -0
- package/dist/server.cjs +861 -54
- package/dist/server.d.cts +9 -1
- package/dist/server.d.ts +9 -1
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +189 -26
- package/dist/server.js.map +1 -0
- package/dist/services/audit.service.d.ts +23 -0
- package/dist/services/audit.service.d.ts.map +1 -0
- package/dist/services/audit.service.js +39 -0
- package/dist/services/audit.service.js.map +1 -0
- package/dist/services/defaults.service.d.ts +8 -0
- package/dist/services/defaults.service.d.ts.map +1 -0
- package/dist/services/defaults.service.js +55 -0
- package/dist/services/defaults.service.js.map +1 -0
- package/dist/services/email-template.d.ts +46 -0
- package/dist/services/email-template.d.ts.map +1 -0
- package/dist/services/email-template.js +88 -0
- package/dist/services/email-template.js.map +1 -0
- package/dist/services/email.service.d.ts +34 -0
- package/dist/services/email.service.d.ts.map +1 -0
- package/dist/services/email.service.js +129 -0
- package/dist/services/email.service.js.map +1 -0
- package/dist/services/media.service.d.ts +20 -0
- package/dist/services/media.service.d.ts.map +1 -0
- package/dist/services/media.service.js +49 -0
- package/dist/services/media.service.js.map +1 -0
- package/dist/services/population.service.d.ts +20 -0
- package/dist/services/population.service.d.ts.map +1 -0
- package/dist/services/population.service.js +224 -0
- package/dist/services/population.service.js.map +1 -0
- package/dist/types/access.d.ts +48 -0
- package/dist/types/access.d.ts.map +1 -0
- package/dist/types/access.js +2 -0
- package/dist/types/access.js.map +1 -0
- package/dist/types/adapters.d.ts +152 -0
- package/dist/types/adapters.d.ts.map +1 -0
- package/dist/types/adapters.js +2 -0
- package/dist/types/adapters.js.map +1 -0
- package/dist/types/admin-auth.d.ts +132 -0
- package/dist/types/admin-auth.d.ts.map +1 -0
- package/dist/types/admin-auth.js +2 -0
- package/dist/types/admin-auth.js.map +1 -0
- package/dist/types/admin.d.ts +86 -0
- package/dist/types/admin.d.ts.map +1 -0
- package/dist/types/admin.js +2 -0
- package/dist/types/admin.js.map +1 -0
- package/dist/types/app-config.d.ts +279 -0
- package/dist/types/app-config.d.ts.map +1 -0
- package/dist/types/app-config.js +2 -0
- package/dist/types/app-config.js.map +1 -0
- package/dist/types/documents.d.ts +65 -0
- package/dist/types/documents.d.ts.map +1 -0
- package/dist/types/documents.js +2 -0
- package/dist/types/documents.js.map +1 -0
- package/dist/types/hooks.d.ts +122 -0
- package/dist/types/hooks.d.ts.map +1 -0
- package/dist/types/hooks.js +2 -0
- package/dist/types/hooks.js.map +1 -0
- package/dist/types/index.d.ts +13 -0
- package/dist/types/index.d.ts.map +1 -0
- package/dist/types/index.js +13 -0
- package/dist/types/index.js.map +1 -0
- package/dist/types/request.d.ts +42 -0
- package/dist/types/request.d.ts.map +1 -0
- package/dist/types/request.js +2 -0
- package/dist/types/request.js.map +1 -0
- package/dist/types/schema-config.d.ts +443 -0
- package/dist/types/schema-config.d.ts.map +1 -0
- package/dist/types/schema-config.js +2 -0
- package/dist/types/schema-config.js.map +1 -0
- package/dist/types/schema-core.d.ts +628 -0
- package/dist/types/schema-core.d.ts.map +1 -0
- package/dist/types/schema-core.js +2 -0
- package/dist/types/schema-core.js.map +1 -0
- package/dist/types/schema-inference.d.ts +73 -0
- package/dist/types/schema-inference.d.ts.map +1 -0
- package/dist/types/schema-inference.js +2 -0
- package/dist/types/schema-inference.js.map +1 -0
- package/dist/types/workflows.d.ts +121 -0
- package/dist/types/workflows.d.ts.map +1 -0
- package/dist/types/workflows.js +7 -0
- package/dist/types/workflows.js.map +1 -0
- package/dist/utils/access-control.d.ts +35 -0
- package/dist/utils/access-control.d.ts.map +1 -0
- package/dist/utils/access-control.js +161 -0
- package/dist/utils/access-control.js.map +1 -0
- package/dist/utils/admin-auth.d.ts +5 -0
- package/dist/utils/admin-auth.d.ts.map +1 -0
- package/dist/utils/admin-auth.js +39 -0
- package/dist/utils/admin-auth.js.map +1 -0
- package/dist/utils/block-references.d.ts +10 -0
- package/dist/utils/block-references.d.ts.map +1 -0
- package/dist/utils/block-references.js +100 -0
- package/dist/utils/block-references.js.map +1 -0
- package/dist/utils/collection-search.d.ts +11 -0
- package/dist/utils/collection-search.d.ts.map +1 -0
- package/dist/utils/collection-search.js +204 -0
- package/dist/utils/collection-search.js.map +1 -0
- package/dist/utils/config.d.ts +8 -0
- package/dist/utils/config.d.ts.map +1 -0
- package/dist/utils/config.js +336 -0
- package/dist/utils/config.js.map +1 -0
- package/dist/utils/hooks.d.ts +41 -0
- package/dist/utils/hooks.d.ts.map +1 -0
- package/dist/utils/hooks.js +177 -0
- package/dist/utils/hooks.js.map +1 -0
- package/dist/utils/openapi.d.ts +6 -0
- package/dist/utils/openapi.d.ts.map +1 -0
- package/dist/utils/openapi.js +981 -0
- package/dist/utils/openapi.js.map +1 -0
- package/dist/utils/parse-sort.d.ts +43 -0
- package/dist/utils/parse-sort.d.ts.map +1 -0
- package/dist/utils/parse-sort.js +70 -0
- package/dist/utils/parse-sort.js.map +1 -0
- package/dist/utils/parse-where.d.ts +69 -0
- package/dist/utils/parse-where.d.ts.map +1 -0
- package/dist/utils/parse-where.js +202 -0
- package/dist/utils/parse-where.js.map +1 -0
- package/dist/utils/readonly-db.d.ts +9 -0
- package/dist/utils/readonly-db.d.ts.map +1 -0
- package/dist/utils/readonly-db.js +21 -0
- package/dist/utils/readonly-db.js.map +1 -0
- package/dist/utils/swagger.d.ts +11 -0
- package/dist/utils/swagger.d.ts.map +1 -0
- package/dist/utils/swagger.js +62 -0
- package/dist/utils/swagger.js.map +1 -0
- package/dist/utils/upload-validation.d.ts +23 -0
- package/dist/utils/upload-validation.d.ts.map +1 -0
- package/dist/utils/upload-validation.js +46 -0
- package/dist/utils/upload-validation.js.map +1 -0
- package/dist/utils/where-sanitizer.d.ts +10 -0
- package/dist/utils/where-sanitizer.d.ts.map +1 -0
- package/dist/utils/where-sanitizer.js +67 -0
- package/dist/utils/where-sanitizer.js.map +1 -0
- package/dist/workflows.d.ts +86 -0
- package/dist/workflows.d.ts.map +1 -0
- package/dist/workflows.js +405 -0
- package/dist/workflows.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"observability.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/observability.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
import { Writable } from "node:stream";
|
|
2
|
+
import pino from "pino";
|
|
3
|
+
import { describe, expect, it } from "vitest";
|
|
4
|
+
import { createDyrectedApp } from "../app.js";
|
|
5
|
+
import { captureRequestBody, createObservabilityRuntime, redactBody, redactHeaders, resolveObservabilityConfig, shouldSampleRequest, } from "../observability.js";
|
|
6
|
+
import { defineConfig } from "../index.js";
|
|
7
|
+
import { MockDatabaseAdapter } from "./mocks.js";
|
|
8
|
+
process.env.DYRECTED_JWT_SECRET ??= "test-secret";
|
|
9
|
+
class LogCollector extends Writable {
|
|
10
|
+
lines = [];
|
|
11
|
+
_write(chunk, _encoding, callback) {
|
|
12
|
+
this.lines.push(chunk.toString());
|
|
13
|
+
callback();
|
|
14
|
+
}
|
|
15
|
+
entries() {
|
|
16
|
+
return this.lines
|
|
17
|
+
.join("")
|
|
18
|
+
.split("\n")
|
|
19
|
+
.map((line) => line.trim())
|
|
20
|
+
.filter(Boolean)
|
|
21
|
+
.map((line) => JSON.parse(line));
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
function baseConfig() {
|
|
25
|
+
return defineConfig({
|
|
26
|
+
collections: [],
|
|
27
|
+
globals: [],
|
|
28
|
+
db: new MockDatabaseAdapter(),
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
describe("Observability", () => {
|
|
32
|
+
it("applies the documented defaults", () => {
|
|
33
|
+
const resolved = resolveObservabilityConfig();
|
|
34
|
+
expect(resolved.requestLogging.enabled).toBe(true);
|
|
35
|
+
expect(resolved.requestLogging.logBodies).toBe(false);
|
|
36
|
+
expect(resolved.requestLogging.maxBodyBytes).toBe(8192);
|
|
37
|
+
expect(resolved.sampling.successRate).toBe(0.1);
|
|
38
|
+
expect(resolved.sampling.traceSuccessRate).toBe(0.1);
|
|
39
|
+
expect(resolved.sampling.bodySuccessRate).toBe(0.02);
|
|
40
|
+
expect(resolved.sampling.alwaysKeep4xx).toBe(true);
|
|
41
|
+
expect(resolved.sampling.alwaysKeep5xx).toBe(true);
|
|
42
|
+
expect(resolved.tracing.enabled).toBe(false);
|
|
43
|
+
expect(resolved.metrics.enabled).toBe(false);
|
|
44
|
+
expect(resolved.requestLogging.redactHeaders).toEqual(expect.arrayContaining(["authorization", "cookie", "set-cookie", "x-api-key"]));
|
|
45
|
+
expect(resolved.requestLogging.redactPaths).toEqual(expect.arrayContaining(["password", "token", "secret", "apiKey"]));
|
|
46
|
+
});
|
|
47
|
+
it("passes through an instantiated logger", () => {
|
|
48
|
+
const collector = new LogCollector();
|
|
49
|
+
const logger = pino({}, collector);
|
|
50
|
+
const runtime = createObservabilityRuntime({
|
|
51
|
+
...baseConfig(),
|
|
52
|
+
logger,
|
|
53
|
+
});
|
|
54
|
+
expect(runtime.logger).toBe(logger);
|
|
55
|
+
});
|
|
56
|
+
it("redacts headers and nested body fields", () => {
|
|
57
|
+
const observability = resolveObservabilityConfig({
|
|
58
|
+
requestLogging: {
|
|
59
|
+
includeHeaders: ["authorization", "x-request-id"],
|
|
60
|
+
redactPaths: ["profile.secret", "tokens.*.value"],
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
expect(redactHeaders({
|
|
64
|
+
Authorization: "Bearer secret",
|
|
65
|
+
"X-Request-Id": "req_123",
|
|
66
|
+
"Content-Type": "application/json",
|
|
67
|
+
}, observability)).toEqual({
|
|
68
|
+
authorization: "[REDACTED]",
|
|
69
|
+
"x-request-id": "req_123",
|
|
70
|
+
});
|
|
71
|
+
expect(redactBody({
|
|
72
|
+
password: "super-secret",
|
|
73
|
+
profile: { secret: "nested-secret" },
|
|
74
|
+
tokens: [{ value: "first" }, { value: "second" }],
|
|
75
|
+
}, observability.requestLogging.redactPaths)).toEqual({
|
|
76
|
+
password: "[REDACTED]",
|
|
77
|
+
profile: { secret: "[REDACTED]" },
|
|
78
|
+
tokens: [{ value: "[REDACTED]" }, { value: "[REDACTED]" }],
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
it("samples deterministically and always keeps failures", () => {
|
|
82
|
+
const sampling = resolveObservabilityConfig().sampling;
|
|
83
|
+
expect(shouldSampleRequest("req-1", 200, sampling, "log")).toBe(shouldSampleRequest("req-1", 200, sampling, "log"));
|
|
84
|
+
expect(shouldSampleRequest("req-1", 404, sampling, "log")).toBe(true);
|
|
85
|
+
expect(shouldSampleRequest("req-1", 500, sampling, "trace")).toBe(true);
|
|
86
|
+
});
|
|
87
|
+
it("captures only supported request bodies and reports truncated parse failures", async () => {
|
|
88
|
+
const observability = resolveObservabilityConfig({
|
|
89
|
+
requestLogging: {
|
|
90
|
+
logBodies: true,
|
|
91
|
+
maxBodyBytes: 16,
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
const multipartCapture = await captureRequestBody(new Request("http://localhost/upload", {
|
|
95
|
+
method: "POST",
|
|
96
|
+
headers: {
|
|
97
|
+
"content-type": "multipart/form-data; boundary=abc",
|
|
98
|
+
},
|
|
99
|
+
body: "--abc",
|
|
100
|
+
}), observability);
|
|
101
|
+
expect(multipartCapture).toEqual({
|
|
102
|
+
attempted: false,
|
|
103
|
+
contentType: "multipart/form-data; boundary=abc",
|
|
104
|
+
contentLength: undefined,
|
|
105
|
+
});
|
|
106
|
+
const jsonCapture = await captureRequestBody(new Request("http://localhost/echo", {
|
|
107
|
+
method: "POST",
|
|
108
|
+
headers: {
|
|
109
|
+
"content-type": "application/json",
|
|
110
|
+
},
|
|
111
|
+
body: JSON.stringify({ password: "very-secret", payload: "x".repeat(64) }),
|
|
112
|
+
}), observability);
|
|
113
|
+
expect(jsonCapture.attempted).toBe(true);
|
|
114
|
+
expect(jsonCapture.truncated).toBe(true);
|
|
115
|
+
expect(jsonCapture.parseFailed).toBe(true);
|
|
116
|
+
expect(jsonCapture.body).toBeUndefined();
|
|
117
|
+
});
|
|
118
|
+
it("logs structured request events with redaction and preserves request bodies for handlers", async () => {
|
|
119
|
+
const collector = new LogCollector();
|
|
120
|
+
const config = defineConfig({
|
|
121
|
+
collections: [],
|
|
122
|
+
globals: [],
|
|
123
|
+
db: new MockDatabaseAdapter(),
|
|
124
|
+
logger: {
|
|
125
|
+
options: { level: "info" },
|
|
126
|
+
destination: collector,
|
|
127
|
+
},
|
|
128
|
+
observability: {
|
|
129
|
+
requestLogging: {
|
|
130
|
+
logBodies: true,
|
|
131
|
+
redactPaths: ["profile.secret"],
|
|
132
|
+
includeHeaders: ["authorization", "content-type"],
|
|
133
|
+
},
|
|
134
|
+
sampling: {
|
|
135
|
+
successRate: 1,
|
|
136
|
+
bodySuccessRate: 1,
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
});
|
|
140
|
+
const app = await createDyrectedApp(config);
|
|
141
|
+
app.post("/echo", async (c) => c.json(await c.req.json()));
|
|
142
|
+
const response = await app.request("/echo", {
|
|
143
|
+
method: "POST",
|
|
144
|
+
headers: {
|
|
145
|
+
authorization: "Bearer super-secret",
|
|
146
|
+
"content-type": "application/json",
|
|
147
|
+
},
|
|
148
|
+
body: JSON.stringify({
|
|
149
|
+
password: "top-secret",
|
|
150
|
+
profile: { secret: "nested-secret" },
|
|
151
|
+
safe: "value",
|
|
152
|
+
}),
|
|
153
|
+
});
|
|
154
|
+
expect(response.status).toBe(200);
|
|
155
|
+
expect(await response.json()).toEqual({
|
|
156
|
+
password: "top-secret",
|
|
157
|
+
profile: { secret: "nested-secret" },
|
|
158
|
+
safe: "value",
|
|
159
|
+
});
|
|
160
|
+
const requestLog = collector
|
|
161
|
+
.entries()
|
|
162
|
+
.find((entry) => entry.msg === "HTTP request completed");
|
|
163
|
+
expect(requestLog).toMatchObject({
|
|
164
|
+
msg: "HTTP request completed",
|
|
165
|
+
method: "POST",
|
|
166
|
+
path: "/echo",
|
|
167
|
+
statusCode: 200,
|
|
168
|
+
sampled: true,
|
|
169
|
+
headers: {
|
|
170
|
+
authorization: "[REDACTED]",
|
|
171
|
+
"content-type": "application/json",
|
|
172
|
+
},
|
|
173
|
+
body: {
|
|
174
|
+
password: "[REDACTED]",
|
|
175
|
+
profile: { secret: "[REDACTED]" },
|
|
176
|
+
safe: "value",
|
|
177
|
+
},
|
|
178
|
+
});
|
|
179
|
+
});
|
|
180
|
+
it("uses warn and error levels for 4xx and 5xx request logs", async () => {
|
|
181
|
+
const collector = new LogCollector();
|
|
182
|
+
const app = await createDyrectedApp(defineConfig({
|
|
183
|
+
collections: [],
|
|
184
|
+
globals: [],
|
|
185
|
+
db: new MockDatabaseAdapter(),
|
|
186
|
+
logger: {
|
|
187
|
+
options: { level: "info" },
|
|
188
|
+
destination: collector,
|
|
189
|
+
},
|
|
190
|
+
observability: {
|
|
191
|
+
sampling: {
|
|
192
|
+
successRate: 1,
|
|
193
|
+
},
|
|
194
|
+
},
|
|
195
|
+
}));
|
|
196
|
+
app.get("/bad-request", (c) => c.json({ error: true }, 400));
|
|
197
|
+
app.get("/boom", () => {
|
|
198
|
+
throw new Error("boom");
|
|
199
|
+
});
|
|
200
|
+
expect((await app.request("/bad-request")).status).toBe(400);
|
|
201
|
+
expect((await app.request("/boom")).status).toBe(500);
|
|
202
|
+
const requestLogs = collector
|
|
203
|
+
.entries()
|
|
204
|
+
.filter((entry) => entry.msg === "HTTP request completed");
|
|
205
|
+
expect(requestLogs.find((entry) => entry.path === "/bad-request")?.level).toBe(40);
|
|
206
|
+
expect(requestLogs.find((entry) => entry.path === "/boom")?.level).toBe(50);
|
|
207
|
+
});
|
|
208
|
+
it("only exposes the Prometheus metrics route when configured", async () => {
|
|
209
|
+
const enabledApp = await createDyrectedApp(defineConfig({
|
|
210
|
+
collections: [],
|
|
211
|
+
globals: [],
|
|
212
|
+
db: new MockDatabaseAdapter(),
|
|
213
|
+
observability: {
|
|
214
|
+
metrics: {
|
|
215
|
+
enabled: true,
|
|
216
|
+
exporter: "prometheus",
|
|
217
|
+
path: "/metricsz",
|
|
218
|
+
},
|
|
219
|
+
sampling: {
|
|
220
|
+
successRate: 1,
|
|
221
|
+
},
|
|
222
|
+
},
|
|
223
|
+
}));
|
|
224
|
+
await enabledApp.request("/health");
|
|
225
|
+
const metricsResponse = await enabledApp.request("/metricsz");
|
|
226
|
+
expect(metricsResponse.status).toBe(200);
|
|
227
|
+
expect(await metricsResponse.text()).toContain("dyrected_http_requests_total");
|
|
228
|
+
const disabledApp = await createDyrectedApp(baseConfig());
|
|
229
|
+
const missingMetricsResponse = await disabledApp.request("/metrics");
|
|
230
|
+
expect(missingMetricsResponse.status).toBe(404);
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
//# sourceMappingURL=observability.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"observability.test.js","sourceRoot":"","sources":["../../src/__tests__/observability.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/openapi.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { defineCollection, defineConfig, defineGlobal } from "../index.js";
|
|
3
|
+
import { generateOpenApi } from "../utils/openapi.js";
|
|
4
|
+
import { publishingWorkflow } from "../workflows.js";
|
|
5
|
+
const config = defineConfig({
|
|
6
|
+
collections: [
|
|
7
|
+
defineCollection({
|
|
8
|
+
slug: "users",
|
|
9
|
+
auth: true,
|
|
10
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
11
|
+
}),
|
|
12
|
+
defineCollection({
|
|
13
|
+
slug: "media",
|
|
14
|
+
upload: true,
|
|
15
|
+
fields: [{ name: "alt", type: "text", label: "Alternative text" }],
|
|
16
|
+
}),
|
|
17
|
+
defineCollection({
|
|
18
|
+
slug: "posts",
|
|
19
|
+
audit: true,
|
|
20
|
+
workflow: publishingWorkflow(),
|
|
21
|
+
fields: [{ name: "title", type: "text", label: "Title" }],
|
|
22
|
+
}),
|
|
23
|
+
],
|
|
24
|
+
globals: [
|
|
25
|
+
defineGlobal({
|
|
26
|
+
slug: "settings",
|
|
27
|
+
fields: [{ name: "siteName", type: "text", label: "Site name" }],
|
|
28
|
+
}),
|
|
29
|
+
],
|
|
30
|
+
storage: {
|
|
31
|
+
upload: async ({ filename, mimeType }) => ({
|
|
32
|
+
filename,
|
|
33
|
+
mimeType,
|
|
34
|
+
url: filename,
|
|
35
|
+
}),
|
|
36
|
+
delete: async () => { },
|
|
37
|
+
getURL: ({ filename }) => filename,
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
describe("OpenAPI generation", () => {
|
|
41
|
+
it("covers every public route family for a maximal config", () => {
|
|
42
|
+
const spec = generateOpenApi(config);
|
|
43
|
+
const paths = Object.keys(spec.paths);
|
|
44
|
+
expect(paths).toEqual(expect.arrayContaining([
|
|
45
|
+
"/api/schemas",
|
|
46
|
+
"/api/openapi.json",
|
|
47
|
+
"/api/docs",
|
|
48
|
+
"/api/dyrected/options/{collection}/{field}",
|
|
49
|
+
"/api/preferences/{key}",
|
|
50
|
+
"/api/preview-token",
|
|
51
|
+
"/api/preview-data",
|
|
52
|
+
"/api/audit",
|
|
53
|
+
"/api/collections/posts",
|
|
54
|
+
"/api/collections/posts/__audit",
|
|
55
|
+
"/api/collections/posts/{id}",
|
|
56
|
+
"/api/collections/posts/delete-many",
|
|
57
|
+
"/api/collections/posts/{id}/transitions/{transition}",
|
|
58
|
+
"/api/collections/posts/{id}/workflow-history",
|
|
59
|
+
"/api/collections/users/login",
|
|
60
|
+
"/api/collections/users/accept-invite",
|
|
61
|
+
"/api/collections/users/{id}/change-password",
|
|
62
|
+
"/api/collections/media/media",
|
|
63
|
+
"/api/collections/media/media/{filename}",
|
|
64
|
+
"/api/globals/settings",
|
|
65
|
+
"/api/media/{filename}",
|
|
66
|
+
]));
|
|
67
|
+
expect(spec.paths["/api/collections/posts"]?.get?.tags).toEqual(["Collection: posts"]);
|
|
68
|
+
expect(spec.paths["/api/collections/posts"]?.get?.parameters).toEqual(expect.arrayContaining([
|
|
69
|
+
expect.objectContaining({
|
|
70
|
+
name: "search",
|
|
71
|
+
in: "query",
|
|
72
|
+
}),
|
|
73
|
+
]));
|
|
74
|
+
expect(spec.paths["/api/collections/users/login"]?.post?.tags).toEqual(["Collection: users"]);
|
|
75
|
+
expect(spec.paths["/api/globals/settings"]?.get?.tags).toEqual(["Global: settings"]);
|
|
76
|
+
});
|
|
77
|
+
it("describes all FieldType variants used by the schema generator", () => {
|
|
78
|
+
const spec = generateOpenApi(defineConfig({
|
|
79
|
+
collections: [
|
|
80
|
+
defineCollection({
|
|
81
|
+
slug: "fields",
|
|
82
|
+
fields: [
|
|
83
|
+
{ name: "when", type: "datetime", label: "When" },
|
|
84
|
+
{ name: "clock", type: "time", label: "Clock" },
|
|
85
|
+
{ name: "icon", type: "icon", label: "Icon" },
|
|
86
|
+
{
|
|
87
|
+
name: "images",
|
|
88
|
+
type: "image",
|
|
89
|
+
label: "Images",
|
|
90
|
+
relationTo: "media",
|
|
91
|
+
hasMany: true,
|
|
92
|
+
},
|
|
93
|
+
],
|
|
94
|
+
}),
|
|
95
|
+
],
|
|
96
|
+
globals: [],
|
|
97
|
+
}));
|
|
98
|
+
const properties = spec.components.schemas.fields.properties;
|
|
99
|
+
expect(properties.when.format).toBe("date-time");
|
|
100
|
+
expect(properties.clock.format).toBe("time");
|
|
101
|
+
expect(properties.icon.type).toBe("string");
|
|
102
|
+
expect(properties.images.type).toBe("array");
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
//# sourceMappingURL=openapi.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.test.js","sourceRoot":"","sources":["../../src/__tests__/openapi.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-sort.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/parse-sort.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { parseSort } from '../utils/parse-sort.js';
|
|
3
|
+
describe('parseSort', () => {
|
|
4
|
+
it('parses leading dash as descending sort direction', () => {
|
|
5
|
+
expect(parseSort('-updatedAt')).toEqual([{ field: 'updatedAt', direction: 'DESC' }]);
|
|
6
|
+
});
|
|
7
|
+
it('parses explicit SQL-style sort directions', () => {
|
|
8
|
+
expect(parseSort('updatedAt DESC')).toEqual([{ field: 'updatedAt', direction: 'DESC' }]);
|
|
9
|
+
expect(parseSort('title ASC')).toEqual([{ field: 'title', direction: 'ASC' }]);
|
|
10
|
+
});
|
|
11
|
+
it('defaults bare fields to ascending order', () => {
|
|
12
|
+
expect(parseSort('title')).toEqual([{ field: 'title', direction: 'ASC' }]);
|
|
13
|
+
});
|
|
14
|
+
it('supports comma-separated sort clauses', () => {
|
|
15
|
+
expect(parseSort('title,-updatedAt')).toEqual([
|
|
16
|
+
{ field: 'title', direction: 'ASC' },
|
|
17
|
+
{ field: 'updatedAt', direction: 'DESC' },
|
|
18
|
+
]);
|
|
19
|
+
});
|
|
20
|
+
it('falls back when the sort string is not in the supported grammar', () => {
|
|
21
|
+
expect(parseSort('updatedAt; DROP TABLE posts')).toEqual([{ field: 'createdAt', direction: 'DESC' }]);
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
//# sourceMappingURL=parse-sort.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-sort.test.js","sourceRoot":"","sources":["../../src/__tests__/parse-sort.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACzF,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5C,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;YACpC,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE;SAC1C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preferences.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/preferences.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach } from "vitest";
|
|
2
|
+
import { createDyrectedApp } from "../app.js";
|
|
3
|
+
import { defineConfig, defineCollection } from "../index.js";
|
|
4
|
+
import { InMemoryAdapter } from "./mocks.js";
|
|
5
|
+
import { signCollectionToken } from "../auth/token.js";
|
|
6
|
+
describe("Preferences API Scopes", async () => {
|
|
7
|
+
process.env.DYRECTED_JWT_SECRET = "my-test-secret-that-is-at-least-32-chars-long";
|
|
8
|
+
const db = new InMemoryAdapter();
|
|
9
|
+
const config = defineConfig({
|
|
10
|
+
collections: [
|
|
11
|
+
defineCollection({
|
|
12
|
+
slug: "users",
|
|
13
|
+
auth: true,
|
|
14
|
+
fields: [
|
|
15
|
+
{ name: "email", type: "email", label: "Email" },
|
|
16
|
+
{ name: "roles", type: "json", label: "Roles" },
|
|
17
|
+
],
|
|
18
|
+
}),
|
|
19
|
+
],
|
|
20
|
+
globals: [],
|
|
21
|
+
db,
|
|
22
|
+
});
|
|
23
|
+
const app = await createDyrectedApp(config);
|
|
24
|
+
let editorToken;
|
|
25
|
+
let adminToken;
|
|
26
|
+
beforeEach(async () => {
|
|
27
|
+
// Clear in-memory DB
|
|
28
|
+
db.store = {};
|
|
29
|
+
// Seed users
|
|
30
|
+
const editor = await db.create({
|
|
31
|
+
collection: "users",
|
|
32
|
+
data: { id: "user-editor", email: "editor@test.com", roles: ["editor"] },
|
|
33
|
+
});
|
|
34
|
+
const admin = await db.create({
|
|
35
|
+
collection: "users",
|
|
36
|
+
data: { id: "user-admin", email: "admin@test.com", roles: ["admin"] },
|
|
37
|
+
});
|
|
38
|
+
editorToken = await signCollectionToken({
|
|
39
|
+
sub: editor.id,
|
|
40
|
+
email: editor.email,
|
|
41
|
+
collection: "users",
|
|
42
|
+
roles: ["editor"],
|
|
43
|
+
});
|
|
44
|
+
adminToken = await signCollectionToken({
|
|
45
|
+
sub: admin.id,
|
|
46
|
+
email: admin.email,
|
|
47
|
+
collection: "users",
|
|
48
|
+
roles: ["admin"],
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
it("should return null if no personal or global preference exists", async () => {
|
|
52
|
+
const res = await app.request("/api/preferences/test-key", {
|
|
53
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
54
|
+
});
|
|
55
|
+
expect(res.status).toBe(200);
|
|
56
|
+
const data = await res.json();
|
|
57
|
+
expect(data.value).toBeNull();
|
|
58
|
+
});
|
|
59
|
+
it("should set and get personal preference successfully", async () => {
|
|
60
|
+
const putRes = await app.request("/api/preferences/test-key?scope=personal", {
|
|
61
|
+
method: "PUT",
|
|
62
|
+
headers: {
|
|
63
|
+
Authorization: `Bearer ${editorToken}`,
|
|
64
|
+
"Content-Type": "application/json",
|
|
65
|
+
},
|
|
66
|
+
body: JSON.stringify({ value: ["fieldA", "fieldB"] }),
|
|
67
|
+
});
|
|
68
|
+
expect(putRes.status).toBe(200);
|
|
69
|
+
const getRes = await app.request("/api/preferences/test-key", {
|
|
70
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
71
|
+
});
|
|
72
|
+
expect(getRes.status).toBe(200);
|
|
73
|
+
const getData = await getRes.json();
|
|
74
|
+
expect(getData.value).toEqual(["fieldA", "fieldB"]);
|
|
75
|
+
});
|
|
76
|
+
it("should block non-admins from saving global preferences", async () => {
|
|
77
|
+
const putRes = await app.request("/api/preferences/test-key?scope=global", {
|
|
78
|
+
method: "PUT",
|
|
79
|
+
headers: {
|
|
80
|
+
Authorization: `Bearer ${editorToken}`,
|
|
81
|
+
"Content-Type": "application/json",
|
|
82
|
+
},
|
|
83
|
+
body: JSON.stringify({ value: ["fieldA", "fieldB"] }),
|
|
84
|
+
});
|
|
85
|
+
expect(putRes.status).toBe(403);
|
|
86
|
+
});
|
|
87
|
+
it("should allow admins to save global preferences and fallback for editors", async () => {
|
|
88
|
+
const putRes = await app.request("/api/preferences/test-key?scope=global", {
|
|
89
|
+
method: "PUT",
|
|
90
|
+
headers: {
|
|
91
|
+
Authorization: `Bearer ${adminToken}`,
|
|
92
|
+
"Content-Type": "application/json",
|
|
93
|
+
},
|
|
94
|
+
body: JSON.stringify({ value: ["fieldA", "fieldB"] }),
|
|
95
|
+
});
|
|
96
|
+
expect(putRes.status).toBe(200);
|
|
97
|
+
// Editor should fall back to global preference
|
|
98
|
+
const editorGetRes = await app.request("/api/preferences/test-key", {
|
|
99
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
100
|
+
});
|
|
101
|
+
expect(editorGetRes.status).toBe(200);
|
|
102
|
+
const editorData = await editorGetRes.json();
|
|
103
|
+
expect(editorData.value).toEqual(["fieldA", "fieldB"]);
|
|
104
|
+
});
|
|
105
|
+
it("should allow retrieving only global preferences bypassing personal override when scope=global", async () => {
|
|
106
|
+
// 1. Save global default
|
|
107
|
+
await app.request("/api/preferences/test-key?scope=global", {
|
|
108
|
+
method: "PUT",
|
|
109
|
+
headers: {
|
|
110
|
+
Authorization: `Bearer ${adminToken}`,
|
|
111
|
+
"Content-Type": "application/json",
|
|
112
|
+
},
|
|
113
|
+
body: JSON.stringify({ value: ["globalField"] }),
|
|
114
|
+
});
|
|
115
|
+
// 2. Editor overrides personally
|
|
116
|
+
await app.request("/api/preferences/test-key?scope=personal", {
|
|
117
|
+
method: "PUT",
|
|
118
|
+
headers: {
|
|
119
|
+
Authorization: `Bearer ${editorToken}`,
|
|
120
|
+
"Content-Type": "application/json",
|
|
121
|
+
},
|
|
122
|
+
body: JSON.stringify({ value: ["personalField"] }),
|
|
123
|
+
});
|
|
124
|
+
// 3. GET with scope=personal/default should return personal
|
|
125
|
+
const resPersonal = await app.request("/api/preferences/test-key", {
|
|
126
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
127
|
+
});
|
|
128
|
+
expect(await resPersonal.json()).toEqual({ key: "test-key", value: ["personalField"] });
|
|
129
|
+
// 4. GET with scope=global should return global
|
|
130
|
+
const resGlobal = await app.request("/api/preferences/test-key?scope=global", {
|
|
131
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
132
|
+
});
|
|
133
|
+
expect(await resGlobal.json()).toEqual({ key: "test-key", value: ["globalField"] });
|
|
134
|
+
});
|
|
135
|
+
it("should support DELETE personal preference falling back to global", async () => {
|
|
136
|
+
// Save global
|
|
137
|
+
await app.request("/api/preferences/test-key?scope=global", {
|
|
138
|
+
method: "PUT",
|
|
139
|
+
headers: {
|
|
140
|
+
Authorization: `Bearer ${adminToken}`,
|
|
141
|
+
"Content-Type": "application/json",
|
|
142
|
+
},
|
|
143
|
+
body: JSON.stringify({ value: ["globalField"] }),
|
|
144
|
+
});
|
|
145
|
+
// Save personal
|
|
146
|
+
await app.request("/api/preferences/test-key?scope=personal", {
|
|
147
|
+
method: "PUT",
|
|
148
|
+
headers: {
|
|
149
|
+
Authorization: `Bearer ${editorToken}`,
|
|
150
|
+
"Content-Type": "application/json",
|
|
151
|
+
},
|
|
152
|
+
body: JSON.stringify({ value: ["personalField"] }),
|
|
153
|
+
});
|
|
154
|
+
// Delete personal
|
|
155
|
+
const delRes = await app.request("/api/preferences/test-key?scope=personal", {
|
|
156
|
+
method: "DELETE",
|
|
157
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
158
|
+
});
|
|
159
|
+
expect(delRes.status).toBe(200);
|
|
160
|
+
// Get (should fall back to global)
|
|
161
|
+
const getRes = await app.request("/api/preferences/test-key", {
|
|
162
|
+
headers: { Authorization: `Bearer ${editorToken}` },
|
|
163
|
+
});
|
|
164
|
+
expect(getRes.status).toBe(200);
|
|
165
|
+
expect(await getRes.json()).toEqual({ key: "test-key", value: ["globalField"] });
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
//# sourceMappingURL=preferences.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preferences.test.js","sourceRoot":"","sources":["../../src/__tests__/preferences.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"router.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/router.test.ts"],"names":[],"mappings":""}
|