@antelopejs/dms-media 0.6.1 → 0.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/README.md +18 -3
- package/dist/acl/entries.js +1 -2
- package/dist/acl/entries.js.map +1 -1
- package/dist/bindings.js +1 -3
- package/dist/bindings.js.map +1 -1
- package/dist/declared/folders.js +3 -2
- package/dist/declared/folders.js.map +1 -1
- package/dist/declared/records.d.ts +2 -2
- package/dist/declared/records.js +3 -2
- package/dist/declared/records.js.map +1 -1
- package/dist/derivatives.js +9 -6
- package/dist/derivatives.js.map +1 -1
- package/dist/guards.d.ts +4 -0
- package/dist/guards.js +19 -0
- package/dist/guards.js.map +1 -0
- package/dist/library/activity.js +7 -5
- package/dist/library/activity.js.map +1 -1
- package/dist/library/batches.js +6 -3
- package/dist/library/batches.js.map +1 -1
- package/dist/library/events.js +4 -4
- package/dist/library/events.js.map +1 -1
- package/dist/library/module-readout.js +5 -2
- package/dist/library/module-readout.js.map +1 -1
- package/dist/library/realtime.js.map +1 -1
- package/dist/pages/activity.js +1 -1
- package/dist/pages/activity.js.map +1 -1
- package/dist/routes/media/assets.d.ts +1 -1
- package/dist/routes/media/assets.js +5 -5
- package/dist/routes/media/assets.js.map +1 -1
- package/dist/routes/media/bulk.js +17 -13
- package/dist/routes/media/bulk.js.map +1 -1
- package/dist/routes/media/delivery-headers.js +9 -9
- package/dist/routes/media/delivery-headers.js.map +1 -1
- package/dist/routes/media/delivery-stream.js.map +1 -1
- package/dist/routes/media/delivery.js.map +1 -1
- package/dist/routes/media/manage.js.map +1 -1
- package/dist/routes/media/transform.js +13 -8
- package/dist/routes/media/transform.js.map +1 -1
- package/dist/test/antelope.test.js +13 -12
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/helpers/folders.d.ts +27 -0
- package/dist/test/helpers/folders.js +15 -0
- package/dist/test/helpers/folders.js.map +1 -1
- package/dist/test/helpers/pages.js +10 -6
- package/dist/test/helpers/pages.js.map +1 -1
- package/dist/test/helpers/permissions-world.d.ts +98 -0
- package/dist/test/helpers/permissions-world.js +205 -0
- package/dist/test/helpers/permissions-world.js.map +1 -0
- package/dist/test/helpers/prototype.d.ts +1 -0
- package/dist/test/helpers/prototype.js +11 -0
- package/dist/test/helpers/prototype.js.map +1 -0
- package/dist/test/integration/derivative-sweep-query.test.js +13 -16
- package/dist/test/integration/derivative-sweep-query.test.js.map +1 -1
- package/dist/test/integration/folder-query.test.js +5 -9
- package/dist/test/integration/folder-query.test.js.map +1 -1
- package/dist/test/integration/media-bindings.test.js +2 -2
- package/dist/test/integration/media-bindings.test.js.map +1 -1
- package/dist/test/integration/media-cleanup.test.js +14 -17
- package/dist/test/integration/media-cleanup.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 +7 -5
- package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
- package/dist/test/integration/media-delivery.test.js +19 -5
- package/dist/test/integration/media-delivery.test.js.map +1 -1
- package/dist/test/integration/media-explorer-writes.test.js +2 -2
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-guards.test.js +18 -7
- package/dist/test/integration/media-guards.test.js.map +1 -1
- package/dist/test/integration/media-library.test.js +1 -1
- package/dist/test/integration/media-library.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +5 -5
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-member-access.test.js +2 -5
- package/dist/test/integration/media-member-access.test.js.map +1 -1
- package/dist/test/integration/media-permissions.test.js +142 -473
- package/dist/test/integration/media-permissions.test.js.map +1 -1
- package/dist/test/integration/media-project-field.test.js +3 -5
- package/dist/test/integration/media-project-field.test.js.map +1 -1
- package/dist/test/integration/media-search-query.test.js +11 -16
- package/dist/test/integration/media-search-query.test.js.map +1 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js +1 -0
- package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -1
- package/dist/test/integration/media-upload-policy.test.js +2 -2
- package/dist/test/integration/media-upload-policy.test.js.map +1 -1
- package/dist/test/integration/permissions-management.d.ts +2 -0
- package/dist/test/integration/permissions-management.js +189 -0
- package/dist/test/integration/permissions-management.js.map +1 -0
- package/dist/test/unit/acl/entries.test.js +2 -1
- package/dist/test/unit/acl/entries.test.js.map +1 -1
- package/dist/test/unit/acl/resolver.test.js +10 -3
- package/dist/test/unit/acl/resolver.test.js.map +1 -1
- package/dist/test/unit/library/fixtures.d.ts +1 -1
- package/dist/test/unit/library/fixtures.js +6 -1
- package/dist/test/unit/library/fixtures.js.map +1 -1
- package/dist/test/unit/library/library.test.js +0 -1
- package/dist/test/unit/library/library.test.js.map +1 -1
- package/dist/test/unit/library/realtime.test.js.map +1 -1
- package/dist/test/unit/library/search-facets.test.js +2 -2
- package/dist/test/unit/library/search-facets.test.js.map +1 -1
- package/dist/test/unit/pages/toolbar.test.js +24 -7
- package/dist/test/unit/pages/toolbar.test.js.map +1 -1
- package/dist/test/unit/routes/dto.test.js +7 -6
- package/dist/test/unit/routes/dto.test.js.map +1 -1
- package/dist/test/unit/routes/file-page.test.js +5 -7
- package/dist/test/unit/routes/file-page.test.js.map +1 -1
- package/dist/test/unit/routes/preset-row.test.js +2 -1
- package/dist/test/unit/routes/preset-row.test.js.map +1 -1
- package/dist/transform.js +6 -6
- package/dist/transform.js.map +1 -1
- package/dist/upload-checks.d.ts +8 -2
- package/dist/upload-checks.js.map +1 -1
- package/dist/upload-policy.js +8 -8
- package/dist/upload-policy.js.map +1 -1
- package/dist/validation/declared.schema.js +14 -8
- package/dist/validation/declared.schema.js.map +1 -1
- package/dist/validation/media.schema.d.ts +1 -1
- package/dist/validation/media.schema.js +2 -2
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/build/imageEditor/editorShapes.ts +118 -0
- package/frontend-vue/app/build/imageEditor/useEditorSaving.ts +87 -0
- package/frontend-vue/app/build/library/libraryActions.ts +444 -0
- package/frontend-vue/app/build/library/libraryCore.ts +137 -0
- package/frontend-vue/app/components/FirstRun.vue +2 -1
- package/frontend-vue/app/components/ImageEditor.vue +22 -179
- package/frontend-vue/app/components/dialogs/DestinationDialog.vue +3 -3
- package/frontend-vue/app/components/field/FieldAltPopover.vue +2 -1
- package/frontend-vue/app/composables/library/useMediaLibrary.ts +3 -575
- package/frontend-vue/app/composables/useAssetFieldUploads.ts +9 -1
- package/frontend-vue/app/composables/useAssetLink.ts +33 -13
- package/frontend-vue/app/composables/useFileDetails.ts +6 -5
- package/frontend-vue/app/composables/useMediaApi.ts +21 -5
- package/frontend-vue/app/composables/useUploadFailureText.ts +24 -5
- package/frontend-vue/app/composables/useUploadQueue.ts +178 -44
- package/frontend-vue/app/composables/useUploadToasts.ts +81 -19
- package/frontend-vue/build/backend-boundary.ts +122 -0
- package/frontend-vue/dms.frontend.build.ts +3 -0
- package/frontend-vue/eslint.config.mjs +13 -0
- package/frontend-vue/package.json +4 -2
- package/frontend-vue/pnpm-lock.yaml +217 -61
- package/frontend-vue/tests/api-error-presentation.test.ts +183 -0
- package/frontend-vue/tests/backend-boundary.test.ts +203 -0
- package/frontend-vue/tests/fixtures/serverRender.ts +1 -1
- package/frontend-vue/tests/mediaPreviews.test.ts +39 -0
- package/package.json +5 -11
- package/skills/dms-media/SKILL.md +3 -2
- package/skills/dms-media/cases.json +38 -0
- package/src/acl/entries.ts +6 -4
- package/src/bindings.ts +3 -3
- package/src/declared/folders.ts +3 -3
- package/src/declared/records.ts +9 -8
- package/src/derivatives.ts +10 -6
- package/src/guards.ts +19 -0
- package/src/library/activity.ts +17 -9
- package/src/library/batches.ts +12 -9
- package/src/library/events.ts +7 -4
- package/src/library/module-readout.ts +6 -2
- package/src/library/realtime.ts +5 -1
- package/src/library/zip.ts +1 -1
- package/src/pages/activity.ts +6 -2
- package/src/routes/media/assets.ts +4 -3
- package/src/routes/media/bulk.ts +16 -14
- package/src/routes/media/delivery-headers.ts +9 -12
- package/src/routes/media/delivery-stream.ts +3 -2
- package/src/routes/media/delivery.ts +4 -2
- package/src/routes/media/manage.ts +4 -6
- package/src/routes/media/transform.ts +27 -23
- package/src/test/antelope.test.ts +21 -17
- package/src/test/helpers/folders.ts +22 -0
- package/src/test/helpers/pages.ts +12 -5
- package/src/test/helpers/permissions-world.ts +326 -0
- package/src/test/helpers/prototype.ts +12 -0
- package/src/test/integration/derivative-sweep-query.test.ts +19 -21
- package/src/test/integration/folder-query.test.ts +11 -11
- package/src/test/integration/media-bindings.test.ts +7 -7
- package/src/test/integration/media-cleanup.test.ts +25 -37
- package/src/test/integration/media-declared-content.test.ts +18 -19
- package/src/test/integration/media-delivery-editing.test.ts +11 -7
- package/src/test/integration/media-delivery.test.ts +29 -8
- package/src/test/integration/media-explorer-writes.test.ts +2 -7
- package/src/test/integration/media-guards.test.ts +21 -7
- package/src/test/integration/media-library.test.ts +1 -1
- package/src/test/integration/media-linked-subfolders.test.ts +11 -20
- package/src/test/integration/media-member-access.test.ts +5 -9
- package/src/test/integration/media-permissions.test.ts +56 -570
- package/src/test/integration/media-project-field.test.ts +5 -7
- package/src/test/integration/media-search-query.test.ts +16 -20
- package/src/test/integration/media-storage-origin-unreachable.test.ts +3 -2
- package/src/test/integration/media-upload-policy.test.ts +2 -8
- package/src/test/integration/permissions-management.ts +292 -0
- package/src/test/unit/acl/entries.test.ts +2 -1
- package/src/test/unit/acl/resolver.test.ts +19 -7
- package/src/test/unit/library/fixtures.ts +9 -3
- package/src/test/unit/library/library.test.ts +1 -7
- package/src/test/unit/library/realtime.test.ts +1 -1
- package/src/test/unit/library/search-facets.test.ts +2 -2
- package/src/test/unit/pages/toolbar.test.ts +42 -17
- package/src/test/unit/routes/dto.test.ts +7 -6
- package/src/test/unit/routes/file-page.test.ts +10 -9
- package/src/test/unit/routes/preset-row.test.ts +2 -2
- package/src/transform.ts +6 -6
- package/src/upload-checks.ts +12 -3
- package/src/upload-policy.ts +8 -8
- package/src/validation/declared.schema.ts +17 -12
- package/src/validation/media.schema.ts +6 -6
- package/frontend-vue/tests/engines.test.ts +0 -20
- package/frontend-vue/tests/locales.test.ts +0 -61
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
RegisterAssetBinding,
|
|
14
14
|
} from "@antelopejs/interface-dms-media";
|
|
15
15
|
import type { AxiosInstance } from "axios";
|
|
16
|
-
import { expect } from "chai";
|
|
16
|
+
import { assert, expect } from "chai";
|
|
17
17
|
import {
|
|
18
18
|
MediaAssetModel,
|
|
19
19
|
MediaDeclarationModel,
|
|
@@ -48,7 +48,8 @@ async function rejectionOf(promise: Promise<unknown>): Promise<Error> {
|
|
|
48
48
|
try {
|
|
49
49
|
await promise;
|
|
50
50
|
} catch (error) {
|
|
51
|
-
|
|
51
|
+
assert.instanceOf(error, Error);
|
|
52
|
+
return error;
|
|
52
53
|
}
|
|
53
54
|
throw new Error("Expected the declaration to be refused");
|
|
54
55
|
}
|
|
@@ -93,12 +94,11 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
93
94
|
mimetype: PNG_MIMETYPE,
|
|
94
95
|
source: { bytes: ONE_PIXEL_PNG },
|
|
95
96
|
};
|
|
96
|
-
//
|
|
97
|
-
// @ts-expect-error A JavaScript caller can omit the required tenantId.
|
|
97
|
+
// @ts-expect-error A JavaScript caller can omit the required tenantId; this call stops compiling if the public contract makes it optional.
|
|
98
98
|
expect((await rejectionOf(EnsureMediaFolder(folder))).message).to.contain(
|
|
99
99
|
"tenantId",
|
|
100
100
|
);
|
|
101
|
-
// @ts-expect-error A JavaScript caller can omit the required tenantId.
|
|
101
|
+
// @ts-expect-error A JavaScript caller can omit the required tenantId; this call stops compiling if the public contract makes it optional.
|
|
102
102
|
expect((await rejectionOf(ImportMediaAsset(file))).message).to.contain(
|
|
103
103
|
"tenantId",
|
|
104
104
|
);
|
|
@@ -110,7 +110,6 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
110
110
|
(await rejectionOf(ImportMediaAsset({ ...file, tenantId }))).message,
|
|
111
111
|
).to.contain("tenantId");
|
|
112
112
|
}
|
|
113
|
-
// Validation also precedes source reads, not only the final database write.
|
|
114
113
|
expect(
|
|
115
114
|
(
|
|
116
115
|
await rejectionOf(
|
|
@@ -121,6 +120,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
121
120
|
}),
|
|
122
121
|
)
|
|
123
122
|
).message,
|
|
123
|
+
"validation precedes source reads, not only the final database write",
|
|
124
124
|
).to.contain("tenantId");
|
|
125
125
|
expect({
|
|
126
126
|
folders: await folders().getAll(),
|
|
@@ -134,7 +134,6 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
134
134
|
const tenantId = "declared-isolation";
|
|
135
135
|
const schema = Schema.get(TENANT_SCHEMA_NAME);
|
|
136
136
|
if (!schema) throw new Error("Tenant schema is missing");
|
|
137
|
-
// Disposable database fixture, not a change to workspace provisioning.
|
|
138
137
|
await schema.createInstance(tenantId).run();
|
|
139
138
|
try {
|
|
140
139
|
const folder = {
|
|
@@ -159,9 +158,9 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
159
158
|
expect((await EnsureMediaFolder(folder)).status).to.equal("kept");
|
|
160
159
|
expect((await ImportMediaAsset(file)).status).to.equal("kept");
|
|
161
160
|
expect(
|
|
162
|
-
await GetModel(MediaAssetModel, tenantId).get(firstFile.id
|
|
161
|
+
await GetModel(MediaAssetModel, tenantId).get(firstFile.id),
|
|
163
162
|
).to.equal(undefined);
|
|
164
|
-
expect(await assets().get(secondFile.id
|
|
163
|
+
expect(await assets().get(secondFile.id)).to.equal(undefined);
|
|
165
164
|
} finally {
|
|
166
165
|
await schema.destroyInstance(tenantId).run();
|
|
167
166
|
}
|
|
@@ -213,7 +212,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
213
212
|
const second = await EnsureMediaFolder(declaration);
|
|
214
213
|
expect(first.status).to.equal("created");
|
|
215
214
|
expect(second).to.deep.equal({ status: "kept", id: first.id });
|
|
216
|
-
const folder = await folders().get(first.id
|
|
215
|
+
const folder = await folders().get(first.id);
|
|
217
216
|
expect(folder?.name).to.equal("Declared procedures");
|
|
218
217
|
expect(folder?.parentId ?? undefined).to.equal(undefined);
|
|
219
218
|
expect(folder?.visibility).to.equal("private");
|
|
@@ -222,7 +221,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
222
221
|
"folder.create",
|
|
223
222
|
);
|
|
224
223
|
const created = events.filter((event) =>
|
|
225
|
-
event.json_details?.includes(first.id
|
|
224
|
+
event.json_details?.includes(first.id),
|
|
226
225
|
);
|
|
227
226
|
expect(created).to.have.length(1);
|
|
228
227
|
expect(created[0]?.actorName).to.equal("System");
|
|
@@ -243,11 +242,11 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
243
242
|
acl: ACL,
|
|
244
243
|
});
|
|
245
244
|
expect(child.status).to.equal("created");
|
|
246
|
-
const folder = await folders().get(child.id
|
|
245
|
+
const folder = await folders().get(child.id);
|
|
247
246
|
expect(folder?.parentId).to.equal(parent.id);
|
|
248
247
|
expect(folder?.path).to.deep.equal([parent.id]);
|
|
249
248
|
expect(folder?.visibility).to.equal("public");
|
|
250
|
-
expect(await readFolderAcl(child.id
|
|
249
|
+
expect(await readFolderAcl(child.id)).to.deep.equal(ACL);
|
|
251
250
|
const tree = await client.get("/api/media/tree");
|
|
252
251
|
expect(tree.status).to.equal(HTTP_OK);
|
|
253
252
|
expect(
|
|
@@ -274,7 +273,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
274
273
|
name: "Declared templates v2",
|
|
275
274
|
});
|
|
276
275
|
expect(result).to.deep.equal({ status: "kept", id: declared.id });
|
|
277
|
-
const folder = await folders().get(declared.id
|
|
276
|
+
const folder = await folders().get(declared.id);
|
|
278
277
|
expect(folder?.name).to.equal("Our templates");
|
|
279
278
|
});
|
|
280
279
|
|
|
@@ -322,7 +321,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
322
321
|
const second = await ImportMediaAsset(declaration);
|
|
323
322
|
expect(first.status).to.equal("created");
|
|
324
323
|
expect(second).to.deep.equal({ status: "kept", id: first.id });
|
|
325
|
-
const asset = await assets().get(first.id
|
|
324
|
+
const asset = await assets().get(first.id);
|
|
326
325
|
expect(asset?.name).to.equal("logo.png");
|
|
327
326
|
expect(asset?.alt).to.equal("Helio logo");
|
|
328
327
|
expect(asset?.width).to.equal(1);
|
|
@@ -331,7 +330,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
331
330
|
const events = await GetModel(
|
|
332
331
|
MediaEventModel,
|
|
333
332
|
DEFAULT_TENANT_ID,
|
|
334
|
-
).listByAsset(first.id
|
|
333
|
+
).listByAsset(first.id);
|
|
335
334
|
expect(events.map((event) => event.kind)).to.deep.equal(["asset.upload"]);
|
|
336
335
|
const readUrl = await client.get(
|
|
337
336
|
`/api/media/assets/${first.id}/read-url`,
|
|
@@ -355,7 +354,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
355
354
|
source: { filePath },
|
|
356
355
|
});
|
|
357
356
|
expect(result.status).to.equal("created");
|
|
358
|
-
const asset = await assets().get(result.id
|
|
357
|
+
const asset = await assets().get(result.id);
|
|
359
358
|
expect(asset?.mimetype).to.equal("text/plain");
|
|
360
359
|
expect(asset?.width ?? undefined).to.equal(undefined);
|
|
361
360
|
});
|
|
@@ -370,7 +369,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
370
369
|
source: { bytes: ONE_PIXEL_PNG },
|
|
371
370
|
});
|
|
372
371
|
expect(result.status).to.equal("created");
|
|
373
|
-
const asset = await assets().get(result.id
|
|
372
|
+
const asset = await assets().get(result.id);
|
|
374
373
|
const bound = await folders().getByBinding(BINDING_ID);
|
|
375
374
|
expect(asset?.folderId).to.equal(bound?._id);
|
|
376
375
|
const refused = await rejectionOf(
|
|
@@ -446,7 +445,7 @@ describe("[integration] media declared content — folders and files shipped as
|
|
|
446
445
|
});
|
|
447
446
|
expect(result).to.deep.equal({ status: "kept", id: first.id });
|
|
448
447
|
expect(loads, "the source of a kept file is not read").to.equal(0);
|
|
449
|
-
const asset = await assets().get(first.id
|
|
448
|
+
const asset = await assets().get(first.id);
|
|
450
449
|
expect(asset?.name).to.equal("our-manual.txt");
|
|
451
450
|
expect(asset?.size).to.equal("Manual v1".length);
|
|
452
451
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import type { AxiosInstance } from "axios";
|
|
3
|
-
import { expect } from "chai";
|
|
3
|
+
import { assert, expect } from "chai";
|
|
4
4
|
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
5
5
|
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
6
6
|
import sharp from "sharp";
|
|
@@ -61,7 +61,9 @@ async function follow(
|
|
|
61
61
|
): Promise<Delivery> {
|
|
62
62
|
const redirect = await deliver(path, headers);
|
|
63
63
|
expect(redirect.status, path).to.equal(HTTP_FOUND);
|
|
64
|
-
const
|
|
64
|
+
const location = redirect.headers.get("location");
|
|
65
|
+
assert.isNotNull(location, path);
|
|
66
|
+
const response = await fetch(location);
|
|
65
67
|
return {
|
|
66
68
|
status: response.status,
|
|
67
69
|
headers: response.headers,
|
|
@@ -301,9 +303,11 @@ describe("[integration] media delivery and editing — cache, orientation, activ
|
|
|
301
303
|
const original = await deliver(assetPath(svg), auth);
|
|
302
304
|
expect(original.status).to.equal(HTTP_OK);
|
|
303
305
|
expect(original.headers.get("content-security-policy")).to.equal("sandbox");
|
|
306
|
+
const etag = original.headers.get("etag");
|
|
307
|
+
assert.isNotNull(etag, "etag");
|
|
304
308
|
const revalidated = await deliver(assetPath(svg), {
|
|
305
309
|
...auth,
|
|
306
|
-
"If-None-Match":
|
|
310
|
+
"If-None-Match": etag,
|
|
307
311
|
});
|
|
308
312
|
expect(revalidated.status).to.equal(HTTP_NOT_MODIFIED);
|
|
309
313
|
});
|
|
@@ -323,7 +327,7 @@ describe("[integration] media delivery and editing — cache, orientation, activ
|
|
|
323
327
|
"image/png",
|
|
324
328
|
await sharp({
|
|
325
329
|
create: {
|
|
326
|
-
|
|
330
|
+
/** Larger than the thumb both ways, so its square crop shows. */
|
|
327
331
|
width: WIDE_SVG_WIDTH * 2,
|
|
328
332
|
height: WIDE_SVG_HEIGHT * 2,
|
|
329
333
|
channels: 3,
|
|
@@ -333,9 +337,9 @@ describe("[integration] media delivery and editing — cache, orientation, activ
|
|
|
333
337
|
.png()
|
|
334
338
|
.toBuffer(),
|
|
335
339
|
);
|
|
336
|
-
const answer = await client.
|
|
337
|
-
ids
|
|
338
|
-
|
|
340
|
+
const answer = await client.get(
|
|
341
|
+
`/api/media/previews?ids=${logo.id}&ids=${banner.id}`,
|
|
342
|
+
);
|
|
339
343
|
expect(answer.status).to.equal(HTTP_OK);
|
|
340
344
|
const [vector, raster] = await Promise.all(
|
|
341
345
|
[logo.id, banner.id].map(async (id) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AxiosInstance } from "axios";
|
|
2
|
-
import { expect } from "chai";
|
|
2
|
+
import { assert, expect } from "chai";
|
|
3
3
|
import {
|
|
4
4
|
ONE_PIXEL_PNG,
|
|
5
5
|
PNG_NAME,
|
|
@@ -14,6 +14,10 @@ const HTTP_FOUND = 302;
|
|
|
14
14
|
const HTTP_UNAUTHORIZED = 401;
|
|
15
15
|
const HTTP_NOT_FOUND = 404;
|
|
16
16
|
|
|
17
|
+
interface PreviewResponse {
|
|
18
|
+
previews: Record<string, string>;
|
|
19
|
+
}
|
|
20
|
+
|
|
17
21
|
async function fetchBytes(url: string): Promise<Buffer> {
|
|
18
22
|
const response = await fetch(url);
|
|
19
23
|
expect(response.status).to.equal(HTTP_OK);
|
|
@@ -56,12 +60,19 @@ describe("[integration] media delivery — visibility and derivatives", () => {
|
|
|
56
60
|
expect(response.status).to.equal(HTTP_UNAUTHORIZED);
|
|
57
61
|
});
|
|
58
62
|
|
|
63
|
+
it("refuses an anonymous caller before telling whether a preset exists", async () => {
|
|
64
|
+
const known = await rawGet(`/media/${assetId}/thumb/${PNG_NAME}`);
|
|
65
|
+
const unknown = await rawGet(`/media/${assetId}/nosuchpreset/${PNG_NAME}`);
|
|
66
|
+
expect(known.status).to.equal(HTTP_UNAUTHORIZED);
|
|
67
|
+
expect(unknown.status).to.equal(HTTP_UNAUTHORIZED);
|
|
68
|
+
});
|
|
69
|
+
|
|
59
70
|
it("redirects an authorized user to a short-lived signed URL", async () => {
|
|
60
71
|
const response = await rawGet(`/media/${assetId}/${PNG_NAME}`, token);
|
|
61
72
|
expect(response.status).to.equal(HTTP_FOUND);
|
|
62
|
-
|
|
73
|
+
assert.isNotNull(response.location);
|
|
63
74
|
expect(response.cacheControl).to.equal("no-store");
|
|
64
|
-
const bytes = await fetchBytes(response.location
|
|
75
|
+
const bytes = await fetchBytes(response.location);
|
|
65
76
|
expect(bytes.equals(ONE_PIXEL_PNG)).to.equal(true);
|
|
66
77
|
});
|
|
67
78
|
|
|
@@ -81,7 +92,8 @@ describe("[integration] media delivery — visibility and derivatives", () => {
|
|
|
81
92
|
it("generates a derivative lazily and serves it through the preset route", async () => {
|
|
82
93
|
const response = await rawGet(`/media/${assetId}/thumb/${PNG_NAME}`);
|
|
83
94
|
expect(response.status).to.equal(HTTP_FOUND);
|
|
84
|
-
|
|
95
|
+
assert.isNotNull(response.location);
|
|
96
|
+
const bytes = await fetchBytes(response.location);
|
|
85
97
|
expect(bytes.byteLength).to.be.greaterThan(0);
|
|
86
98
|
expect(bytes.equals(ONE_PIXEL_PNG)).to.equal(false);
|
|
87
99
|
|
|
@@ -114,12 +126,21 @@ describe("[integration] media delivery — visibility and derivatives", () => {
|
|
|
114
126
|
const ids = listing.data.assets.map((asset: { id: string }) => asset.id);
|
|
115
127
|
expect(ids).to.include(assetId);
|
|
116
128
|
|
|
117
|
-
const
|
|
118
|
-
|
|
119
|
-
|
|
129
|
+
const secondAsset = await uploadPixelPng(client, folderId);
|
|
130
|
+
const previews = await client.get<PreviewResponse>(
|
|
131
|
+
`/api/media/previews?ids=${assetId}&ids=${secondAsset.id}`,
|
|
132
|
+
);
|
|
120
133
|
expect(previews.status).to.equal(HTTP_OK);
|
|
134
|
+
expect(Object.keys(previews.data.previews)).to.have.members([
|
|
135
|
+
assetId,
|
|
136
|
+
secondAsset.id,
|
|
137
|
+
]);
|
|
121
138
|
expect(previews.data.previews[assetId]).to.be.a("string");
|
|
122
|
-
expect(previews.data.previews[
|
|
139
|
+
expect(previews.data.previews[secondAsset.id]).to.be.a("string");
|
|
140
|
+
const legacy = await client.post("/api/media/previews", {
|
|
141
|
+
ids: [assetId, secondAsset.id],
|
|
142
|
+
});
|
|
143
|
+
expect(legacy.status).to.equal(HTTP_NOT_FOUND);
|
|
123
144
|
});
|
|
124
145
|
|
|
125
146
|
it("returns to private after flipping the folder back", async () => {
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
import { CONTENT_ROOT_BINDING } from "../../bindings";
|
|
10
10
|
import { MediaEventModel, MediaFolderModel } from "../../db";
|
|
11
11
|
import { uploadPixelPng, uploadTextAsset } from "../helpers/assets";
|
|
12
|
+
import { fetchFolderNodes } from "../helpers/folders";
|
|
12
13
|
import { authorizedClient } from "../helpers/http";
|
|
13
14
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
14
15
|
|
|
@@ -26,11 +27,6 @@ const CENTRAL_COMMENT_LENGTH_OFFSET = 32;
|
|
|
26
27
|
const CENTRAL_HEADER_SIZE = 46;
|
|
27
28
|
const ALT_LIMIT = 255;
|
|
28
29
|
|
|
29
|
-
interface FolderNode {
|
|
30
|
-
id: string;
|
|
31
|
-
binding: string | null;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
30
|
/** The entry names of a zip, read from its central directory. */
|
|
35
31
|
function zipEntryNames(zip: Buffer): string[] {
|
|
36
32
|
const names: string[] = [];
|
|
@@ -125,8 +121,7 @@ describe("[integration] media explorer writes — names, linked folders, zips",
|
|
|
125
121
|
});
|
|
126
122
|
|
|
127
123
|
it("puts no subfolder inside a linked folder, by creation or by move", async () => {
|
|
128
|
-
const
|
|
129
|
-
const linked = (tree.data.folders as FolderNode[]).find(
|
|
124
|
+
const linked = (await fetchFolderNodes(client)).find(
|
|
130
125
|
(folder) => folder.binding === BINDING_ID,
|
|
131
126
|
);
|
|
132
127
|
expect(linked, "linked folder").to.not.equal(undefined);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
1
2
|
import axios, { type AxiosInstance } from "axios";
|
|
2
3
|
import { expect } from "chai";
|
|
3
4
|
import { authorizedClient, createClient } from "../helpers/http";
|
|
@@ -52,7 +53,7 @@ describe("[integration] media guards — every endpoint requires auth and rights
|
|
|
52
53
|
resourceKey: "media/any/key.txt",
|
|
53
54
|
filename: "x.txt",
|
|
54
55
|
}),
|
|
55
|
-
anonymous.
|
|
56
|
+
anonymous.get(`/api/media/previews?ids=${randomUUID()}`),
|
|
56
57
|
];
|
|
57
58
|
const responses = await Promise.all(attempts);
|
|
58
59
|
for (const [index, response] of responses.entries()) {
|
|
@@ -60,10 +61,23 @@ describe("[integration] media guards — every endpoint requires auth and rights
|
|
|
60
61
|
}
|
|
61
62
|
});
|
|
62
63
|
|
|
63
|
-
it("
|
|
64
|
-
const ids = Array.from({ length: 201 }, (
|
|
65
|
-
const
|
|
64
|
+
it("accepts 200 preview IDs and rejects 201", async () => {
|
|
65
|
+
const ids = Array.from({ length: 201 }, () => randomUUID());
|
|
66
|
+
const query = new URLSearchParams(ids.map((id) => ["ids", id]));
|
|
67
|
+
const previews = await owner.get(`/api/media/previews?${query}`);
|
|
66
68
|
expect(previews.status).to.equal(HTTP_BAD_REQUEST);
|
|
69
|
+
ids.pop();
|
|
70
|
+
const allowedQuery = new URLSearchParams(ids.map((id) => ["ids", id]));
|
|
71
|
+
const allowed = await owner.get(`/api/media/previews?${allowedQuery}`);
|
|
72
|
+
expect(allowed.status).to.equal(HTTP_OK);
|
|
73
|
+
expect(allowed.data.previews).to.deep.equal({});
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
it("requires a nonempty list of UUIDs for previews", async () => {
|
|
77
|
+
for (const query of ["", "?ids=not-a-uuid"]) {
|
|
78
|
+
const response = await owner.get(`/api/media/previews${query}`);
|
|
79
|
+
expect(response.status).to.equal(HTTP_BAD_REQUEST);
|
|
80
|
+
}
|
|
67
81
|
});
|
|
68
82
|
|
|
69
83
|
it("hides unknown folders behind 404 for authorized users", async () => {
|
|
@@ -94,9 +108,9 @@ describe("[integration] media guards — every endpoint requires auth and rights
|
|
|
94
108
|
});
|
|
95
109
|
|
|
96
110
|
it("filters unreadable assets out of previews instead of failing", async () => {
|
|
97
|
-
const previews = await owner.
|
|
98
|
-
ids
|
|
99
|
-
|
|
111
|
+
const previews = await owner.get(
|
|
112
|
+
`/api/media/previews?ids=${randomUUID()}&ids=${randomUUID()}`,
|
|
113
|
+
);
|
|
100
114
|
expect(previews.status).to.equal(HTTP_OK);
|
|
101
115
|
expect(previews.data.previews).to.deep.equal({});
|
|
102
116
|
});
|
|
@@ -343,7 +343,7 @@ describe("[integration] media library — listings, search, bulk and overview",
|
|
|
343
343
|
});
|
|
344
344
|
|
|
345
345
|
it("lists delivery presets with their cache keys", async () => {
|
|
346
|
-
await client.
|
|
346
|
+
await client.get(`/api/media/previews?ids=${ids["oak-a.png"]}`);
|
|
347
347
|
const response = await client.get("/api/media/presets");
|
|
348
348
|
expect(response.status).to.equal(HTTP_OK);
|
|
349
349
|
const thumb = response.data.presets.find(
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AxiosInstance } from "axios";
|
|
2
|
-
import { expect } from "chai";
|
|
2
|
+
import { assert, expect } from "chai";
|
|
3
3
|
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
4
4
|
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
5
5
|
import {
|
|
@@ -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 { type FolderNode, fetchFolderNodes } from "../helpers/folders";
|
|
18
19
|
import { authorizedClient } from "../helpers/http";
|
|
19
20
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
20
21
|
|
|
@@ -26,15 +27,6 @@ const LOCKED_BINDING_ID = "subfolders.locked";
|
|
|
26
27
|
const KEY_PREFIX = "subfolders.";
|
|
27
28
|
const ERRORS = "$dms_media.errors";
|
|
28
29
|
|
|
29
|
-
interface FolderNode {
|
|
30
|
-
id: string;
|
|
31
|
-
name: string;
|
|
32
|
-
parentId: string | null;
|
|
33
|
-
binding: string | null;
|
|
34
|
-
acceptsSubfolders: boolean;
|
|
35
|
-
accepts: string[] | null;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
30
|
function folders() {
|
|
39
31
|
return GetModel(MediaFolderModel, DEFAULT_TENANT_ID);
|
|
40
32
|
}
|
|
@@ -43,7 +35,8 @@ async function rejectionOf(promise: Promise<unknown>): Promise<Error> {
|
|
|
43
35
|
try {
|
|
44
36
|
await promise;
|
|
45
37
|
} catch (error) {
|
|
46
|
-
|
|
38
|
+
assert.instanceOf(error, Error);
|
|
39
|
+
return error;
|
|
47
40
|
}
|
|
48
41
|
throw new Error("Expected the declaration to be refused");
|
|
49
42
|
}
|
|
@@ -89,8 +82,7 @@ describe("[integration] media linked subfolders — bindings that allow them", (
|
|
|
89
82
|
let client: AxiosInstance;
|
|
90
83
|
|
|
91
84
|
async function treeFolder(binding: string): Promise<FolderNode> {
|
|
92
|
-
const
|
|
93
|
-
const folder = (tree.data.folders as FolderNode[]).find(
|
|
85
|
+
const folder = (await fetchFolderNodes(client)).find(
|
|
94
86
|
(entry) => entry.binding === binding,
|
|
95
87
|
);
|
|
96
88
|
if (!folder) throw new Error(`No folder linked to ${binding}`);
|
|
@@ -144,8 +136,7 @@ describe("[integration] media linked subfolders — bindings that allow them", (
|
|
|
144
136
|
name: "Renamed",
|
|
145
137
|
});
|
|
146
138
|
expect(rename.status).to.equal(HTTP_FORBIDDEN);
|
|
147
|
-
const
|
|
148
|
-
const subfolder = (tree.data.folders as FolderNode[]).find(
|
|
139
|
+
const subfolder = (await fetchFolderNodes(client)).find(
|
|
149
140
|
(folder) => folder.id === created.data.id,
|
|
150
141
|
);
|
|
151
142
|
expect(subfolder?.acceptsSubfolders).to.equal(true);
|
|
@@ -184,9 +175,7 @@ describe("[integration] media linked subfolders — bindings that allow them", (
|
|
|
184
175
|
parent: { binding: OPEN_BINDING_ID },
|
|
185
176
|
});
|
|
186
177
|
expect(project.status).to.equal("created");
|
|
187
|
-
expect((await folders().get(project.id
|
|
188
|
-
linked.id,
|
|
189
|
-
);
|
|
178
|
+
expect((await folders().get(project.id))?.parentId).to.equal(linked.id);
|
|
190
179
|
const again = await EnsureMediaFolder({
|
|
191
180
|
tenantId: DEFAULT_TENANT_ID,
|
|
192
181
|
key: "subfolders.project-c",
|
|
@@ -201,14 +190,16 @@ describe("[integration] media linked subfolders — bindings that allow them", (
|
|
|
201
190
|
parent: { key: "subfolders.project-c" },
|
|
202
191
|
});
|
|
203
192
|
expect(nested.status).to.equal("created");
|
|
204
|
-
// A declared parent named by its key alone is the same declaration.
|
|
205
193
|
const sameParent = await EnsureMediaFolder({
|
|
206
194
|
tenantId: DEFAULT_TENANT_ID,
|
|
207
195
|
key: "subfolders.project-c.roof",
|
|
208
196
|
name: "Roof",
|
|
209
197
|
parent: "subfolders.project-c",
|
|
210
198
|
});
|
|
211
|
-
expect(
|
|
199
|
+
expect(
|
|
200
|
+
sameParent,
|
|
201
|
+
"a declared parent named by its key alone is the same declaration",
|
|
202
|
+
).to.deep.equal({ status: "kept", id: nested.id });
|
|
212
203
|
const photo = await ImportMediaAsset({
|
|
213
204
|
tenantId: DEFAULT_TENANT_ID,
|
|
214
205
|
key: "subfolders.project-c.roof.photo",
|
|
@@ -10,9 +10,8 @@ import {
|
|
|
10
10
|
type PermissionTree,
|
|
11
11
|
} from "@antelopejs/interface-dms/permissions";
|
|
12
12
|
import type { AxiosInstance } from "axios";
|
|
13
|
-
import { expect } from "chai";
|
|
13
|
+
import { assert, expect } from "chai";
|
|
14
14
|
import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
15
|
-
import { DEFAULT_ROOT_ACL } from "../../acl/defaults";
|
|
16
15
|
import { MEDIA_PAGE_PERMISSION } from "../../pages/files";
|
|
17
16
|
import { type UploadedAsset, uploadTextAsset } from "../helpers/assets";
|
|
18
17
|
import { readFolderAcl } from "../helpers/folders";
|
|
@@ -106,7 +105,8 @@ function presignInto(client: AxiosInstance, folderId: string) {
|
|
|
106
105
|
async function buildWorld(): Promise<MemberAccessWorld> {
|
|
107
106
|
const session = await ensureOwnerSession();
|
|
108
107
|
const owner = authorizedClient(session.accessToken);
|
|
109
|
-
const pagePermission = GetPermissionId(MemberAccessProbePage)
|
|
108
|
+
const pagePermission = GetPermissionId(MemberAccessProbePage);
|
|
109
|
+
assert.isDefined(pagePermission, "probe page permission");
|
|
110
110
|
const [pageRole, modulePageRole] = await Promise.all([
|
|
111
111
|
createRole("member-access-page", [pagePermission]),
|
|
112
112
|
createRole("member-access-module-page", [MEDIA_PAGE_PERMISSION]),
|
|
@@ -116,8 +116,8 @@ async function buildWorld(): Promise<MemberAccessWorld> {
|
|
|
116
116
|
});
|
|
117
117
|
expect(shelf.status, "create shelf").to.equal(HTTP_OK);
|
|
118
118
|
const linked = findFolder(await fetchTree(owner), LINKED_FOLDER_NAME);
|
|
119
|
-
|
|
120
|
-
const linkedFolderId =
|
|
119
|
+
assert.isDefined(linked, "provisioned linked folder");
|
|
120
|
+
const linkedFolderId = linked.id;
|
|
121
121
|
return {
|
|
122
122
|
owner,
|
|
123
123
|
pageMember: await registerMember("PageMember", [pageRole]),
|
|
@@ -155,10 +155,6 @@ describe("[integration] media member access — roles, root ACL and linked folde
|
|
|
155
155
|
});
|
|
156
156
|
|
|
157
157
|
describe("library root", () => {
|
|
158
|
-
it("grants nothing at the root by default", () => {
|
|
159
|
-
expect(DEFAULT_ROOT_ACL).to.deep.equal([]);
|
|
160
|
-
});
|
|
161
|
-
|
|
162
158
|
it("opens nothing to a role holding the All files page", async () => {
|
|
163
159
|
const tree = await fetchTree(world.modulePageMember.client);
|
|
164
160
|
expect(tree.folders).to.deep.equal([]);
|