@dyrected/core 2.5.51 → 2.5.52
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__/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__/config.test.js +57 -0
- package/dist/__tests__/config.test.js.map +1 -1
- 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 +46 -0
- package/dist/__tests__/email.service.test.js.map +1 -0
- package/dist/__tests__/fixtures/editorial-workflow.d.ts +9 -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__/mocks.d.ts +6 -0
- package/dist/__tests__/mocks.d.ts.map +1 -1
- package/dist/__tests__/mocks.js +8 -0
- package/dist/__tests__/mocks.js.map +1 -1
- 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 +95 -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.js +4 -0
- package/dist/__tests__/router.test.js.map +1 -1
- package/dist/__tests__/where.test.js +9 -1
- package/dist/__tests__/where.test.js.map +1 -1
- 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 +497 -0
- package/dist/__tests__/workflow.test.js.map +1 -0
- package/dist/app-config-DLK6bCaP.d.cts +1390 -0
- package/dist/app-config-DLK6bCaP.d.ts +1390 -0
- package/dist/app-config-oOarB6Fw.d.cts +1411 -0
- package/dist/app-config-oOarB6Fw.d.ts +1411 -0
- package/dist/auth/token.d.ts +2 -0
- package/dist/auth/token.d.ts.map +1 -1
- package/dist/auth/token.js.map +1 -1
- package/dist/controllers/admin-auth.controller.d.ts +68 -0
- package/dist/controllers/admin-auth.controller.d.ts.map +1 -0
- package/dist/controllers/admin-auth.controller.js +414 -0
- package/dist/controllers/admin-auth.controller.js.map +1 -0
- package/dist/controllers/collection.controller.d.ts +69 -0
- package/dist/controllers/collection.controller.d.ts.map +1 -1
- package/dist/controllers/collection.controller.js +232 -7
- package/dist/controllers/collection.controller.js.map +1 -1
- package/dist/controllers/global.controller.js +19 -3
- package/dist/controllers/global.controller.js.map +1 -1
- package/dist/controllers/media.controller.d.ts +2 -0
- package/dist/controllers/media.controller.d.ts.map +1 -1
- package/dist/controllers/media.controller.js +13 -6
- package/dist/controllers/media.controller.js.map +1 -1
- package/dist/index.d.cts +2 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/router.d.ts.map +1 -1
- package/dist/router.js +168 -6
- package/dist/router.js.map +1 -1
- package/dist/server.cjs +54 -8
- package/dist/server.d.cts +7 -1
- package/dist/server.d.ts +7 -1
- package/dist/server.js +54 -8
- 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.map +1 -1
- package/dist/services/email.service.js +25 -148
- package/dist/services/email.service.js.map +1 -1
- package/dist/services/population.service.d.ts.map +1 -1
- package/dist/services/population.service.js +27 -1
- package/dist/services/population.service.js.map +1 -1
- package/dist/types/access.d.ts +38 -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 +146 -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 +65 -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 +143 -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 +12 -1748
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +12 -2
- package/dist/types/index.js.map +1 -1
- 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 +303 -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 +294 -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 +84 -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/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/config.d.ts.map +1 -1
- package/dist/utils/config.js +86 -1
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/hooks.d.ts.map +1 -1
- package/dist/utils/hooks.js +12 -8
- package/dist/utils/hooks.js.map +1 -1
- package/dist/utils/openapi.d.ts.map +1 -1
- package/dist/utils/openapi.js +559 -48
- package/dist/utils/openapi.js.map +1 -1
- package/dist/utils/parse-sort.d.ts +7 -0
- package/dist/utils/parse-sort.d.ts.map +1 -0
- package/dist/utils/parse-sort.js +23 -0
- package/dist/utils/parse-sort.js.map +1 -0
- package/dist/utils/swagger.d.ts +6 -0
- package/dist/utils/swagger.d.ts.map +1 -1
- package/dist/utils/swagger.js +13 -2
- package/dist/utils/swagger.js.map +1 -1
- 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 +44 -0
- package/dist/utils/upload-validation.js.map +1 -0
- package/dist/utils/where-sanitizer.d.ts.map +1 -1
- package/dist/utils/where-sanitizer.js +4 -0
- package/dist/utils/where-sanitizer.js.map +1 -1
- package/dist/workflows.d.ts +54 -0
- package/dist/workflows.d.ts.map +1 -0
- package/dist/workflows.js +282 -0
- package/dist/workflows.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"admin-auth.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/admin-auth.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,440 @@
|
|
|
1
|
+
import { describe, expect, it, beforeEach } from "vitest";
|
|
2
|
+
import { SignJWT } from "jose";
|
|
3
|
+
import { TextEncoder } from "node:util";
|
|
4
|
+
import { Hono } from "hono";
|
|
5
|
+
import { createDyrectedApp } from "../app.js";
|
|
6
|
+
import { defineCollection, defineConfig } from "../index.js";
|
|
7
|
+
import { InMemoryAdapter } from "./mocks.js";
|
|
8
|
+
const providerSecret = new TextEncoder().encode("provider-secret");
|
|
9
|
+
async function signProviderToken(payload) {
|
|
10
|
+
return new SignJWT(payload)
|
|
11
|
+
.setProtectedHeader({ alg: "HS256" })
|
|
12
|
+
.setIssuedAt()
|
|
13
|
+
.setExpirationTime("1h")
|
|
14
|
+
.sign(providerSecret);
|
|
15
|
+
}
|
|
16
|
+
describe("external admin auth", () => {
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
process.env.DYRECTED_JWT_SECRET = "dyrected-test-secret";
|
|
19
|
+
});
|
|
20
|
+
it("exposes sanitized admin auth config in schemas", async () => {
|
|
21
|
+
const app = await createDyrectedApp(defineConfig({
|
|
22
|
+
collections: [
|
|
23
|
+
defineCollection({
|
|
24
|
+
slug: "__admins",
|
|
25
|
+
auth: true,
|
|
26
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
27
|
+
}),
|
|
28
|
+
],
|
|
29
|
+
globals: [],
|
|
30
|
+
db: new InMemoryAdapter(),
|
|
31
|
+
adminAuth: {
|
|
32
|
+
mode: "external",
|
|
33
|
+
providers: [
|
|
34
|
+
{
|
|
35
|
+
id: "partner",
|
|
36
|
+
type: "custom",
|
|
37
|
+
displayName: "Partner SSO",
|
|
38
|
+
secret: "provider-secret",
|
|
39
|
+
},
|
|
40
|
+
],
|
|
41
|
+
},
|
|
42
|
+
}));
|
|
43
|
+
const res = await app.request("/api/schemas");
|
|
44
|
+
const data = await res.json();
|
|
45
|
+
expect(res.status).toBe(200);
|
|
46
|
+
expect(data.adminAuth).toEqual({
|
|
47
|
+
mode: "external",
|
|
48
|
+
collectionSlug: "__admins",
|
|
49
|
+
provisioningMode: undefined,
|
|
50
|
+
providers: [
|
|
51
|
+
{
|
|
52
|
+
id: "partner",
|
|
53
|
+
type: "custom",
|
|
54
|
+
displayName: "Partner SSO",
|
|
55
|
+
autoRedirect: undefined,
|
|
56
|
+
},
|
|
57
|
+
],
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
it("supports JIT external provisioning for admin users", async () => {
|
|
61
|
+
const db = new InMemoryAdapter();
|
|
62
|
+
const app = await createDyrectedApp(defineConfig({
|
|
63
|
+
collections: [
|
|
64
|
+
defineCollection({
|
|
65
|
+
slug: "__admins",
|
|
66
|
+
auth: true,
|
|
67
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
68
|
+
}),
|
|
69
|
+
],
|
|
70
|
+
globals: [],
|
|
71
|
+
db,
|
|
72
|
+
adminAuth: {
|
|
73
|
+
mode: "external",
|
|
74
|
+
providers: [
|
|
75
|
+
{
|
|
76
|
+
id: "partner",
|
|
77
|
+
type: "custom",
|
|
78
|
+
displayName: "Partner SSO",
|
|
79
|
+
secret: "provider-secret",
|
|
80
|
+
},
|
|
81
|
+
],
|
|
82
|
+
resolveAccess: ({ siteId }) => ({
|
|
83
|
+
allowed: siteId === "site-a",
|
|
84
|
+
roles: ["admin"],
|
|
85
|
+
}),
|
|
86
|
+
},
|
|
87
|
+
}));
|
|
88
|
+
const providerToken = await signProviderToken({
|
|
89
|
+
sub: "acct_123",
|
|
90
|
+
email: "owner@example.com",
|
|
91
|
+
name: "Owner",
|
|
92
|
+
});
|
|
93
|
+
const loginRes = await app.request("/api/admin/auth/partner/exchange", {
|
|
94
|
+
method: "POST",
|
|
95
|
+
headers: {
|
|
96
|
+
"content-type": "application/json",
|
|
97
|
+
"x-site-id": "site-a",
|
|
98
|
+
},
|
|
99
|
+
body: JSON.stringify({ token: providerToken }),
|
|
100
|
+
});
|
|
101
|
+
expect(loginRes.status).toBe(200);
|
|
102
|
+
const loginData = await loginRes.json();
|
|
103
|
+
expect(loginData.collectionSlug).toBe("__admins");
|
|
104
|
+
expect(loginData.providerId).toBe("partner");
|
|
105
|
+
const meRes = await app.request("/api/collections/__admins/me", {
|
|
106
|
+
headers: {
|
|
107
|
+
authorization: `Bearer ${loginData.token}`,
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
expect(meRes.status).toBe(200);
|
|
111
|
+
const me = await meRes.json();
|
|
112
|
+
expect(me.email).toBe("owner@example.com");
|
|
113
|
+
expect(me.authProvider).toBe("partner");
|
|
114
|
+
expect(me.externalSubject).toBe("acct_123");
|
|
115
|
+
const allAdmins = await db.find({ collection: "__admins", limit: 10 });
|
|
116
|
+
expect(allAdmins.total).toBe(1);
|
|
117
|
+
expect(allAdmins.docs[0].password).toBeTruthy();
|
|
118
|
+
});
|
|
119
|
+
it("starts a provider from dynamic site admin auth config", async () => {
|
|
120
|
+
const app = await createDyrectedApp(defineConfig({
|
|
121
|
+
collections: [],
|
|
122
|
+
globals: [],
|
|
123
|
+
db: new InMemoryAdapter(),
|
|
124
|
+
onSchemaFetch: async (siteId) => ({
|
|
125
|
+
collections: [
|
|
126
|
+
defineCollection({
|
|
127
|
+
slug: "__admins",
|
|
128
|
+
auth: true,
|
|
129
|
+
siteId,
|
|
130
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
131
|
+
}),
|
|
132
|
+
],
|
|
133
|
+
adminAuth: {
|
|
134
|
+
mode: "external",
|
|
135
|
+
providers: [
|
|
136
|
+
{
|
|
137
|
+
id: "cloud",
|
|
138
|
+
type: "cloud",
|
|
139
|
+
displayName: "Dyrected Cloud",
|
|
140
|
+
startUrl: "https://cloud.dyrected.com/cloud/auth/admin/start",
|
|
141
|
+
secret: "provider-secret",
|
|
142
|
+
},
|
|
143
|
+
],
|
|
144
|
+
},
|
|
145
|
+
}),
|
|
146
|
+
}));
|
|
147
|
+
const host = new Hono();
|
|
148
|
+
host.use("/sites/:siteId/*", async (c, next) => {
|
|
149
|
+
c.set("siteId", c.req.param("siteId"));
|
|
150
|
+
await next();
|
|
151
|
+
});
|
|
152
|
+
host.route("/sites/:siteId", app);
|
|
153
|
+
const res = await host.request("/sites/site-a/api/admin/auth/cloud/start?returnTo=http%3A%2F%2Flocalhost%3A3000%2Fadmin");
|
|
154
|
+
expect(res.status).toBe(302);
|
|
155
|
+
const location = new URL(res.headers.get("location"));
|
|
156
|
+
expect(location.origin).toBe("https://cloud.dyrected.com");
|
|
157
|
+
expect(location.pathname).toBe("/cloud/auth/admin/start");
|
|
158
|
+
expect(location.searchParams.get("siteId")).toBe("site-a");
|
|
159
|
+
expect(location.searchParams.get("provider")).toBe("cloud");
|
|
160
|
+
expect(location.searchParams.get("returnTo")).toBe("http://localhost:3000/admin");
|
|
161
|
+
});
|
|
162
|
+
it("starts a provider with a relative start URL", async () => {
|
|
163
|
+
const app = await createDyrectedApp(defineConfig({
|
|
164
|
+
collections: [],
|
|
165
|
+
globals: [],
|
|
166
|
+
db: new InMemoryAdapter(),
|
|
167
|
+
adminAuth: {
|
|
168
|
+
mode: "external",
|
|
169
|
+
providers: [
|
|
170
|
+
{
|
|
171
|
+
id: "cloud",
|
|
172
|
+
type: "cloud",
|
|
173
|
+
displayName: "Dyrected Cloud",
|
|
174
|
+
startUrl: "/cloud/auth/admin/start",
|
|
175
|
+
secret: "provider-secret",
|
|
176
|
+
},
|
|
177
|
+
],
|
|
178
|
+
},
|
|
179
|
+
}));
|
|
180
|
+
const res = await app.request("https://cloud.dyrected.com/api/admin/auth/cloud/start?returnTo=http%3A%2F%2Flocalhost%3A3000%2Fadmin");
|
|
181
|
+
expect(res.status).toBe(302);
|
|
182
|
+
const location = new URL(res.headers.get("location"));
|
|
183
|
+
expect(location.origin).toBe("https://cloud.dyrected.com");
|
|
184
|
+
expect(location.pathname).toBe("/cloud/auth/admin/start");
|
|
185
|
+
expect(location.searchParams.get("provider")).toBe("cloud");
|
|
186
|
+
expect(location.searchParams.get("returnTo")).toBe("http://localhost:3000/admin");
|
|
187
|
+
});
|
|
188
|
+
it("returns a configuration error for unresolved provider start URLs", async () => {
|
|
189
|
+
const app = await createDyrectedApp(defineConfig({
|
|
190
|
+
collections: [],
|
|
191
|
+
globals: [],
|
|
192
|
+
db: new InMemoryAdapter(),
|
|
193
|
+
adminAuth: {
|
|
194
|
+
mode: "external",
|
|
195
|
+
providers: [
|
|
196
|
+
{
|
|
197
|
+
id: "cloud",
|
|
198
|
+
type: "cloud",
|
|
199
|
+
displayName: "Dyrected Cloud",
|
|
200
|
+
startUrl: "undefined/cloud/auth/admin/start",
|
|
201
|
+
secret: "provider-secret",
|
|
202
|
+
},
|
|
203
|
+
],
|
|
204
|
+
},
|
|
205
|
+
}));
|
|
206
|
+
const res = await app.request("/api/admin/auth/cloud/start");
|
|
207
|
+
expect(res.status).toBe(500);
|
|
208
|
+
expect(await res.json()).toEqual({
|
|
209
|
+
error: true,
|
|
210
|
+
message: 'Admin auth provider "cloud" has an invalid start URL.',
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
it("exchanges a token against dynamic site admin auth config", async () => {
|
|
214
|
+
const db = new InMemoryAdapter();
|
|
215
|
+
const app = await createDyrectedApp(defineConfig({
|
|
216
|
+
collections: [],
|
|
217
|
+
globals: [],
|
|
218
|
+
db,
|
|
219
|
+
onSchemaFetch: async (siteId) => ({
|
|
220
|
+
collections: [
|
|
221
|
+
defineCollection({
|
|
222
|
+
slug: "__admins",
|
|
223
|
+
auth: true,
|
|
224
|
+
siteId,
|
|
225
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
226
|
+
}),
|
|
227
|
+
],
|
|
228
|
+
adminAuth: {
|
|
229
|
+
mode: "external",
|
|
230
|
+
providers: [
|
|
231
|
+
{
|
|
232
|
+
id: "cloud",
|
|
233
|
+
type: "cloud",
|
|
234
|
+
displayName: "Dyrected Cloud",
|
|
235
|
+
secret: "provider-secret",
|
|
236
|
+
},
|
|
237
|
+
],
|
|
238
|
+
resolveAccess: ({ siteId: resolvedSiteId }) => ({
|
|
239
|
+
allowed: resolvedSiteId === "site-a",
|
|
240
|
+
roles: ["admin"],
|
|
241
|
+
}),
|
|
242
|
+
},
|
|
243
|
+
}),
|
|
244
|
+
}));
|
|
245
|
+
const providerToken = await signProviderToken({
|
|
246
|
+
sub: "acct_123",
|
|
247
|
+
email: "owner@example.com",
|
|
248
|
+
name: "Owner",
|
|
249
|
+
});
|
|
250
|
+
const loginRes = await app.request("/api/admin/auth/cloud/exchange", {
|
|
251
|
+
method: "POST",
|
|
252
|
+
headers: {
|
|
253
|
+
"content-type": "application/json",
|
|
254
|
+
"x-site-id": "site-a",
|
|
255
|
+
},
|
|
256
|
+
body: JSON.stringify({ token: providerToken }),
|
|
257
|
+
});
|
|
258
|
+
expect(loginRes.status).toBe(200);
|
|
259
|
+
const loginData = await loginRes.json();
|
|
260
|
+
expect(loginData.collectionSlug).toBe("__admins");
|
|
261
|
+
expect(loginData.providerId).toBe("cloud");
|
|
262
|
+
const allAdmins = await db.find({ collection: "__admins", limit: 10 });
|
|
263
|
+
expect(allAdmins.total).toBe(1);
|
|
264
|
+
expect(allAdmins.docs[0].email).toBe("owner@example.com");
|
|
265
|
+
expect(allAdmins.docs[0].authProvider).toBe("cloud");
|
|
266
|
+
});
|
|
267
|
+
it("prefers __admins over a stale configured adminAuth collection slug", async () => {
|
|
268
|
+
const db = new InMemoryAdapter();
|
|
269
|
+
const app = await createDyrectedApp(defineConfig({
|
|
270
|
+
collections: [],
|
|
271
|
+
globals: [],
|
|
272
|
+
db,
|
|
273
|
+
onSchemaFetch: async (siteId) => ({
|
|
274
|
+
collections: [
|
|
275
|
+
defineCollection({
|
|
276
|
+
slug: "__admins",
|
|
277
|
+
auth: true,
|
|
278
|
+
siteId,
|
|
279
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
280
|
+
}),
|
|
281
|
+
defineCollection({
|
|
282
|
+
slug: "accounts",
|
|
283
|
+
auth: true,
|
|
284
|
+
siteId,
|
|
285
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
286
|
+
}),
|
|
287
|
+
],
|
|
288
|
+
adminAuth: {
|
|
289
|
+
mode: "external",
|
|
290
|
+
collectionSlug: "accounts",
|
|
291
|
+
providers: [
|
|
292
|
+
{
|
|
293
|
+
id: "cloud",
|
|
294
|
+
type: "cloud",
|
|
295
|
+
displayName: "Dyrected Cloud",
|
|
296
|
+
secret: "provider-secret",
|
|
297
|
+
},
|
|
298
|
+
],
|
|
299
|
+
resolveAccess: ({ siteId: resolvedSiteId }) => ({
|
|
300
|
+
allowed: resolvedSiteId === "site-a",
|
|
301
|
+
roles: ["admin"],
|
|
302
|
+
}),
|
|
303
|
+
},
|
|
304
|
+
}),
|
|
305
|
+
}));
|
|
306
|
+
const schemasRes = await app.request("/api/schemas", {
|
|
307
|
+
headers: {
|
|
308
|
+
"x-site-id": "site-a",
|
|
309
|
+
},
|
|
310
|
+
});
|
|
311
|
+
const schemasData = await schemasRes.json();
|
|
312
|
+
expect(schemasRes.status).toBe(200);
|
|
313
|
+
expect(schemasData.adminAuth).toMatchObject({
|
|
314
|
+
mode: "external",
|
|
315
|
+
collectionSlug: "__admins",
|
|
316
|
+
});
|
|
317
|
+
const providerToken = await signProviderToken({
|
|
318
|
+
sub: "acct_123",
|
|
319
|
+
email: "owner@example.com",
|
|
320
|
+
name: "Owner",
|
|
321
|
+
});
|
|
322
|
+
const loginRes = await app.request("/api/admin/auth/cloud/exchange", {
|
|
323
|
+
method: "POST",
|
|
324
|
+
headers: {
|
|
325
|
+
"content-type": "application/json",
|
|
326
|
+
"x-site-id": "site-a",
|
|
327
|
+
},
|
|
328
|
+
body: JSON.stringify({ token: providerToken }),
|
|
329
|
+
});
|
|
330
|
+
expect(loginRes.status).toBe(200);
|
|
331
|
+
const loginData = await loginRes.json();
|
|
332
|
+
expect(loginData.collectionSlug).toBe("__admins");
|
|
333
|
+
const allAdmins = await db.find({ collection: "__admins", limit: 10 });
|
|
334
|
+
expect(allAdmins.total).toBe(1);
|
|
335
|
+
expect(allAdmins.docs[0].email).toBe("owner@example.com");
|
|
336
|
+
});
|
|
337
|
+
it("passes a normalized hook request context to delegated provider member handlers", async () => {
|
|
338
|
+
const app = await createDyrectedApp(defineConfig({
|
|
339
|
+
collections: [
|
|
340
|
+
defineCollection({
|
|
341
|
+
slug: "__admins",
|
|
342
|
+
auth: true,
|
|
343
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
344
|
+
}),
|
|
345
|
+
],
|
|
346
|
+
globals: [],
|
|
347
|
+
db: new InMemoryAdapter(),
|
|
348
|
+
adminAuth: {
|
|
349
|
+
mode: "external",
|
|
350
|
+
collectionSlug: "__admins",
|
|
351
|
+
providers: [
|
|
352
|
+
{
|
|
353
|
+
id: "cloud",
|
|
354
|
+
type: "cloud",
|
|
355
|
+
displayName: "Dyrected Cloud",
|
|
356
|
+
secret: "provider-secret",
|
|
357
|
+
members: {
|
|
358
|
+
list: async ({ req, limit, page, sort, where }) => {
|
|
359
|
+
expect(req.headers["x-site-id"]).toBe("site-a");
|
|
360
|
+
expect(req.query.limit).toBe("2");
|
|
361
|
+
expect(req.query.page).toBe("3");
|
|
362
|
+
expect(req.query.sort).toBe("-email");
|
|
363
|
+
expect(req.query.where).toBe(JSON.stringify({ email: { equals: "owner@example.com" } }));
|
|
364
|
+
expect(req.raw?.headers.get("x-site-id")).toBe("site-a");
|
|
365
|
+
expect(limit).toBe(2);
|
|
366
|
+
expect(page).toBe(3);
|
|
367
|
+
expect(sort).toBe("-email");
|
|
368
|
+
expect(where).toEqual({ email: { equals: "owner@example.com" } });
|
|
369
|
+
return {
|
|
370
|
+
docs: [{ id: "acct_123", email: "owner@example.com", roles: ["admin"] }],
|
|
371
|
+
totalDocs: 1,
|
|
372
|
+
limit: limit ?? 10,
|
|
373
|
+
page: page ?? 1,
|
|
374
|
+
totalPages: 1,
|
|
375
|
+
hasNextPage: false,
|
|
376
|
+
hasPrevPage: false,
|
|
377
|
+
};
|
|
378
|
+
},
|
|
379
|
+
},
|
|
380
|
+
},
|
|
381
|
+
],
|
|
382
|
+
},
|
|
383
|
+
}));
|
|
384
|
+
const res = await app.request(`/api/collections/__admins?limit=2&page=3&sort=-email&where=${encodeURIComponent(JSON.stringify({ email: { equals: "owner@example.com" } }))}`, {
|
|
385
|
+
headers: {
|
|
386
|
+
"x-site-id": "site-a",
|
|
387
|
+
},
|
|
388
|
+
});
|
|
389
|
+
expect(res.status).toBe(200);
|
|
390
|
+
const data = await res.json();
|
|
391
|
+
expect(data.docs).toHaveLength(1);
|
|
392
|
+
expect(data.docs[0]).toMatchObject({
|
|
393
|
+
id: "acct_123",
|
|
394
|
+
email: "owner@example.com",
|
|
395
|
+
externalSubject: "acct_123",
|
|
396
|
+
});
|
|
397
|
+
});
|
|
398
|
+
it("rejects unknown external users when provisioning is preprovisioned-only", async () => {
|
|
399
|
+
const app = await createDyrectedApp(defineConfig({
|
|
400
|
+
collections: [
|
|
401
|
+
defineCollection({
|
|
402
|
+
slug: "__admins",
|
|
403
|
+
auth: true,
|
|
404
|
+
fields: [{ name: "name", type: "text", label: "Name" }],
|
|
405
|
+
}),
|
|
406
|
+
],
|
|
407
|
+
globals: [],
|
|
408
|
+
db: new InMemoryAdapter(),
|
|
409
|
+
adminAuth: {
|
|
410
|
+
mode: "external",
|
|
411
|
+
provisioningMode: "preprovisioned_only",
|
|
412
|
+
providers: [
|
|
413
|
+
{
|
|
414
|
+
id: "partner",
|
|
415
|
+
type: "custom",
|
|
416
|
+
displayName: "Partner SSO",
|
|
417
|
+
secret: "provider-secret",
|
|
418
|
+
},
|
|
419
|
+
],
|
|
420
|
+
},
|
|
421
|
+
}));
|
|
422
|
+
const providerToken = await signProviderToken({
|
|
423
|
+
sub: "acct_123",
|
|
424
|
+
email: "owner@example.com",
|
|
425
|
+
});
|
|
426
|
+
const loginRes = await app.request("/api/admin/auth/partner/exchange", {
|
|
427
|
+
method: "POST",
|
|
428
|
+
headers: {
|
|
429
|
+
"content-type": "application/json",
|
|
430
|
+
},
|
|
431
|
+
body: JSON.stringify({ token: providerToken }),
|
|
432
|
+
});
|
|
433
|
+
expect(loginRes.status).toBe(401);
|
|
434
|
+
expect(await loginRes.json()).toMatchObject({
|
|
435
|
+
error: true,
|
|
436
|
+
message: "This account has not been provisioned for admin access.",
|
|
437
|
+
});
|
|
438
|
+
});
|
|
439
|
+
});
|
|
440
|
+
//# sourceMappingURL=admin-auth.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"admin-auth.test.js","sourceRoot":"","sources":["../../src/__tests__/admin-auth.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,13 @@ import { describe, it, expect } from 'vitest';
|
|
|
2
2
|
import { defineConfig, defineCollection, defineGlobal } from '../index.js';
|
|
3
3
|
import { MockDatabaseAdapter } from './mocks.js';
|
|
4
4
|
describe('Configuration Helpers', () => {
|
|
5
|
+
it('only accepts valid Lucide names for admin navigation icons', () => {
|
|
6
|
+
const icon = 'Newspaper';
|
|
7
|
+
// @ts-expect-error — invalid names must fail during configuration authoring.
|
|
8
|
+
const invalidIcon = 'DefinitelyNotALucideIcon';
|
|
9
|
+
expect(icon).toBe('Newspaper');
|
|
10
|
+
expect(invalidIcon).toBe('DefinitelyNotALucideIcon');
|
|
11
|
+
});
|
|
5
12
|
it('should define a collection correctly', () => {
|
|
6
13
|
const posts = defineCollection({
|
|
7
14
|
slug: 'posts',
|
|
@@ -30,5 +37,55 @@ describe('Configuration Helpers', () => {
|
|
|
30
37
|
expect(config.collections).toEqual([]);
|
|
31
38
|
expect(config.db).toBeInstanceOf(MockDatabaseAdapter);
|
|
32
39
|
});
|
|
40
|
+
it('rejects components passed directly into admin.components configuration (type test)', () => {
|
|
41
|
+
const FakeComponent = () => 'div';
|
|
42
|
+
const validDashboard = defineConfig({
|
|
43
|
+
collections: [],
|
|
44
|
+
globals: [],
|
|
45
|
+
db: new MockDatabaseAdapter(),
|
|
46
|
+
admin: {
|
|
47
|
+
components: {
|
|
48
|
+
beforeDashboard: ['custom-banner'],
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
const invalidDashboard = defineConfig({
|
|
53
|
+
collections: [],
|
|
54
|
+
globals: [],
|
|
55
|
+
db: new MockDatabaseAdapter(),
|
|
56
|
+
admin: {
|
|
57
|
+
components: {
|
|
58
|
+
// @ts-expect-error — must be an array of strings
|
|
59
|
+
beforeDashboard: [FakeComponent],
|
|
60
|
+
// @ts-expect-error — must be an array of strings
|
|
61
|
+
afterDashboard: FakeComponent,
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
const validCollection = defineCollection({
|
|
66
|
+
slug: 'posts',
|
|
67
|
+
fields: [],
|
|
68
|
+
admin: {
|
|
69
|
+
components: {
|
|
70
|
+
beforeList: ['custom-header'],
|
|
71
|
+
beforeListTable: ['custom-filters'],
|
|
72
|
+
afterListTable: ['custom-footer'],
|
|
73
|
+
afterList: ['custom-pagination'],
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
const invalidCollection = defineCollection({
|
|
78
|
+
slug: 'posts',
|
|
79
|
+
fields: [],
|
|
80
|
+
admin: {
|
|
81
|
+
components: {
|
|
82
|
+
// @ts-expect-error — must be an array of strings
|
|
83
|
+
beforeList: [FakeComponent],
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
expect(validDashboard.admin?.components?.beforeDashboard).toEqual(['custom-banner']);
|
|
88
|
+
expect(validCollection.admin?.components?.beforeList).toEqual(['custom-header']);
|
|
89
|
+
});
|
|
33
90
|
});
|
|
34
91
|
//# sourceMappingURL=config.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/__tests__/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/__tests__/config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email.service.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/email.service.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { buildInviteEmail, buildPasswordChangedEmail, buildResetPasswordEmail, buildWelcomeEmail, } from '../services/email.service.js';
|
|
3
|
+
const config = {};
|
|
4
|
+
describe('default email templates', () => {
|
|
5
|
+
it('uses one branded, table-based, inline-styled shell', () => {
|
|
6
|
+
const messages = [
|
|
7
|
+
buildWelcomeEmail(config, { email: 'person@example.com' }),
|
|
8
|
+
buildInviteEmail(config, { token: 'invite-token' }),
|
|
9
|
+
buildResetPasswordEmail(config, { token: 'reset-token', url: 'https://example.com/reset' }),
|
|
10
|
+
buildPasswordChangedEmail(config, { email: 'person@example.com' }),
|
|
11
|
+
];
|
|
12
|
+
for (const { html } of messages) {
|
|
13
|
+
expect(html).toContain('<!doctype html>');
|
|
14
|
+
expect(html).toContain('role="presentation"');
|
|
15
|
+
expect(html).toContain('max-width:600px');
|
|
16
|
+
expect(html).toContain('Dyrected');
|
|
17
|
+
expect(html).toContain('Privacy:');
|
|
18
|
+
expect(html).not.toContain('<style');
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
it('escapes all values supplied to default templates', () => {
|
|
22
|
+
const attack = '<img src=x onerror="alert(1)">&\'';
|
|
23
|
+
expect(buildWelcomeEmail(config, { email: attack }).html).not.toContain(attack);
|
|
24
|
+
expect(buildInviteEmail(config, { token: attack, invitedByEmail: attack }).html).not.toContain(attack);
|
|
25
|
+
expect(buildResetPasswordEmail(config, { token: attack }).html).not.toContain(attack);
|
|
26
|
+
expect(buildPasswordChangedEmail(config, { email: attack }).html).not.toContain(attack);
|
|
27
|
+
});
|
|
28
|
+
it('only renders CTA links with an HTTP(S) URL', () => {
|
|
29
|
+
expect(buildResetPasswordEmail(config, { token: 'safe', url: 'https://example.com/reset?a=1&b=2' }).html)
|
|
30
|
+
.toContain('href="https://example.com/reset?a=1&b=2"');
|
|
31
|
+
expect(buildResetPasswordEmail(config, { token: 'safe', url: 'javascript:alert(1)' }).html)
|
|
32
|
+
.not.toContain('href=');
|
|
33
|
+
});
|
|
34
|
+
it('continues to honor trusted custom templates', () => {
|
|
35
|
+
const customConfig = {
|
|
36
|
+
email: {
|
|
37
|
+
from: 'test@example.com',
|
|
38
|
+
send: vi.fn(),
|
|
39
|
+
templates: { welcome: () => ({ subject: 'Custom', html: '<p>Custom</p>' }) },
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
expect(buildWelcomeEmail(customConfig, { email: 'person@example.com' }))
|
|
43
|
+
.toEqual({ subject: 'Custom', html: '<p>Custom</p>' });
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
//# sourceMappingURL=email.service.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email.service.test.js","sourceRoot":"","sources":["../../src/__tests__/email.service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/** Shared by workflow integration tests and the documentation type-check. */
|
|
2
|
+
export declare const EditorialPosts: import("../../index.js").CollectionConfig<import("../../index.js").Prettify<{
|
|
3
|
+
id: string;
|
|
4
|
+
} & {
|
|
5
|
+
title: string;
|
|
6
|
+
} & {
|
|
7
|
+
body?: Record<string, unknown> | undefined;
|
|
8
|
+
} & Record<never, never> & import("../../index.js").SystemDocFields>>;
|
|
9
|
+
//# sourceMappingURL=editorial-workflow.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editorial-workflow.d.ts","sourceRoot":"","sources":["../../../src/__tests__/fixtures/editorial-workflow.ts"],"names":[],"mappings":"AAGA,6EAA6E;AAC7E,eAAO,MAAM,cAAc;;;;;;qEAOzB,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { defineCollection } from "../../index.js";
|
|
2
|
+
import { publishingWorkflow } from "../../workflows.js";
|
|
3
|
+
/** Shared by workflow integration tests and the documentation type-check. */
|
|
4
|
+
export const EditorialPosts = defineCollection({
|
|
5
|
+
slug: "posts",
|
|
6
|
+
workflow: publishingWorkflow(),
|
|
7
|
+
fields: [
|
|
8
|
+
{ name: "title", type: "text", required: true },
|
|
9
|
+
{ name: "body", type: "richText" },
|
|
10
|
+
],
|
|
11
|
+
});
|
|
12
|
+
//# sourceMappingURL=editorial-workflow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editorial-workflow.js","sourceRoot":"","sources":["../../../src/__tests__/fixtures/editorial-workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC7C,IAAI,EAAE,OAAO;IACb,QAAQ,EAAE,kBAAkB,EAAE;IAC9B,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC/C,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE;KACnC;CACF,CAAC,CAAC"}
|