@dyrected/core 2.6.3 → 2.7.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/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-config-ChsrBB7p.d.cts +2100 -0
- package/dist/app-config-ChsrBB7p.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,112 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { createDyrectedApp } from "../app.js";
|
|
3
|
+
import { defineConfig } from "../index.js";
|
|
4
|
+
import { MockDatabaseAdapter } from "./mocks.js";
|
|
5
|
+
describe("App Shell", () => {
|
|
6
|
+
const config = defineConfig({
|
|
7
|
+
collections: [],
|
|
8
|
+
globals: [],
|
|
9
|
+
db: new MockDatabaseAdapter(),
|
|
10
|
+
});
|
|
11
|
+
it("should respond to health check", async () => {
|
|
12
|
+
const app = await createDyrectedApp(config);
|
|
13
|
+
const res = await app.request("/health");
|
|
14
|
+
expect(res.status).toBe(200);
|
|
15
|
+
expect(await res.json()).toEqual({ status: "ok", version: "0.0.1" });
|
|
16
|
+
});
|
|
17
|
+
it("should set configuration in context", async () => {
|
|
18
|
+
const app = await createDyrectedApp(config);
|
|
19
|
+
app.get("/test-ctx", (c) => {
|
|
20
|
+
const cfg = c.get("config");
|
|
21
|
+
return c.json({ hasConfig: !!cfg });
|
|
22
|
+
});
|
|
23
|
+
const res = await app.request("/test-ctx");
|
|
24
|
+
expect(await res.json()).toEqual({ hasConfig: true });
|
|
25
|
+
});
|
|
26
|
+
it("should rate limit API requests with Payload-style defaults and headers", async () => {
|
|
27
|
+
const app = await createDyrectedApp(defineConfig({
|
|
28
|
+
collections: [],
|
|
29
|
+
globals: [],
|
|
30
|
+
db: new MockDatabaseAdapter(),
|
|
31
|
+
rateLimit: {
|
|
32
|
+
max: 1,
|
|
33
|
+
window: 60_000,
|
|
34
|
+
},
|
|
35
|
+
}));
|
|
36
|
+
app.get("/api/limited", (c) => c.json({ ok: true }));
|
|
37
|
+
const first = await app.request("/api/limited");
|
|
38
|
+
expect(first.status).toBe(200);
|
|
39
|
+
expect(first.headers.get("x-ratelimit-limit")).toBe("1");
|
|
40
|
+
expect(first.headers.get("x-ratelimit-remaining")).toBe("0");
|
|
41
|
+
const second = await app.request("/api/limited");
|
|
42
|
+
expect(second.status).toBe(429);
|
|
43
|
+
expect(second.headers.get("retry-after")).toBe("60");
|
|
44
|
+
expect(await second.json()).toMatchObject({
|
|
45
|
+
error: true,
|
|
46
|
+
message: "Too many requests. Try again later.",
|
|
47
|
+
retryAfterSeconds: 60,
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
it("should not rate limit routes outside the protected prefixes", async () => {
|
|
51
|
+
const app = await createDyrectedApp(defineConfig({
|
|
52
|
+
collections: [],
|
|
53
|
+
globals: [],
|
|
54
|
+
db: new MockDatabaseAdapter(),
|
|
55
|
+
rateLimit: {
|
|
56
|
+
max: 1,
|
|
57
|
+
window: 60_000,
|
|
58
|
+
},
|
|
59
|
+
}));
|
|
60
|
+
app.get("/public", (c) => c.json({ ok: true }));
|
|
61
|
+
const first = await app.request("/public");
|
|
62
|
+
const second = await app.request("/public");
|
|
63
|
+
expect(first.status).toBe(200);
|
|
64
|
+
expect(second.status).toBe(200);
|
|
65
|
+
expect(second.headers.get("x-ratelimit-limit")).toBeNull();
|
|
66
|
+
});
|
|
67
|
+
it("should respect trustProxy when resolving the client IP", async () => {
|
|
68
|
+
const app = await createDyrectedApp(defineConfig({
|
|
69
|
+
collections: [],
|
|
70
|
+
globals: [],
|
|
71
|
+
db: new MockDatabaseAdapter(),
|
|
72
|
+
rateLimit: {
|
|
73
|
+
enabled: false,
|
|
74
|
+
trustProxy: true,
|
|
75
|
+
},
|
|
76
|
+
}));
|
|
77
|
+
app.get("/api/ip", (c) => c.json({ ip: c.get("clientIp") ?? null }));
|
|
78
|
+
const trusted = await app.request("/api/ip", {
|
|
79
|
+
headers: {
|
|
80
|
+
"x-forwarded-for": "198.51.100.12, 10.0.0.1",
|
|
81
|
+
},
|
|
82
|
+
});
|
|
83
|
+
expect(await trusted.json()).toEqual({ ip: "198.51.100.12" });
|
|
84
|
+
const untrustedApp = await createDyrectedApp(defineConfig({
|
|
85
|
+
collections: [],
|
|
86
|
+
globals: [],
|
|
87
|
+
db: new MockDatabaseAdapter(),
|
|
88
|
+
rateLimit: {
|
|
89
|
+
enabled: false,
|
|
90
|
+
trustProxy: false,
|
|
91
|
+
},
|
|
92
|
+
}));
|
|
93
|
+
untrustedApp.get("/api/ip", (c) => c.json({ ip: c.get("clientIp") ?? null }));
|
|
94
|
+
const untrusted = await untrustedApp.request("/api/ip", {
|
|
95
|
+
headers: {
|
|
96
|
+
"x-forwarded-for": "198.51.100.12, 10.0.0.1",
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
expect(await untrusted.json()).toEqual({ ip: "127.0.0.1" });
|
|
100
|
+
});
|
|
101
|
+
it("should trust provider client IP headers without enabling proxy mode", async () => {
|
|
102
|
+
const app = await createDyrectedApp(config);
|
|
103
|
+
app.get("/api/ip", (c) => c.json({ ip: c.get("clientIp") ?? null }));
|
|
104
|
+
const res = await app.request("/api/ip", {
|
|
105
|
+
headers: {
|
|
106
|
+
"cf-connecting-ip": "203.0.113.9",
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
expect(await res.json()).toEqual({ ip: "203.0.113.9" });
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
//# sourceMappingURL=app.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../../src/__tests__/app.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audit.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/audit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import { beforeAll, describe, expect, it } from "vitest";
|
|
2
|
+
import { createDyrectedApp } from "../app.js";
|
|
3
|
+
import { signCollectionToken } from "../auth/token.js";
|
|
4
|
+
import { defineCollection, defineConfig } from "../index.js";
|
|
5
|
+
import { InMemoryAdapter } from "./mocks.js";
|
|
6
|
+
beforeAll(() => {
|
|
7
|
+
process.env.DYRECTED_JWT_SECRET = "test-secret";
|
|
8
|
+
});
|
|
9
|
+
describe("audit routes", () => {
|
|
10
|
+
it("returns only readable audit entries for an audited collection", async () => {
|
|
11
|
+
const db = new InMemoryAdapter();
|
|
12
|
+
db.seed("users", [{ id: "user-1", email: "user1@example.com", roles: ["editor"] }]);
|
|
13
|
+
db.seed("posts", [
|
|
14
|
+
{ id: "post-1", title: "Mine", owner: "user-1" },
|
|
15
|
+
{ id: "post-2", title: "Theirs", owner: "user-2" },
|
|
16
|
+
]);
|
|
17
|
+
db.seed("__audit", [
|
|
18
|
+
{ id: "audit-1", collection: "posts", documentId: "post-1", operation: "create", user: "user-1", timestamp: "2026-01-01T00:00:00.000Z", changes: "{}" },
|
|
19
|
+
{ id: "audit-2", collection: "posts", documentId: "post-2", operation: "update", user: "user-2", timestamp: "2026-01-02T00:00:00.000Z", changes: "{}" },
|
|
20
|
+
]);
|
|
21
|
+
const app = await createDyrectedApp(defineConfig({
|
|
22
|
+
db,
|
|
23
|
+
collections: [
|
|
24
|
+
defineCollection({
|
|
25
|
+
slug: "users",
|
|
26
|
+
auth: true,
|
|
27
|
+
fields: [{ name: "email", type: "email" }],
|
|
28
|
+
}),
|
|
29
|
+
defineCollection({
|
|
30
|
+
slug: "posts",
|
|
31
|
+
audit: true,
|
|
32
|
+
access: {
|
|
33
|
+
read: ({ user }) => ({ owner: { equals: user?.sub } }),
|
|
34
|
+
},
|
|
35
|
+
fields: [
|
|
36
|
+
{ name: "title", type: "text" },
|
|
37
|
+
{ name: "owner", type: "text" },
|
|
38
|
+
],
|
|
39
|
+
}),
|
|
40
|
+
defineCollection({
|
|
41
|
+
slug: "pages",
|
|
42
|
+
fields: [{ name: "title", type: "text" }],
|
|
43
|
+
}),
|
|
44
|
+
],
|
|
45
|
+
globals: [],
|
|
46
|
+
}));
|
|
47
|
+
const token = await signCollectionToken({
|
|
48
|
+
sub: "user-1",
|
|
49
|
+
email: "user1@example.com",
|
|
50
|
+
collection: "users",
|
|
51
|
+
});
|
|
52
|
+
const headers = { Authorization: `Bearer ${token}` };
|
|
53
|
+
const res = await app.request("/api/collections/posts/__audit", { headers });
|
|
54
|
+
expect(res.status).toBe(200);
|
|
55
|
+
const data = await res.json();
|
|
56
|
+
expect(data.total).toBe(1);
|
|
57
|
+
expect(data.docs[0].documentId).toBe("post-1");
|
|
58
|
+
const rawAuditRes = await app.request("/api/collections/__audit", { headers });
|
|
59
|
+
expect(rawAuditRes.status).toBe(403);
|
|
60
|
+
const missingRes = await app.request("/api/collections/pages/__audit", { headers });
|
|
61
|
+
expect(missingRes.status).toBe(404);
|
|
62
|
+
});
|
|
63
|
+
it("aggregates only entries from audited collections the caller can read", async () => {
|
|
64
|
+
const db = new InMemoryAdapter();
|
|
65
|
+
db.seed("users", [{ id: "user-1", email: "user1@example.com", roles: ["editor"] }]);
|
|
66
|
+
db.seed("posts", [
|
|
67
|
+
{ id: "post-1", title: "Mine", owner: "user-1" },
|
|
68
|
+
{ id: "post-2", title: "Theirs", owner: "user-2" },
|
|
69
|
+
]);
|
|
70
|
+
db.seed("comments", [{ id: "comment-1", body: "Visible" }]);
|
|
71
|
+
db.seed("secrets", [{ id: "secret-1", value: "Hidden" }]);
|
|
72
|
+
db.seed("__audit", [
|
|
73
|
+
{ id: "audit-1", collection: "posts", documentId: "post-1", operation: "create", user: "user-1", timestamp: "2026-01-01T00:00:00.000Z", changes: "{}" },
|
|
74
|
+
{ id: "audit-2", collection: "posts", documentId: "post-2", operation: "update", user: "user-2", timestamp: "2026-01-02T00:00:00.000Z", changes: "{}" },
|
|
75
|
+
{ id: "audit-3", collection: "comments", documentId: "comment-1", operation: "create", user: null, timestamp: "2026-01-03T00:00:00.000Z", changes: "{}" },
|
|
76
|
+
{ id: "audit-4", collection: "secrets", documentId: "secret-1", operation: "delete", user: "user-9", timestamp: "2026-01-04T00:00:00.000Z", changes: "{}" },
|
|
77
|
+
]);
|
|
78
|
+
const app = await createDyrectedApp(defineConfig({
|
|
79
|
+
db,
|
|
80
|
+
collections: [
|
|
81
|
+
defineCollection({
|
|
82
|
+
slug: "users",
|
|
83
|
+
auth: true,
|
|
84
|
+
fields: [{ name: "email", type: "email" }],
|
|
85
|
+
}),
|
|
86
|
+
defineCollection({
|
|
87
|
+
slug: "posts",
|
|
88
|
+
audit: true,
|
|
89
|
+
access: {
|
|
90
|
+
read: ({ user }) => ({ owner: { equals: user?.sub } }),
|
|
91
|
+
},
|
|
92
|
+
fields: [
|
|
93
|
+
{ name: "title", type: "text" },
|
|
94
|
+
{ name: "owner", type: "text" },
|
|
95
|
+
],
|
|
96
|
+
}),
|
|
97
|
+
defineCollection({
|
|
98
|
+
slug: "comments",
|
|
99
|
+
audit: true,
|
|
100
|
+
access: { read: true },
|
|
101
|
+
fields: [{ name: "body", type: "text" }],
|
|
102
|
+
}),
|
|
103
|
+
defineCollection({
|
|
104
|
+
slug: "secrets",
|
|
105
|
+
audit: true,
|
|
106
|
+
access: { read: false },
|
|
107
|
+
fields: [{ name: "value", type: "text" }],
|
|
108
|
+
}),
|
|
109
|
+
],
|
|
110
|
+
globals: [],
|
|
111
|
+
}));
|
|
112
|
+
const token = await signCollectionToken({
|
|
113
|
+
sub: "user-1",
|
|
114
|
+
email: "user1@example.com",
|
|
115
|
+
collection: "users",
|
|
116
|
+
});
|
|
117
|
+
const headers = { Authorization: `Bearer ${token}` };
|
|
118
|
+
const res = await app.request("/api/audit", { headers });
|
|
119
|
+
expect(res.status).toBe(200);
|
|
120
|
+
const data = await res.json();
|
|
121
|
+
expect(data.total).toBe(2);
|
|
122
|
+
expect(data.docs.map((doc) => doc.id)).toEqual(["audit-1", "audit-3"]);
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
//# sourceMappingURL=audit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audit.test.js","sourceRoot":"","sources":["../../src/__tests__/audit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-hydration.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/auth-hydration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach } from "vitest";
|
|
2
|
+
import { Hono } from "hono";
|
|
3
|
+
import { requireAuth, optionalAuth } from "../middleware/auth.js";
|
|
4
|
+
import { signCollectionToken } from "../auth/token.js";
|
|
5
|
+
import { InMemoryAdapter } from "./mocks.js";
|
|
6
|
+
/**
|
|
7
|
+
* The JWT only carries identity claims (sub/email/collection). These tests lock in that
|
|
8
|
+
* the auth middleware re-hydrates the full user record from the database so access
|
|
9
|
+
* functions and hooks can read collection fields like `roles`.
|
|
10
|
+
*/
|
|
11
|
+
describe("Auth middleware user hydration", () => {
|
|
12
|
+
process.env.DYRECTED_JWT_SECRET = "my-test-secret-that-is-at-least-32-chars-long";
|
|
13
|
+
const db = new InMemoryAdapter();
|
|
14
|
+
const config = { db };
|
|
15
|
+
// Minimal app that echoes the resolved user so we can inspect what access functions
|
|
16
|
+
// and hooks would receive.
|
|
17
|
+
function makeApp() {
|
|
18
|
+
const app = new Hono();
|
|
19
|
+
app.use("*", async (c, next) => {
|
|
20
|
+
c.set("config", config);
|
|
21
|
+
await next();
|
|
22
|
+
});
|
|
23
|
+
app.use("*", optionalAuth(config));
|
|
24
|
+
app.get("/whoami", (c) => c.json({ user: c.get("user") ?? null }));
|
|
25
|
+
app.get("/protected", requireAuth(config), (c) => c.json({ user: c.get("user") }));
|
|
26
|
+
return app;
|
|
27
|
+
}
|
|
28
|
+
const app = makeApp();
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
db.store = {};
|
|
31
|
+
});
|
|
32
|
+
async function tokenFor(id) {
|
|
33
|
+
const user = await db.create({
|
|
34
|
+
collection: "users",
|
|
35
|
+
data: { id, email: `${id}@test.com`, password: "hashed-secret", roles: ["admin"] },
|
|
36
|
+
});
|
|
37
|
+
// Note: the token is signed with identity claims ONLY — no roles.
|
|
38
|
+
return signCollectionToken({ sub: user.id, email: user.email, collection: "users" });
|
|
39
|
+
}
|
|
40
|
+
it("hydrates roles (and other fields) from the DB even though the token omits them", async () => {
|
|
41
|
+
const token = await tokenFor("u1");
|
|
42
|
+
const res = await app.request("/whoami", {
|
|
43
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
44
|
+
});
|
|
45
|
+
const body = await res.json();
|
|
46
|
+
expect(res.status).toBe(200);
|
|
47
|
+
expect(body.user).toBeTruthy();
|
|
48
|
+
expect(body.user.roles).toEqual(["admin"]);
|
|
49
|
+
expect(body.user.sub).toBe("u1");
|
|
50
|
+
expect(body.user.email).toBe("u1@test.com");
|
|
51
|
+
expect(body.user.collection).toBe("users");
|
|
52
|
+
});
|
|
53
|
+
it("never exposes the password field on the resolved user", async () => {
|
|
54
|
+
const token = await tokenFor("u2");
|
|
55
|
+
const res = await app.request("/whoami", {
|
|
56
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
57
|
+
});
|
|
58
|
+
const body = await res.json();
|
|
59
|
+
expect(body.user.password).toBeUndefined();
|
|
60
|
+
});
|
|
61
|
+
it("treats a valid token for a deleted user as unauthenticated", async () => {
|
|
62
|
+
const token = await tokenFor("u3");
|
|
63
|
+
// Delete the underlying record; the token is still cryptographically valid.
|
|
64
|
+
db.store = {};
|
|
65
|
+
// optionalAuth: proceeds without a user.
|
|
66
|
+
const open = await app.request("/whoami", {
|
|
67
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
68
|
+
});
|
|
69
|
+
expect((await open.json()).user).toBeNull();
|
|
70
|
+
// requireAuth: rejects.
|
|
71
|
+
const guarded = await app.request("/protected", {
|
|
72
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
73
|
+
});
|
|
74
|
+
expect(guarded.status).toBe(401);
|
|
75
|
+
});
|
|
76
|
+
it("still requires a token on protected routes", async () => {
|
|
77
|
+
const res = await app.request("/protected");
|
|
78
|
+
expect(res.status).toBe(401);
|
|
79
|
+
});
|
|
80
|
+
it("resolves the full user on protected routes", async () => {
|
|
81
|
+
const token = await tokenFor("u4");
|
|
82
|
+
const res = await app.request("/protected", {
|
|
83
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
84
|
+
});
|
|
85
|
+
const body = await res.json();
|
|
86
|
+
expect(res.status).toBe(200);
|
|
87
|
+
expect(body.user.roles).toEqual(["admin"]);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
//# sourceMappingURL=auth-hydration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-hydration.test.js","sourceRoot":"","sources":["../../src/__tests__/auth-hydration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-invite.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/auth-invite.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { createDyrectedApp } from "../app.js";
|
|
3
|
+
import { hashPassword } from "../auth/password.js";
|
|
4
|
+
import { defineCollection, defineConfig } from "../index.js";
|
|
5
|
+
import { InMemoryAdapter } from "./mocks.js";
|
|
6
|
+
describe("auth invite flow", () => {
|
|
7
|
+
async function createAuthApp() {
|
|
8
|
+
process.env.DYRECTED_JWT_SECRET = "dyrected-test-secret";
|
|
9
|
+
const db = new InMemoryAdapter();
|
|
10
|
+
const emailSend = vi.fn().mockResolvedValue(undefined);
|
|
11
|
+
const app = await createDyrectedApp(defineConfig({
|
|
12
|
+
collections: [
|
|
13
|
+
defineCollection({
|
|
14
|
+
slug: "users",
|
|
15
|
+
auth: true,
|
|
16
|
+
fields: [{ name: "name", type: "text" }],
|
|
17
|
+
}),
|
|
18
|
+
],
|
|
19
|
+
globals: [],
|
|
20
|
+
db,
|
|
21
|
+
email: {
|
|
22
|
+
from: "test@example.com",
|
|
23
|
+
send: emailSend,
|
|
24
|
+
},
|
|
25
|
+
}));
|
|
26
|
+
return { app, db, emailSend };
|
|
27
|
+
}
|
|
28
|
+
async function loginAsAdmin(app) {
|
|
29
|
+
const loginRes = await app.request("/api/collections/users/login", {
|
|
30
|
+
method: "POST",
|
|
31
|
+
headers: { "content-type": "application/json" },
|
|
32
|
+
body: JSON.stringify({
|
|
33
|
+
email: "admin@example.com",
|
|
34
|
+
password: "correct-password",
|
|
35
|
+
}),
|
|
36
|
+
});
|
|
37
|
+
const loginBody = await loginRes.json();
|
|
38
|
+
return loginBody.token;
|
|
39
|
+
}
|
|
40
|
+
it("creates a pending user record when inviting someone new", async () => {
|
|
41
|
+
const { app, db, emailSend } = await createAuthApp();
|
|
42
|
+
db.seed("users", [
|
|
43
|
+
{
|
|
44
|
+
id: "admin_1",
|
|
45
|
+
email: "admin@example.com",
|
|
46
|
+
password: await hashPassword("correct-password"),
|
|
47
|
+
roles: ["admin"],
|
|
48
|
+
status: "active",
|
|
49
|
+
},
|
|
50
|
+
]);
|
|
51
|
+
const adminToken = await loginAsAdmin(app);
|
|
52
|
+
const res = await app.request("/api/collections/users/invite", {
|
|
53
|
+
method: "POST",
|
|
54
|
+
headers: {
|
|
55
|
+
"content-type": "application/json",
|
|
56
|
+
authorization: `Bearer ${adminToken}`,
|
|
57
|
+
},
|
|
58
|
+
body: JSON.stringify({
|
|
59
|
+
email: "invitee@example.com",
|
|
60
|
+
inviteUrl: "https://cms.example.com/admin",
|
|
61
|
+
}),
|
|
62
|
+
});
|
|
63
|
+
expect(res.status).toBe(200);
|
|
64
|
+
const body = await res.json();
|
|
65
|
+
expect(body.inviteUrl).toContain("inviteToken=");
|
|
66
|
+
const created = await db.find({
|
|
67
|
+
collection: "users",
|
|
68
|
+
where: { email: "invitee@example.com" },
|
|
69
|
+
limit: 1,
|
|
70
|
+
});
|
|
71
|
+
expect(created.total).toBe(1);
|
|
72
|
+
expect(created.docs[0]?.status).toBe("pending");
|
|
73
|
+
expect(typeof created.docs[0]?.password).toBe("string");
|
|
74
|
+
expect(emailSend).toHaveBeenCalledTimes(1);
|
|
75
|
+
expect(emailSend.mock.calls[0]?.[0]?.html).toContain("Accept invitation");
|
|
76
|
+
});
|
|
77
|
+
it("blocks login for pending invited users", async () => {
|
|
78
|
+
const { app, db } = await createAuthApp();
|
|
79
|
+
db.seed("users", [
|
|
80
|
+
{
|
|
81
|
+
id: "invitee_1",
|
|
82
|
+
email: "invitee@example.com",
|
|
83
|
+
password: "salt:hash",
|
|
84
|
+
status: "pending",
|
|
85
|
+
},
|
|
86
|
+
]);
|
|
87
|
+
const res = await app.request("/api/collections/users/login", {
|
|
88
|
+
method: "POST",
|
|
89
|
+
headers: { "content-type": "application/json" },
|
|
90
|
+
body: JSON.stringify({
|
|
91
|
+
email: "invitee@example.com",
|
|
92
|
+
password: "anything",
|
|
93
|
+
}),
|
|
94
|
+
});
|
|
95
|
+
expect(res.status).toBe(403);
|
|
96
|
+
expect(await res.json()).toMatchObject({
|
|
97
|
+
error: true,
|
|
98
|
+
message: "This invitation has not been accepted yet.",
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
it("accepts an invite by activating the existing pending user", async () => {
|
|
102
|
+
const { app, db } = await createAuthApp();
|
|
103
|
+
db.seed("users", [
|
|
104
|
+
{
|
|
105
|
+
id: "admin_1",
|
|
106
|
+
email: "admin@example.com",
|
|
107
|
+
password: await hashPassword("correct-password"),
|
|
108
|
+
roles: ["admin"],
|
|
109
|
+
status: "active",
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
id: "invitee_1",
|
|
113
|
+
email: "invitee@example.com",
|
|
114
|
+
password: "salt:hash",
|
|
115
|
+
status: "pending",
|
|
116
|
+
},
|
|
117
|
+
]);
|
|
118
|
+
const adminToken = await loginAsAdmin(app);
|
|
119
|
+
const inviteRes = await app.request("/api/collections/users/invite", {
|
|
120
|
+
method: "POST",
|
|
121
|
+
headers: {
|
|
122
|
+
"content-type": "application/json",
|
|
123
|
+
authorization: `Bearer ${adminToken}`,
|
|
124
|
+
},
|
|
125
|
+
body: JSON.stringify({
|
|
126
|
+
email: "invitee@example.com",
|
|
127
|
+
inviteUrl: "https://cms.example.com/admin",
|
|
128
|
+
}),
|
|
129
|
+
});
|
|
130
|
+
const inviteBody = await inviteRes.json();
|
|
131
|
+
const acceptRes = await app.request("/api/collections/users/accept-invite", {
|
|
132
|
+
method: "POST",
|
|
133
|
+
headers: { "content-type": "application/json" },
|
|
134
|
+
body: JSON.stringify({
|
|
135
|
+
token: inviteBody.token,
|
|
136
|
+
password: "StrongPass123!",
|
|
137
|
+
name: "Invited User",
|
|
138
|
+
}),
|
|
139
|
+
});
|
|
140
|
+
expect(acceptRes.status).toBe(201);
|
|
141
|
+
const users = await db.find({
|
|
142
|
+
collection: "users",
|
|
143
|
+
where: { email: "invitee@example.com" },
|
|
144
|
+
limit: 10,
|
|
145
|
+
});
|
|
146
|
+
expect(users.total).toBe(1);
|
|
147
|
+
expect(users.docs[0]?.id).toBe("invitee_1");
|
|
148
|
+
expect(users.docs[0]?.status).toBe("active");
|
|
149
|
+
expect(users.docs[0]?.name).toBe("Invited User");
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
//# sourceMappingURL=auth-invite.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-invite.test.js","sourceRoot":"","sources":["../../src/__tests__/auth-invite.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,KAAK,UAAU,aAAa;QAC1B,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,sBAAsB,CAAC;QAEzD,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,MAAM,iBAAiB,CACjC,YAAY,CAAC;YACX,WAAW,EAAE;gBACX,gBAAgB,CAAC;oBACf,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;iBACzC,CAAC;aACH;YACD,OAAO,EAAE,EAAE;YACX,EAAE;YACF,KAAK,EAAE;gBACL,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,SAAS;aAChB;SACF,CAAC,CACH,CAAC;QAEF,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,UAAU,YAAY,CAAC,GAAqD;QAC/E,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,8BAA8B,EAAE;YACjE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,mBAAmB;gBAC1B,QAAQ,EAAE,kBAAkB;aAC7B,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC,KAAe,CAAC;IACnC,CAAC;IAED,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACvE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa,EAAE,CAAC;QAErD,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YACf;gBACE,EAAE,EAAE,SAAS;gBACb,KAAK,EAAE,mBAAmB;gBAC1B,QAAQ,EAAE,MAAM,YAAY,CAAC,kBAAkB,CAAC;gBAChD,KAAK,EAAE,CAAC,OAAO,CAAC;gBAChB,MAAM,EAAE,QAAQ;aACjB;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC;QAE3C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,+BAA+B,EAAE;YAC7D,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,UAAU,EAAE;aACtC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,qBAAqB;gBAC5B,SAAS,EAAE,+BAA+B;aAC3C,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAEjD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC;YAC5B,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE;YACvC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,CAAC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,MAAM,aAAa,EAAE,CAAC;QAE1C,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YACf;gBACE,EAAE,EAAE,WAAW;gBACf,KAAK,EAAE,qBAAqB;gBAC5B,QAAQ,EAAE,WAAW;gBACrB,MAAM,EAAE,SAAS;aAClB;SACF,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,8BAA8B,EAAE;YAC5D,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,qBAAqB;gBAC5B,QAAQ,EAAE,UAAU;aACrB,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACrC,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,4CAA4C;SACtD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,MAAM,aAAa,EAAE,CAAC;QAE1C,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YACf;gBACE,EAAE,EAAE,SAAS;gBACb,KAAK,EAAE,mBAAmB;gBAC1B,QAAQ,EAAE,MAAM,YAAY,CAAC,kBAAkB,CAAC;gBAChD,KAAK,EAAE,CAAC,OAAO,CAAC;gBAChB,MAAM,EAAE,QAAQ;aACjB;YACD;gBACE,EAAE,EAAE,WAAW;gBACf,KAAK,EAAE,qBAAqB;gBAC5B,QAAQ,EAAE,WAAW;gBACrB,MAAM,EAAE,SAAS;aAClB;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC;QAE3C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,+BAA+B,EAAE;YACnE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,UAAU,EAAE;aACtC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,qBAAqB;gBAC5B,SAAS,EAAE,+BAA+B;aAC3C,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QAE1C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,sCAAsC,EAAE;YAC1E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,gBAAgB;gBAC1B,IAAI,EAAE,cAAc;aACrB,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE;YACvC,KAAK,EAAE,EAAE;SACV,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-lockout.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/auth-lockout.test.ts"],"names":[],"mappings":""}
|