@antelopejs/dms-media 0.7.0 → 0.7.1
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/README.md +17 -23
- package/dist/acl/entries.js +2 -1
- package/dist/acl/entries.js.map +1 -1
- package/dist/asset-lifecycle.js.map +1 -1
- package/dist/db/models/mediaAssets.model.d.ts +7 -5
- package/dist/db/models/mediaDeclarations.model.d.ts +7 -5
- package/dist/db/models/mediaEvents.model.d.ts +7 -5
- package/dist/db/models/mediaFavorites.model.d.ts +7 -5
- package/dist/db/models/mediaFolders.model.d.ts +7 -5
- package/dist/db/models/mediaUploads.model.d.ts +7 -5
- package/dist/declared/assets.js +2 -5
- package/dist/declared/assets.js.map +1 -1
- package/dist/declared/records.d.ts +2 -1
- package/dist/declared/records.js.map +1 -1
- package/dist/library/activity.js +2 -1
- package/dist/library/activity.js.map +1 -1
- package/dist/routes/media/manage.js +2 -2
- package/dist/routes/media/manage.js.map +1 -1
- package/dist/routes/media/storage-keys.js.map +1 -1
- package/dist/test/antelope.test.js +7 -5
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/helpers/assets.d.ts +24 -5
- package/dist/test/helpers/assets.js +22 -7
- package/dist/test/helpers/assets.js.map +1 -1
- package/dist/test/helpers/bodies.d.ts +31 -0
- package/dist/test/helpers/bodies.js +16 -0
- package/dist/test/helpers/bodies.js.map +1 -0
- package/dist/test/helpers/folders.d.ts +50 -0
- package/dist/test/helpers/folders.js +4 -2
- package/dist/test/helpers/folders.js.map +1 -1
- package/dist/test/helpers/members.js +10 -3
- package/dist/test/helpers/members.js.map +1 -1
- package/dist/test/helpers/owner.js +6 -1
- package/dist/test/helpers/owner.js.map +1 -1
- package/dist/test/helpers/permissions-world.d.ts +132 -11
- package/dist/test/helpers/permissions-world.js +21 -2
- package/dist/test/helpers/permissions-world.js.map +1 -1
- package/dist/test/helpers/setup-token.d.ts +1 -0
- package/dist/test/helpers/setup-token.js +5 -0
- package/dist/test/helpers/setup-token.js.map +1 -0
- package/dist/test/integration/derivative-sweep-query.test.js +1 -2
- package/dist/test/integration/derivative-sweep-query.test.js.map +1 -1
- package/dist/test/integration/folder-cascade.test.js +3 -1
- package/dist/test/integration/folder-cascade.test.js.map +1 -1
- package/dist/test/integration/media-activity-overview.test.js +39 -12
- package/dist/test/integration/media-activity-overview.test.js.map +1 -1
- package/dist/test/integration/media-api.test.js +22 -21
- package/dist/test/integration/media-api.test.js.map +1 -1
- package/dist/test/integration/media-bindings.test.js +6 -5
- package/dist/test/integration/media-bindings.test.js.map +1 -1
- package/dist/test/integration/media-declared-content.test.js +2 -1
- package/dist/test/integration/media-declared-content.test.js.map +1 -1
- package/dist/test/integration/media-delivery-editing.test.js +12 -2
- package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
- package/dist/test/integration/media-delivery.test.js +5 -3
- package/dist/test/integration/media-delivery.test.js.map +1 -1
- package/dist/test/integration/media-explorer-writes.test.js +6 -4
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-guards.test.js +11 -16
- package/dist/test/integration/media-guards.test.js.map +1 -1
- package/dist/test/integration/media-library.test.js +73 -23
- package/dist/test/integration/media-library.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +3 -2
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-member-access.test.js +18 -2
- package/dist/test/integration/media-member-access.test.js.map +1 -1
- package/dist/test/integration/media-permissions.test.js +7 -2
- package/dist/test/integration/media-permissions.test.js.map +1 -1
- package/dist/test/integration/media-project-field.test.js +17 -2
- package/dist/test/integration/media-project-field.test.js.map +1 -1
- package/dist/test/integration/media-search-views.test.js +24 -10
- package/dist/test/integration/media-search-views.test.js.map +1 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js +2 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -1
- package/dist/test/integration/media-transform.test.js +8 -9
- package/dist/test/integration/media-transform.test.js.map +1 -1
- package/dist/test/integration/media-upload-history-filters.test.d.ts +1 -0
- package/dist/test/integration/media-upload-history-filters.test.js +67 -0
- package/dist/test/integration/media-upload-history-filters.test.js.map +1 -0
- package/dist/test/integration/media-upload-policy.test.js +31 -14
- package/dist/test/integration/media-upload-policy.test.js.map +1 -1
- package/dist/test/integration/permissions-management.js +15 -4
- package/dist/test/integration/permissions-management.js.map +1 -1
- package/dist/test/unit/declared.test.js +1 -1
- package/dist/test/unit/declared.test.js.map +1 -1
- package/dist/test/unit/library/zip-names.test.js +22 -4
- package/dist/test/unit/library/zip-names.test.js.map +1 -1
- package/dist/test/unit/upload-rules.test.js +10 -0
- package/dist/test/unit/upload-rules.test.js.map +1 -1
- package/dist/transform-ops.js.map +1 -1
- package/dist/upload-policy.js +11 -11
- package/dist/upload-policy.js.map +1 -1
- package/dist/validation/declared.schema.d.ts +4 -4
- package/dist/validation/library.schema.d.ts +10 -10
- package/dist/validation/media.schema.d.ts +8 -9
- package/dist/validation/media.schema.js +4 -6
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/package.json +2 -2
- package/package.json +12 -11
- package/skills/dms-media/SKILL.md +2 -2
- package/src/acl/entries.ts +5 -2
- package/src/asset-lifecycle.ts +2 -1
- package/src/declared/assets.ts +6 -6
- package/src/declared/records.ts +5 -1
- package/src/library/activity.ts +3 -1
- package/src/routes/media/manage.ts +2 -2
- package/src/routes/media/storage-keys.ts +1 -0
- package/src/test/antelope.test.ts +7 -5
- package/src/test/helpers/assets.ts +28 -15
- package/src/test/helpers/bodies.ts +22 -0
- package/src/test/helpers/folders.ts +6 -3
- package/src/test/helpers/members.ts +11 -3
- package/src/test/helpers/owner.ts +6 -1
- package/src/test/helpers/permissions-world.ts +23 -19
- package/src/test/helpers/setup-token.ts +6 -0
- package/src/test/integration/derivative-sweep-query.test.ts +4 -3
- package/src/test/integration/folder-cascade.test.ts +3 -1
- package/src/test/integration/media-activity-overview.test.ts +52 -37
- package/src/test/integration/media-api.test.ts +25 -27
- package/src/test/integration/media-bindings.test.ts +10 -16
- package/src/test/integration/media-declared-content.test.ts +2 -1
- package/src/test/integration/media-delivery-editing.test.ts +13 -2
- package/src/test/integration/media-delivery.test.ts +8 -3
- package/src/test/integration/media-explorer-writes.test.ts +6 -4
- package/src/test/integration/media-guards.test.ts +18 -13
- package/src/test/integration/media-library.test.ts +101 -47
- package/src/test/integration/media-linked-subfolders.test.ts +3 -2
- package/src/test/integration/media-member-access.test.ts +22 -24
- package/src/test/integration/media-permissions.test.ts +11 -5
- package/src/test/integration/media-project-field.test.ts +21 -9
- package/src/test/integration/media-search-views.test.ts +35 -31
- package/src/test/integration/media-storage-origin-unreachable.test.ts +2 -1
- package/src/test/integration/media-transform.test.ts +8 -9
- package/src/test/integration/media-upload-history-filters.test.ts +77 -0
- package/src/test/integration/media-upload-policy.test.ts +39 -20
- package/src/test/integration/permissions-management.ts +16 -4
- package/src/test/unit/declared.test.ts +4 -1
- package/src/test/unit/library/zip-names.test.ts +26 -7
- package/src/test/unit/upload-rules.test.ts +11 -0
- package/src/transform-ops.ts +1 -0
- package/src/upload-policy.ts +11 -11
- package/src/validation/media.schema.ts +8 -8
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import
|
|
2
|
+
import type { AxiosInstance } from "axios";
|
|
3
3
|
import { expect } from "chai";
|
|
4
|
+
import { putPresigned } from "../helpers/assets";
|
|
5
|
+
import { createdBody, presignBody, readBody } from "../helpers/bodies";
|
|
4
6
|
import { authorizedClient, createClient } from "../helpers/http";
|
|
5
7
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
6
8
|
|
|
@@ -99,12 +101,14 @@ describe("[integration] media guards — every endpoint requires auth and rights
|
|
|
99
101
|
});
|
|
100
102
|
expect(folder.status).to.equal(HTTP_OK);
|
|
101
103
|
const confirm = await owner.post("/api/media/upload/confirm", {
|
|
102
|
-
folderId: folder.
|
|
104
|
+
folderId: readBody(folder, createdBody).id,
|
|
103
105
|
resourceKey: "media/whatever/not-staged.txt",
|
|
104
106
|
filename: "not-staged.txt",
|
|
105
107
|
});
|
|
106
108
|
expect(confirm.status).to.equal(HTTP_BAD_REQUEST);
|
|
107
|
-
await owner.delete(
|
|
109
|
+
await owner.delete(
|
|
110
|
+
`/api/media/folders/${readBody(folder, createdBody).id}`,
|
|
111
|
+
);
|
|
108
112
|
});
|
|
109
113
|
|
|
110
114
|
it("filters unreadable assets out of previews instead of failing", async () => {
|
|
@@ -120,25 +124,26 @@ describe("[integration] media guards — every endpoint requires auth and rights
|
|
|
120
124
|
const folderB = await owner.post("/api/media/folders", { name: "KeyB" });
|
|
121
125
|
const body = Buffer.from("cross-folder");
|
|
122
126
|
const presign = await owner.post("/api/media/upload/presign", {
|
|
123
|
-
folderId: folderA.
|
|
127
|
+
folderId: readBody(folderA, createdBody).id,
|
|
124
128
|
filename: "x.txt",
|
|
125
129
|
size: body.byteLength,
|
|
126
130
|
mimetype: "text/plain",
|
|
127
131
|
});
|
|
128
132
|
expect(presign.status).to.equal(HTTP_OK);
|
|
129
|
-
const
|
|
130
|
-
|
|
131
|
-
validateStatus: () => true,
|
|
132
|
-
transformRequest: [(data) => data],
|
|
133
|
-
});
|
|
133
|
+
const presigned = readBody(presign, presignBody);
|
|
134
|
+
const put = await putPresigned(presigned, body);
|
|
134
135
|
expect(put.status).to.be.lessThan(300);
|
|
135
136
|
const confirm = await owner.post("/api/media/upload/confirm", {
|
|
136
|
-
folderId: folderB.
|
|
137
|
-
resourceKey:
|
|
137
|
+
folderId: readBody(folderB, createdBody).id,
|
|
138
|
+
resourceKey: presigned.resourceKey,
|
|
138
139
|
filename: "x.txt",
|
|
139
140
|
});
|
|
140
141
|
expect(confirm.status).to.equal(HTTP_BAD_REQUEST);
|
|
141
|
-
await owner.delete(
|
|
142
|
-
|
|
142
|
+
await owner.delete(
|
|
143
|
+
`/api/media/folders/${readBody(folderA, createdBody).id}`,
|
|
144
|
+
);
|
|
145
|
+
await owner.delete(
|
|
146
|
+
`/api/media/folders/${readBody(folderB, createdBody).id}`,
|
|
147
|
+
);
|
|
143
148
|
});
|
|
144
149
|
});
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type { AxiosInstance } from "axios";
|
|
2
2
|
import { expect } from "chai";
|
|
3
|
+
import { z } from "zod";
|
|
3
4
|
import {
|
|
4
5
|
ONE_PIXEL_PNG,
|
|
5
6
|
PNG_MIMETYPE,
|
|
6
7
|
uploadAssetInBatch,
|
|
7
8
|
uploadTextAsset,
|
|
8
9
|
} from "../helpers/assets";
|
|
10
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
9
11
|
import { authorizedClient } from "../helpers/http";
|
|
10
12
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
11
13
|
|
|
@@ -20,20 +22,62 @@ const ZIP_ENTRY_COUNT_OFFSET = 10;
|
|
|
20
22
|
const BATCH_ID = "batch-library-test";
|
|
21
23
|
const BATCH_FILES = 3;
|
|
22
24
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
const assetRowSchema = z.object({
|
|
26
|
+
id: z.string(),
|
|
27
|
+
name: z.string(),
|
|
28
|
+
folderId: z.string(),
|
|
29
|
+
alt: z.string().nullish(),
|
|
30
|
+
starred: z.boolean(),
|
|
31
|
+
typeGroup: z.string(),
|
|
32
|
+
matchedOn: z.string().nullish(),
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
type AssetRow = z.infer<typeof assetRowSchema>;
|
|
27
36
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
+
const assetsBody = z.object({ assets: z.array(assetRowSchema) });
|
|
38
|
+
const treeBody = z.object({
|
|
39
|
+
folders: z.array(
|
|
40
|
+
z.object({ id: z.string(), fileCount: z.number(), size: z.number() }),
|
|
41
|
+
),
|
|
42
|
+
});
|
|
43
|
+
const deliveryBody = z.object({
|
|
44
|
+
items: z.array(
|
|
45
|
+
z.object({
|
|
46
|
+
id: z.string(),
|
|
47
|
+
value: z.string().optional(),
|
|
48
|
+
copyValue: z.string().optional(),
|
|
49
|
+
}),
|
|
50
|
+
),
|
|
51
|
+
});
|
|
52
|
+
const activityBody = z.object({
|
|
53
|
+
items: z.array(
|
|
54
|
+
z.object({
|
|
55
|
+
title: z.string(),
|
|
56
|
+
params: z
|
|
57
|
+
.object({ count: z.object({ value: z.unknown() }).optional() })
|
|
58
|
+
.passthrough(),
|
|
59
|
+
}),
|
|
60
|
+
),
|
|
61
|
+
});
|
|
62
|
+
const historyBody = z.object({
|
|
63
|
+
items: z.array(z.object({ title: z.string() })),
|
|
64
|
+
});
|
|
65
|
+
const batchesBody = z.object({
|
|
66
|
+
results: z.array(
|
|
67
|
+
z.object({
|
|
68
|
+
_id: z.string(),
|
|
69
|
+
files: z.number(),
|
|
70
|
+
failed: z.number(),
|
|
71
|
+
result: z.string(),
|
|
72
|
+
folder: z.string(),
|
|
73
|
+
}),
|
|
74
|
+
),
|
|
75
|
+
});
|
|
76
|
+
const presetsBody = z.object({
|
|
77
|
+
presets: z.array(
|
|
78
|
+
z.object({ id: z.string(), cacheKey: z.string(), rendered: z.number() }),
|
|
79
|
+
),
|
|
80
|
+
});
|
|
37
81
|
|
|
38
82
|
describe("[integration] media library — listings, search, bulk and overview", () => {
|
|
39
83
|
let client: AxiosInstance;
|
|
@@ -46,20 +90,24 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
46
90
|
this.timeout(30_000);
|
|
47
91
|
const session = await ensureOwnerSession();
|
|
48
92
|
client = authorizedClient(session.accessToken);
|
|
49
|
-
rootId = (
|
|
50
|
-
.
|
|
51
|
-
|
|
93
|
+
rootId = readBody(
|
|
94
|
+
await client.post("/api/media/folders", { name: "Library spec" }),
|
|
95
|
+
createdBody,
|
|
96
|
+
).id;
|
|
97
|
+
childId = readBody(
|
|
52
98
|
await client.post("/api/media/folders", {
|
|
53
99
|
name: "Oak shots",
|
|
54
100
|
parentId: rootId,
|
|
55
|
-
})
|
|
56
|
-
|
|
57
|
-
|
|
101
|
+
}),
|
|
102
|
+
createdBody,
|
|
103
|
+
).id;
|
|
104
|
+
otherId = readBody(
|
|
58
105
|
await client.post("/api/media/folders", {
|
|
59
106
|
name: "Other spec",
|
|
60
107
|
parentId: rootId,
|
|
61
|
-
})
|
|
62
|
-
|
|
108
|
+
}),
|
|
109
|
+
createdBody,
|
|
110
|
+
).id;
|
|
63
111
|
for (const name of ["oak-b.png", "oak-a.png", "walnut.png"]) {
|
|
64
112
|
const asset = await uploadAssetInBatch(client, childId, {
|
|
65
113
|
filename: name,
|
|
@@ -79,11 +127,11 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
79
127
|
it("returns recursive counts, view counts and the upload limit with the tree", async () => {
|
|
80
128
|
const response = await client.get("/api/media/tree");
|
|
81
129
|
expect(response.status).to.equal(HTTP_OK);
|
|
82
|
-
const root = response.
|
|
83
|
-
(folder
|
|
130
|
+
const root = readBody(response, treeBody).folders.find(
|
|
131
|
+
(folder) => folder.id === rootId,
|
|
84
132
|
);
|
|
85
|
-
expect(root
|
|
86
|
-
expect(root
|
|
133
|
+
expect(root?.fileCount).to.equal(4);
|
|
134
|
+
expect(root?.size).to.be.greaterThan(0);
|
|
87
135
|
expect(response.data.views.missingAlt).to.be.at.least(3);
|
|
88
136
|
expect(response.data.maxUploadBytes).to.equal(500 * 1024 * 1024);
|
|
89
137
|
expect(response.data.isOwner).to.equal(true);
|
|
@@ -149,7 +197,9 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
149
197
|
alt: "Oak desk in a bright studio",
|
|
150
198
|
});
|
|
151
199
|
const missing = await client.get("/api/media/views/missing-alt");
|
|
152
|
-
const names = missing.
|
|
200
|
+
const names = readBody(missing, assetsBody).assets.map(
|
|
201
|
+
(asset) => asset.name,
|
|
202
|
+
);
|
|
153
203
|
expect(names).to.include("oak-b.png");
|
|
154
204
|
expect(names).not.to.include("oak-a.png");
|
|
155
205
|
expect(names).not.to.include("notes.txt");
|
|
@@ -210,16 +260,20 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
210
260
|
const assetId = ids["oak-a.png"];
|
|
211
261
|
const links = await client.get(`/api/media/assets/${assetId}/delivery`);
|
|
212
262
|
expect(links.status).to.equal(HTTP_OK);
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
)
|
|
221
|
-
|
|
222
|
-
expect(
|
|
263
|
+
const { items } = readBody(links, deliveryBody);
|
|
264
|
+
expect(items.map((item) => item.id)).to.deep.equal([
|
|
265
|
+
"stable",
|
|
266
|
+
"thumb",
|
|
267
|
+
"preview",
|
|
268
|
+
"asset-id",
|
|
269
|
+
"presets",
|
|
270
|
+
]);
|
|
271
|
+
const [stable] = items;
|
|
272
|
+
expect(items.find((item) => item.id === "asset-id")?.value).to.equal(
|
|
273
|
+
assetId,
|
|
274
|
+
);
|
|
275
|
+
expect(stable?.value).to.equal(`/media/${assetId}/oak-a.png`);
|
|
276
|
+
expect(stable?.copyValue).to.match(
|
|
223
277
|
new RegExp(`^https?://[^/]+/media/${assetId}/oak-a\\.png$`),
|
|
224
278
|
);
|
|
225
279
|
const notice = await client.get(
|
|
@@ -307,8 +361,8 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
307
361
|
params: { limit: 50 },
|
|
308
362
|
});
|
|
309
363
|
expect(response.status).to.equal(HTTP_OK);
|
|
310
|
-
const batch = response.
|
|
311
|
-
(item
|
|
364
|
+
const batch = readBody(response, activityBody).items.find(
|
|
365
|
+
(item) =>
|
|
312
366
|
item.title === "$dms_media.activity.asset_upload" &&
|
|
313
367
|
item.params.count?.value === BATCH_FILES,
|
|
314
368
|
);
|
|
@@ -316,8 +370,8 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
316
370
|
const history = await client.get(
|
|
317
371
|
`/api/media/assets/${ids["oak-b.png"]}/history`,
|
|
318
372
|
);
|
|
319
|
-
const titles = history.
|
|
320
|
-
(item
|
|
373
|
+
const titles = readBody(history, historyBody).items.map(
|
|
374
|
+
(item) => item.title,
|
|
321
375
|
);
|
|
322
376
|
expect(titles).to.include("$dms_media.activity.asset_move");
|
|
323
377
|
expect(titles).to.include("$dms_media.activity.asset_visibility_public");
|
|
@@ -335,22 +389,22 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
335
389
|
});
|
|
336
390
|
expect(report.status).to.equal(HTTP_OK);
|
|
337
391
|
const batches = await client.get("/api/media/upload/batches");
|
|
338
|
-
const row = batches.
|
|
339
|
-
(entry
|
|
392
|
+
const row = readBody(batches, batchesBody).results.find(
|
|
393
|
+
(entry) => entry._id === BATCH_ID,
|
|
340
394
|
);
|
|
341
395
|
expect(row).to.include({ files: 3, failed: 1, result: "partial" });
|
|
342
|
-
expect(row
|
|
396
|
+
expect(row?.folder).to.equal("Library spec › Oak shots");
|
|
343
397
|
});
|
|
344
398
|
|
|
345
399
|
it("lists delivery presets with their cache keys", async () => {
|
|
346
400
|
await client.get(`/api/media/previews?ids=${ids["oak-a.png"]}`);
|
|
347
401
|
const response = await client.get("/api/media/presets");
|
|
348
402
|
expect(response.status).to.equal(HTTP_OK);
|
|
349
|
-
const thumb = response.
|
|
350
|
-
(preset
|
|
403
|
+
const thumb = readBody(response, presetsBody).presets.find(
|
|
404
|
+
(preset) => preset.id === "thumb",
|
|
351
405
|
);
|
|
352
|
-
expect(thumb
|
|
353
|
-
expect(thumb
|
|
406
|
+
expect(thumb?.cacheKey).to.match(/^thumb\./);
|
|
407
|
+
expect(thumb?.rendered).to.be.at.least(1);
|
|
354
408
|
expect(response.data.cache.schedule).to.equal("0 4 * * *");
|
|
355
409
|
});
|
|
356
410
|
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
MediaFolderModel,
|
|
16
16
|
} from "../../db";
|
|
17
17
|
import { ONE_PIXEL_PNG, PNG_MIMETYPE } from "../helpers/assets";
|
|
18
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
18
19
|
import { type FolderNode, fetchFolderNodes } from "../helpers/folders";
|
|
19
20
|
import { authorizedClient } from "../helpers/http";
|
|
20
21
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
@@ -151,11 +152,11 @@ describe("[integration] media linked subfolders — bindings that allow them", (
|
|
|
151
152
|
});
|
|
152
153
|
const nested = await client.post("/api/media/folders", {
|
|
153
154
|
name: "Roof",
|
|
154
|
-
parentId: created.
|
|
155
|
+
parentId: readBody(created, createdBody).id,
|
|
155
156
|
});
|
|
156
157
|
const presign = (filename: string, mimetype: string) =>
|
|
157
158
|
client.post("/api/media/upload/presign", {
|
|
158
|
-
folderId: nested.
|
|
159
|
+
folderId: readBody(nested, createdBody).id,
|
|
159
160
|
filename,
|
|
160
161
|
size: 4,
|
|
161
162
|
mimetype,
|
|
@@ -11,9 +11,11 @@ import {
|
|
|
11
11
|
} from "@antelopejs/interface-dms/permissions";
|
|
12
12
|
import type { AxiosInstance } from "axios";
|
|
13
13
|
import { assert, expect } from "chai";
|
|
14
|
+
import { z } from "zod";
|
|
14
15
|
import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
15
16
|
import { MEDIA_PAGE_PERMISSION } from "../../pages/files";
|
|
16
17
|
import { type UploadedAsset, uploadTextAsset } from "../helpers/assets";
|
|
18
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
17
19
|
import { readFolderAcl } from "../helpers/folders";
|
|
18
20
|
import { authorizedClient } from "../helpers/http";
|
|
19
21
|
import {
|
|
@@ -43,29 +45,25 @@ class MemberAccessProbePage extends PageController("member-access-probe", {
|
|
|
43
45
|
static content = CustomComponent("dms-media-member-access-probe");
|
|
44
46
|
}
|
|
45
47
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
48
|
+
const treeBody = z.object({
|
|
49
|
+
folders: z.array(
|
|
50
|
+
z.object({
|
|
51
|
+
id: z.string(),
|
|
52
|
+
name: z.string(),
|
|
53
|
+
shell: z.boolean(),
|
|
54
|
+
rights: z.object({
|
|
55
|
+
read: z.boolean(),
|
|
56
|
+
write: z.boolean(),
|
|
57
|
+
manage: z.boolean(),
|
|
58
|
+
}),
|
|
59
|
+
}),
|
|
60
|
+
),
|
|
61
|
+
root: z.object({ write: z.boolean(), manage: z.boolean() }),
|
|
62
|
+
isOwner: z.boolean(),
|
|
63
|
+
});
|
|
63
64
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
root: RootRights;
|
|
67
|
-
isOwner: boolean;
|
|
68
|
-
}
|
|
65
|
+
type TreeResponse = z.infer<typeof treeBody>;
|
|
66
|
+
type TreeFolder = TreeResponse["folders"][number];
|
|
69
67
|
|
|
70
68
|
interface MemberAccessWorld {
|
|
71
69
|
owner: AxiosInstance;
|
|
@@ -79,7 +77,7 @@ interface MemberAccessWorld {
|
|
|
79
77
|
async function fetchTree(client: AxiosInstance): Promise<TreeResponse> {
|
|
80
78
|
const response = await client.get("/api/media/tree");
|
|
81
79
|
expect(response.status, "tree").to.equal(HTTP_OK);
|
|
82
|
-
return response
|
|
80
|
+
return readBody(response, treeBody);
|
|
83
81
|
}
|
|
84
82
|
|
|
85
83
|
function findFolder(tree: TreeResponse, name: string): TreeFolder | undefined {
|
|
@@ -125,7 +123,7 @@ async function buildWorld(): Promise<MemberAccessWorld> {
|
|
|
125
123
|
modulePageRole,
|
|
126
124
|
]),
|
|
127
125
|
linkedFolderId,
|
|
128
|
-
shelfFolderId: shelf.
|
|
126
|
+
shelfFolderId: readBody(shelf, createdBody).id,
|
|
129
127
|
ownerAsset: await uploadTextAsset(owner, linkedFolderId, "owner-file.txt"),
|
|
130
128
|
};
|
|
131
129
|
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { assert, expect } from "chai";
|
|
2
|
-
import {
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { rawGet, uploadTextAsset } from "../helpers/assets";
|
|
4
|
+
import { readBody } from "../helpers/bodies";
|
|
3
5
|
|
|
4
6
|
import {
|
|
5
7
|
assets,
|
|
@@ -24,6 +26,10 @@ import {
|
|
|
24
26
|
|
|
25
27
|
const SETUP_TIMEOUT_MS = 120_000;
|
|
26
28
|
|
|
29
|
+
const namedAssetsBody = z.object({
|
|
30
|
+
assets: z.array(z.object({ name: z.string() })),
|
|
31
|
+
});
|
|
32
|
+
|
|
27
33
|
describe("[integration] media permissions — multi-actor ACL enforcement", () => {
|
|
28
34
|
let stockAssetId: string;
|
|
29
35
|
|
|
@@ -165,8 +171,8 @@ describe("[integration] media permissions — multi-actor ACL enforcement", () =
|
|
|
165
171
|
`/api/media/folders/${folders.restricted}/assets`,
|
|
166
172
|
);
|
|
167
173
|
expect(listing.status).to.equal(HTTP_OK);
|
|
168
|
-
const names = listing.
|
|
169
|
-
(asset
|
|
174
|
+
const names = readBody(listing, namedAssetsBody).assets.map(
|
|
175
|
+
(asset) => asset.name,
|
|
170
176
|
);
|
|
171
177
|
expect(names).to.include("secret.txt");
|
|
172
178
|
});
|
|
@@ -196,8 +202,8 @@ describe("[integration] media permissions — multi-actor ACL enforcement", () =
|
|
|
196
202
|
"/api/media/assets/search?q=secret",
|
|
197
203
|
);
|
|
198
204
|
expect(sighted.status).to.equal(HTTP_OK);
|
|
199
|
-
const names = sighted.
|
|
200
|
-
(asset
|
|
205
|
+
const names = readBody(sighted, namedAssetsBody).assets.map(
|
|
206
|
+
(asset) => asset.name,
|
|
201
207
|
);
|
|
202
208
|
expect(names).to.include("secret.txt");
|
|
203
209
|
});
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AxiosInstance } from "axios";
|
|
2
2
|
import { assert, expect } from "chai";
|
|
3
|
+
import { z } from "zod";
|
|
3
4
|
import { CustomComponent } from "@antelopejs/interface-dms/base/custom";
|
|
4
5
|
import {
|
|
5
6
|
GetPermissionId,
|
|
@@ -10,6 +11,7 @@ import {
|
|
|
10
11
|
import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
11
12
|
import { MEDIA_ROUTES } from "../../library/links";
|
|
12
13
|
import { uploadTextAsset } from "../helpers/assets";
|
|
14
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
13
15
|
import { authorizedClient } from "../helpers/http";
|
|
14
16
|
import { readPageAccess } from "../helpers/pages";
|
|
15
17
|
import {
|
|
@@ -26,13 +28,23 @@ const BINDING_ID = "editorial.article-pictures";
|
|
|
26
28
|
const FOLDER_NAME = "Article pictures";
|
|
27
29
|
const CONTENT_ROOT_NAME = "Content";
|
|
28
30
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
const treeBody = z.object({
|
|
32
|
+
folders: z.array(
|
|
33
|
+
z.object({
|
|
34
|
+
id: z.string(),
|
|
35
|
+
name: z.string(),
|
|
36
|
+
parentId: z.string().nullable(),
|
|
37
|
+
shell: z.boolean(),
|
|
38
|
+
rights: z.object({
|
|
39
|
+
read: z.boolean(),
|
|
40
|
+
write: z.boolean(),
|
|
41
|
+
manage: z.boolean(),
|
|
42
|
+
}),
|
|
43
|
+
}),
|
|
44
|
+
),
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
type TreeFolderNode = z.infer<typeof treeBody>["folders"][number];
|
|
36
48
|
|
|
37
49
|
@RegisterPage()
|
|
38
50
|
class EditorialArticlesPage extends PageController("editorial-articles", {
|
|
@@ -47,7 +59,7 @@ class EditorialArticlesPage extends PageController("editorial-articles", {
|
|
|
47
59
|
async function fetchFolders(client: AxiosInstance): Promise<TreeFolderNode[]> {
|
|
48
60
|
const response = await client.get("/api/media/tree");
|
|
49
61
|
expect(response.status, "tree").to.equal(HTTP_OK);
|
|
50
|
-
return response.
|
|
62
|
+
return readBody(response, treeBody).folders;
|
|
51
63
|
}
|
|
52
64
|
|
|
53
65
|
describe("[integration] media project field — a member uses media from a project page", () => {
|
|
@@ -127,7 +139,7 @@ describe("[integration] media project field — a member uses media from a proje
|
|
|
127
139
|
});
|
|
128
140
|
expect(created.status).to.equal(HTTP_OK);
|
|
129
141
|
const denied = await editor.client.post("/api/media/upload/presign", {
|
|
130
|
-
folderId: created.
|
|
142
|
+
folderId: readBody(created, createdBody).id,
|
|
131
143
|
filename: "nope.txt",
|
|
132
144
|
size: 1,
|
|
133
145
|
mimetype: "text/plain",
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { AxiosInstance } from "axios";
|
|
2
2
|
import { expect } from "chai";
|
|
3
|
+
import { z } from "zod";
|
|
3
4
|
import { uploadAsset } from "../helpers/assets";
|
|
5
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
4
6
|
import { authorizedClient } from "../helpers/http";
|
|
5
7
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
6
8
|
|
|
@@ -9,19 +11,20 @@ const SMALL_BODY = Buffer.alloc(10, 1);
|
|
|
9
11
|
const LARGE_BODY = Buffer.alloc(5000, 1);
|
|
10
12
|
const MEDIUM_BODY = Buffer.alloc(800, 1);
|
|
11
13
|
|
|
12
|
-
|
|
13
|
-
id: string
|
|
14
|
-
name: string
|
|
15
|
-
|
|
16
|
-
}
|
|
14
|
+
const folderRowSchema = z.object({
|
|
15
|
+
id: z.string(),
|
|
16
|
+
name: z.string(),
|
|
17
|
+
fileCount: z.number(),
|
|
18
|
+
link: z.object({ isContentRoot: z.boolean() }).nullable(),
|
|
19
|
+
accepts: z.array(z.string()).nullable(),
|
|
20
|
+
});
|
|
17
21
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
22
|
+
const foldersBody = z.object({ folders: z.array(folderRowSchema) });
|
|
23
|
+
const assetsBody = z.object({
|
|
24
|
+
assets: z.array(
|
|
25
|
+
z.object({ id: z.string(), name: z.string(), size: z.number() }),
|
|
26
|
+
),
|
|
27
|
+
});
|
|
25
28
|
|
|
26
29
|
describe("[integration] media search views — search, smart views and folder counts", () => {
|
|
27
30
|
let client: AxiosInstance;
|
|
@@ -32,15 +35,17 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
32
35
|
this.timeout(30_000);
|
|
33
36
|
const session = await ensureOwnerSession();
|
|
34
37
|
client = authorizedClient(session.accessToken);
|
|
35
|
-
rootId = (
|
|
36
|
-
await client.post("/api/media/folders", { name: "Facets Été 2026" })
|
|
37
|
-
|
|
38
|
-
|
|
38
|
+
rootId = readBody(
|
|
39
|
+
await client.post("/api/media/folders", { name: "Facets Été 2026" }),
|
|
40
|
+
createdBody,
|
|
41
|
+
).id;
|
|
42
|
+
childId = readBody(
|
|
39
43
|
await client.post("/api/media/folders", {
|
|
40
44
|
name: "Facets Produits",
|
|
41
45
|
parentId: rootId,
|
|
42
|
-
})
|
|
43
|
-
|
|
46
|
+
}),
|
|
47
|
+
createdBody,
|
|
48
|
+
).id;
|
|
44
49
|
await uploadAsset(
|
|
45
50
|
client,
|
|
46
51
|
rootId,
|
|
@@ -74,7 +79,7 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
74
79
|
params: { q, folderId: rootId },
|
|
75
80
|
});
|
|
76
81
|
expect(
|
|
77
|
-
response.
|
|
82
|
+
readBody(response, assetsBody).assets.map((asset) => asset.name),
|
|
78
83
|
q,
|
|
79
84
|
).to.deep.equal(["Été à Liège – vacances (1).txt"]);
|
|
80
85
|
}
|
|
@@ -82,7 +87,7 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
82
87
|
params: { q: "facets photo 14", folderId: rootId },
|
|
83
88
|
});
|
|
84
89
|
expect(
|
|
85
|
-
twoWords.
|
|
90
|
+
readBody(twoWords, assetsBody).assets.map((asset) => asset.name),
|
|
86
91
|
).to.deep.equal(["facets-photo-14.txt"]);
|
|
87
92
|
});
|
|
88
93
|
|
|
@@ -100,8 +105,8 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
100
105
|
const response = await client.get("/api/media/search", {
|
|
101
106
|
params: { q: "facets ete" },
|
|
102
107
|
});
|
|
103
|
-
const found = response.
|
|
104
|
-
(folder
|
|
108
|
+
const found = readBody(response, foldersBody).folders.find(
|
|
109
|
+
(folder) => folder.id === rootId,
|
|
105
110
|
);
|
|
106
111
|
expect(found?.fileCount).to.equal(3);
|
|
107
112
|
});
|
|
@@ -113,8 +118,8 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
113
118
|
starred: true,
|
|
114
119
|
});
|
|
115
120
|
const response = await client.get("/api/media/views/starred");
|
|
116
|
-
const starred = response.
|
|
117
|
-
(folder
|
|
121
|
+
const starred = readBody(response, foldersBody).folders.find(
|
|
122
|
+
(folder) => folder.id === childId,
|
|
118
123
|
);
|
|
119
124
|
expect(starred?.fileCount).to.equal(2);
|
|
120
125
|
});
|
|
@@ -124,7 +129,9 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
124
129
|
params: { folderId: rootId },
|
|
125
130
|
});
|
|
126
131
|
expect(response.data.total).to.equal(3);
|
|
127
|
-
const sizes = response.
|
|
132
|
+
const sizes = readBody(response, assetsBody).assets.map(
|
|
133
|
+
(asset) => asset.size,
|
|
134
|
+
);
|
|
128
135
|
expect(sizes).to.deep.equal([...sizes].sort((a, b) => b - a));
|
|
129
136
|
const scoped = await client.get("/api/media/views/recent", {
|
|
130
137
|
params: { folderId: childId },
|
|
@@ -148,13 +155,10 @@ describe("[integration] media search views — search, smart views and folder co
|
|
|
148
155
|
|
|
149
156
|
it("describes the Content root link without its technical id", async () => {
|
|
150
157
|
const tree = await client.get("/api/media/tree");
|
|
151
|
-
const
|
|
152
|
-
|
|
153
|
-
);
|
|
158
|
+
const { folders } = readBody(tree, foldersBody);
|
|
159
|
+
const content = folders.find((folder) => folder.link?.isContentRoot);
|
|
154
160
|
if (content) expect(content.name).to.equal("Content");
|
|
155
|
-
const plain =
|
|
156
|
-
(folder: FolderRow) => folder.id === rootId,
|
|
157
|
-
);
|
|
161
|
+
const plain = folders.find((folder) => folder.id === rootId);
|
|
158
162
|
expect(plain?.link).to.equal(null);
|
|
159
163
|
expect(plain?.accepts).to.equal(null);
|
|
160
164
|
expect(tree.data.allowedMimetypes)
|
|
@@ -2,6 +2,7 @@ import type { AxiosInstance } from "axios";
|
|
|
2
2
|
import { assert, expect } from "chai";
|
|
3
3
|
import sharp from "sharp";
|
|
4
4
|
import { rawGet, uploadAsset } from "../helpers/assets";
|
|
5
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
5
6
|
import { authorizedClient, getBaseUrl } from "../helpers/http";
|
|
6
7
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
7
8
|
|
|
@@ -56,7 +57,7 @@ describe("[integration] media when the server cannot reach the storage's public
|
|
|
56
57
|
name: "Unreachable storage origin",
|
|
57
58
|
});
|
|
58
59
|
expect(folder.status).to.equal(HTTP_OK);
|
|
59
|
-
folderId = folder.
|
|
60
|
+
folderId = readBody(folder, createdBody).id;
|
|
60
61
|
globalThis.fetch = (input, init) =>
|
|
61
62
|
requestUrl(input).pathname.startsWith(STORAGE_PATH_PREFIX)
|
|
62
63
|
? Promise.reject(new TypeError("fetch failed: egress blocked"))
|