@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
|
@@ -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 { CustomComponent } from "@antelopejs/interface-dms/base/custom";
|
|
4
4
|
import {
|
|
5
5
|
GetPermissionId,
|
|
@@ -64,16 +64,14 @@ describe("[integration] media project field — a member uses media from a proje
|
|
|
64
64
|
});
|
|
65
65
|
owner = authorizedClient((await ensureOwnerSession()).accessToken);
|
|
66
66
|
const pagePermission = GetPermissionId(EditorialArticlesPage);
|
|
67
|
-
|
|
68
|
-
const roleId = await createRole("editorial-editor", [
|
|
69
|
-
pagePermission as string,
|
|
70
|
-
]);
|
|
67
|
+
assert.isDefined(pagePermission, "project page permission");
|
|
68
|
+
const roleId = await createRole("editorial-editor", [pagePermission]);
|
|
71
69
|
editor = await registerMember("EditorialEditor", [roleId]);
|
|
72
70
|
const linked = (await fetchFolders(owner)).find(
|
|
73
71
|
(folder) => folder.name === FOLDER_NAME,
|
|
74
72
|
);
|
|
75
|
-
|
|
76
|
-
linkedFolderId =
|
|
73
|
+
assert.isDefined(linked, "linked folder");
|
|
74
|
+
linkedFolderId = linked.id;
|
|
77
75
|
});
|
|
78
76
|
|
|
79
77
|
it("opens the linked folder of the page, and only it, to the picker", async () => {
|
|
@@ -3,6 +3,7 @@ import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
|
3
3
|
import { expect } from "chai";
|
|
4
4
|
import { type MediaAsset, MediaAssetModel } from "../../db";
|
|
5
5
|
import { MediaAssetsController } from "../../routes/media/assets";
|
|
6
|
+
import { patchMethod } from "../helpers/prototype";
|
|
6
7
|
|
|
7
8
|
const TENANT = "stream-search-a";
|
|
8
9
|
const OTHER_TENANT = "stream-search-b";
|
|
@@ -11,7 +12,6 @@ const HIDDEN = "hidden";
|
|
|
11
12
|
const SKIPPED = 150;
|
|
12
13
|
const MATCHING = 120;
|
|
13
14
|
const LIMIT = 100;
|
|
14
|
-
type CursorFactory = (this: Query<unknown>) => AsyncIterable<unknown>;
|
|
15
15
|
|
|
16
16
|
function asset(
|
|
17
17
|
id: string,
|
|
@@ -76,27 +76,23 @@ describe("[integration] streaming asset search", () => {
|
|
|
76
76
|
const expected = candidates
|
|
77
77
|
.filter((row) => row.name.toLowerCase().includes("İ".toLowerCase()))
|
|
78
78
|
.slice(0, LIMIT);
|
|
79
|
-
const original = Object.getOwnPropertyDescriptor(
|
|
80
|
-
Query.prototype,
|
|
81
|
-
"cursor",
|
|
82
|
-
)!;
|
|
83
|
-
const readCursor = original.value as CursorFactory;
|
|
84
79
|
let consumed = 0;
|
|
85
80
|
let closed = false;
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
81
|
+
const restore = patchMethod<Query<unknown>, "cursor">(
|
|
82
|
+
Query.prototype,
|
|
83
|
+
"cursor",
|
|
84
|
+
(readCursor) =>
|
|
85
|
+
async function* (this: Query<unknown>) {
|
|
86
|
+
try {
|
|
87
|
+
for await (const row of readCursor.call(this)) {
|
|
88
|
+
consumed++;
|
|
89
|
+
yield row;
|
|
90
|
+
}
|
|
91
|
+
} finally {
|
|
92
|
+
closed = true;
|
|
94
93
|
}
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
},
|
|
99
|
-
});
|
|
94
|
+
},
|
|
95
|
+
);
|
|
100
96
|
try {
|
|
101
97
|
const result = await controller(model).search(" İ ", " IMAGE/ ");
|
|
102
98
|
expect(result.assets.map((row) => row.id)).to.deep.equal(
|
|
@@ -106,7 +102,7 @@ describe("[integration] streaming asset search", () => {
|
|
|
106
102
|
expect(consumed).to.be.lessThan(candidates.length);
|
|
107
103
|
expect(closed).to.equal(true);
|
|
108
104
|
} finally {
|
|
109
|
-
|
|
105
|
+
restore();
|
|
110
106
|
}
|
|
111
107
|
});
|
|
112
108
|
|
|
@@ -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 sharp from "sharp";
|
|
4
4
|
import { rawGet, uploadAsset } from "../helpers/assets";
|
|
5
5
|
import { authorizedClient, getBaseUrl } from "../helpers/http";
|
|
@@ -81,7 +81,8 @@ describe("[integration] media when the server cannot reach the storage's public
|
|
|
81
81
|
|
|
82
82
|
const thumb = await rawGet(`/media/${asset.id}/thumb/${PHOTO_NAME}`, token);
|
|
83
83
|
expect(thumb.status).to.equal(HTTP_FOUND);
|
|
84
|
-
|
|
84
|
+
assert.isNotNull(thumb.location);
|
|
85
|
+
const stored = await serverFetch(thumb.location);
|
|
85
86
|
expect(stored.status).to.equal(HTTP_OK);
|
|
86
87
|
const metadata = await sharp(
|
|
87
88
|
Buffer.from(await stored.arrayBuffer()),
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
import { runPurgeStaging } from "../../crons/purge-staging";
|
|
18
18
|
import { MediaFolderModel } from "../../db";
|
|
19
19
|
import { uploadAsset, uploadPixelPng } from "../helpers/assets";
|
|
20
|
+
import { fetchFolderNodes } from "../helpers/folders";
|
|
20
21
|
import { authorizedClient } from "../helpers/http";
|
|
21
22
|
import { ensureOwnerSession } from "../helpers/owner";
|
|
22
23
|
|
|
@@ -30,12 +31,6 @@ const PDF_FOLDER_NAME = "PDF only uploads";
|
|
|
30
31
|
const PURGE_HORIZON_MS = 25 * 60 * 60 * 1000;
|
|
31
32
|
const EXIF_ROTATED_RIGHT = 6;
|
|
32
33
|
|
|
33
|
-
interface FolderNode {
|
|
34
|
-
id: string;
|
|
35
|
-
name: string;
|
|
36
|
-
binding: string | null;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
34
|
interface StagedUpload {
|
|
40
35
|
resourceKey: string;
|
|
41
36
|
}
|
|
@@ -173,8 +168,7 @@ describe("[integration] media upload policy — types, quota, real content and s
|
|
|
173
168
|
});
|
|
174
169
|
|
|
175
170
|
it("refuses a file the linked field does not accept", async () => {
|
|
176
|
-
const
|
|
177
|
-
const linked = (tree.data.folders as FolderNode[]).find(
|
|
171
|
+
const linked = (await fetchFolderNodes(client)).find(
|
|
178
172
|
(folder) => folder.binding === PDF_BINDING_ID,
|
|
179
173
|
);
|
|
180
174
|
expect(linked, "linked folder").to.not.equal(undefined);
|
|
@@ -0,0 +1,292 @@
|
|
|
1
|
+
import type { AxiosInstance } from "axios";
|
|
2
|
+
import { expect } from "chai";
|
|
3
|
+
import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
4
|
+
import { GetPermissionId } from "@antelopejs/interface-dms/page";
|
|
5
|
+
import { UserModel } from "@antelopejs/interface-dms/auth/db";
|
|
6
|
+
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
7
|
+
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
8
|
+
import { MediaUploadsPage } from "../../pages/uploads";
|
|
9
|
+
import { uploadAvailability } from "../../pages/upload-availability";
|
|
10
|
+
import { MEDIA_ROUTES } from "../../library/links";
|
|
11
|
+
import { readFolderAcl, writeFolderAcl } from "../helpers/folders";
|
|
12
|
+
import { readPageAccess } from "../helpers/pages";
|
|
13
|
+
import { setRolePermissions } from "../helpers/members";
|
|
14
|
+
|
|
15
|
+
import {
|
|
16
|
+
assets,
|
|
17
|
+
createFolder,
|
|
18
|
+
fetchTree,
|
|
19
|
+
findById,
|
|
20
|
+
folders,
|
|
21
|
+
HTTP_FORBIDDEN,
|
|
22
|
+
HTTP_NOT_FOUND,
|
|
23
|
+
HTTP_OK,
|
|
24
|
+
LIBRARY_UPLOAD_PERMISSION,
|
|
25
|
+
LIBRARY_VIEW_PERMISSION,
|
|
26
|
+
owner,
|
|
27
|
+
permissionEntry,
|
|
28
|
+
requireById,
|
|
29
|
+
roleEntry,
|
|
30
|
+
roles,
|
|
31
|
+
sessions,
|
|
32
|
+
STOCK_BINDING_ID,
|
|
33
|
+
STOCK_FOLDER_NAME,
|
|
34
|
+
WAREHOUSE_EDIT_PERMISSION,
|
|
35
|
+
WAREHOUSE_VIEW_PERMISSION,
|
|
36
|
+
} from "../helpers/permissions-world";
|
|
37
|
+
|
|
38
|
+
/** Folder management and ACL edition, run after the transform suites. */
|
|
39
|
+
export function folderManagementSuites(): void {
|
|
40
|
+
describe("folder management and ACL edition", () => {
|
|
41
|
+
folderManagementTests();
|
|
42
|
+
folderAclTests();
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Who may create, rename, move and delete folders, and change their visibility. */
|
|
47
|
+
function folderManagementTests(): void {
|
|
48
|
+
it("requires manage at the root to create top-level folders", async () => {
|
|
49
|
+
const denied = await sessions.uploader.client.post("/api/media/folders", {
|
|
50
|
+
name: "Nope",
|
|
51
|
+
});
|
|
52
|
+
expect(denied.status).to.equal(HTTP_FORBIDDEN);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it("lets a folder manager create, rename, move and delete folders", async () => {
|
|
56
|
+
const created = await sessions.folderManager.client.post(
|
|
57
|
+
"/api/media/folders",
|
|
58
|
+
{ name: "Managed" },
|
|
59
|
+
);
|
|
60
|
+
expect(created.status).to.equal(HTTP_OK);
|
|
61
|
+
const managedId = created.data.id;
|
|
62
|
+
const renamed = await sessions.folderManager.client.post(
|
|
63
|
+
`/api/media/folders/${managedId}/rename`,
|
|
64
|
+
{ name: "Managed renamed" },
|
|
65
|
+
);
|
|
66
|
+
expect(renamed.status).to.equal(HTTP_OK);
|
|
67
|
+
const moved = await sessions.folderManager.client.post(
|
|
68
|
+
`/api/media/folders/${managedId}/move`,
|
|
69
|
+
{ parentId: folders.depot },
|
|
70
|
+
);
|
|
71
|
+
expect(moved.status).to.equal(HTTP_OK);
|
|
72
|
+
const deleted = await sessions.folderManager.client.delete(
|
|
73
|
+
`/api/media/folders/${managedId}`,
|
|
74
|
+
);
|
|
75
|
+
expect(deleted.status).to.equal(HTTP_OK);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
it("refuses cascade deletion when a subfolder lacks the manage right", async () => {
|
|
79
|
+
const estate = await createFolder(owner, "Estate");
|
|
80
|
+
const cellar = await createFolder(owner, "EstateCellar", estate);
|
|
81
|
+
await writeFolderAcl(cellar, [roleEntry(roles.secretTeam, ["manage"])]);
|
|
82
|
+
const denied = await sessions.folderManager.client.delete(
|
|
83
|
+
`/api/media/folders/${estate}`,
|
|
84
|
+
);
|
|
85
|
+
expect(denied.status).to.equal(HTTP_FORBIDDEN);
|
|
86
|
+
const cleanup = await owner.delete(`/api/media/folders/${estate}`);
|
|
87
|
+
expect(cleanup.status).to.equal(HTTP_OK);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it("checks the target parent's manage right on folder moves", async () => {
|
|
91
|
+
const created = await sessions.folderManager.client.post(
|
|
92
|
+
"/api/media/folders",
|
|
93
|
+
{ name: "Nomad" },
|
|
94
|
+
);
|
|
95
|
+
expect(created.status).to.equal(HTTP_OK);
|
|
96
|
+
const nomadId = created.data.id;
|
|
97
|
+
const invisibleTarget = await sessions.folderManager.client.post(
|
|
98
|
+
`/api/media/folders/${nomadId}/move`,
|
|
99
|
+
{ parentId: folders.restricted },
|
|
100
|
+
);
|
|
101
|
+
expect(invisibleTarget.status).to.equal(HTTP_NOT_FOUND);
|
|
102
|
+
const unmanagedTarget = await sessions.folderManager.client.post(
|
|
103
|
+
`/api/media/folders/${nomadId}/move`,
|
|
104
|
+
{ parentId: folders.readOnlyCorner },
|
|
105
|
+
);
|
|
106
|
+
expect(unmanagedTarget.status).to.equal(HTTP_FORBIDDEN);
|
|
107
|
+
const cleanup = await sessions.folderManager.client.delete(
|
|
108
|
+
`/api/media/folders/${nomadId}`,
|
|
109
|
+
);
|
|
110
|
+
expect(cleanup.status).to.equal(HTTP_OK);
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
it("keeps visibility changes owner-only, even for a folder manager", async () => {
|
|
114
|
+
const folderFlip = await sessions.folderManager.client.post(
|
|
115
|
+
`/api/media/folders/${folders.depot}/visibility`,
|
|
116
|
+
{ visibility: "public" },
|
|
117
|
+
);
|
|
118
|
+
expect(folderFlip.status).to.equal(HTTP_FORBIDDEN);
|
|
119
|
+
const assetFlip = await sessions.folderManager.client.post(
|
|
120
|
+
`/api/media/assets/${assets.notes.id}/visibility`,
|
|
121
|
+
{ visibility: "public" },
|
|
122
|
+
);
|
|
123
|
+
expect(assetFlip.status).to.equal(HTTP_FORBIDDEN);
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/** Stored folder ACLs, and what the owner may still do: flip visibility, but not unlock linked folders. */
|
|
128
|
+
function folderAclTests(): void {
|
|
129
|
+
it("applies a stored folder ACL on the next request", async () => {
|
|
130
|
+
const before = await fetchTree(sessions.viewer.client);
|
|
131
|
+
expect(findById(before, folders.curtain), "curtain visible").to.not.equal(
|
|
132
|
+
undefined,
|
|
133
|
+
);
|
|
134
|
+
expect(await readFolderAcl(folders.curtain)).to.equal(undefined);
|
|
135
|
+
await writeFolderAcl(folders.curtain, [
|
|
136
|
+
roleEntry(roles.secretTeam, ["manage"]),
|
|
137
|
+
]);
|
|
138
|
+
const hidden = await fetchTree(sessions.viewer.client);
|
|
139
|
+
expect(findById(hidden, folders.curtain), "curtain hidden").to.equal(
|
|
140
|
+
undefined,
|
|
141
|
+
);
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
it("never locks the owner out of a folder", async () => {
|
|
145
|
+
await writeFolderAcl(folders.curtain, []);
|
|
146
|
+
const tree = await fetchTree(owner);
|
|
147
|
+
expect(findById(tree, folders.curtain)?.rights.manage).to.equal(true);
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
it("restores inheritance when the ACL is cleared", async () => {
|
|
151
|
+
await writeFolderAcl(folders.curtain, null);
|
|
152
|
+
const tree = await fetchTree(sessions.viewer.client);
|
|
153
|
+
expect(findById(tree, folders.curtain), "curtain back").to.not.equal(
|
|
154
|
+
undefined,
|
|
155
|
+
);
|
|
156
|
+
});
|
|
157
|
+
|
|
158
|
+
it("lets the owner flip folder and asset visibility", async () => {
|
|
159
|
+
const folderFlip = await owner.post(
|
|
160
|
+
`/api/media/folders/${folders.curtain}/visibility`,
|
|
161
|
+
{ visibility: "public" },
|
|
162
|
+
);
|
|
163
|
+
expect(folderFlip.status).to.equal(HTTP_OK);
|
|
164
|
+
const folderBack = await owner.post(
|
|
165
|
+
`/api/media/folders/${folders.curtain}/visibility`,
|
|
166
|
+
{ visibility: "private" },
|
|
167
|
+
);
|
|
168
|
+
expect(folderBack.status).to.equal(HTTP_OK);
|
|
169
|
+
const assetFlip = await owner.post(
|
|
170
|
+
`/api/media/assets/${assets.notes.id}/visibility`,
|
|
171
|
+
{ visibility: "private" },
|
|
172
|
+
);
|
|
173
|
+
expect(assetFlip.status).to.equal(HTTP_OK);
|
|
174
|
+
const assetBack = await owner.post(
|
|
175
|
+
`/api/media/assets/${assets.notes.id}/visibility`,
|
|
176
|
+
{ visibility: "inherit" },
|
|
177
|
+
);
|
|
178
|
+
expect(assetBack.status).to.equal(HTTP_OK);
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
it("keeps linked folders locked even for the owner", async () => {
|
|
182
|
+
const rename = await owner.post(
|
|
183
|
+
`/api/media/folders/${folders.stock}/rename`,
|
|
184
|
+
{ name: "Hijacked stock" },
|
|
185
|
+
);
|
|
186
|
+
expect(rename.status).to.equal(HTTP_FORBIDDEN);
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/** Role updates, the uploads page button and the binding lifecycle, run last. */
|
|
191
|
+
export function laterPermissionSuites(): void {
|
|
192
|
+
describe("dynamic role updates", () => {
|
|
193
|
+
it("grants access on the next request when the role gains a permission", async () => {
|
|
194
|
+
const before = await fetchTree(sessions.latecomer.client);
|
|
195
|
+
expect(before.folders).to.deep.equal([]);
|
|
196
|
+
await setRolePermissions(roles.latecomer, [LIBRARY_VIEW_PERMISSION]);
|
|
197
|
+
const after = await fetchTree(sessions.latecomer.client);
|
|
198
|
+
expect(
|
|
199
|
+
findById(after, folders.library),
|
|
200
|
+
"library visible after grant",
|
|
201
|
+
).to.not.equal(undefined);
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
it("revokes access on the next request when the permission is removed", async () => {
|
|
205
|
+
await setRolePermissions(roles.latecomer, []);
|
|
206
|
+
const tree = await fetchTree(sessions.latecomer.client);
|
|
207
|
+
expect(tree.folders).to.deep.equal([]);
|
|
208
|
+
});
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
describe("upload header button", () => {
|
|
212
|
+
const uploadsPagePermission = GetPermissionId(MediaUploadsPage) ?? "";
|
|
213
|
+
|
|
214
|
+
async function uploadButton(client: AxiosInstance) {
|
|
215
|
+
const layout = await client.get("/dms/pagelayout", {
|
|
216
|
+
params: { slug: MEDIA_ROUTES.uploads },
|
|
217
|
+
});
|
|
218
|
+
expect(layout.status).to.equal(HTTP_OK);
|
|
219
|
+
return layout.data.layout.options.headerActions[0];
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
async function latecomerAvailability() {
|
|
223
|
+
const user = await GetModel(UserModel).get(sessions.latecomer.userId);
|
|
224
|
+
return uploadAvailability({ tenantId: DEFAULT_TENANT_ID, user });
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
after(async () => {
|
|
228
|
+
await setRolePermissions(roles.latecomer, []);
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
it("serves the uploads page to the owner with the button enabled", async () => {
|
|
232
|
+
const button = await uploadButton(owner);
|
|
233
|
+
expect(button.disabled).to.not.equal(true);
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
it("keeps the uploads page from members: module pages are owner-only", async () => {
|
|
237
|
+
await setRolePermissions(roles.latecomer, [
|
|
238
|
+
LIBRARY_VIEW_PERMISSION,
|
|
239
|
+
uploadsPagePermission,
|
|
240
|
+
LIBRARY_UPLOAD_PERMISSION,
|
|
241
|
+
]);
|
|
242
|
+
const [memberAccess, ownerAccess] = await Promise.all([
|
|
243
|
+
readPageAccess(sessions.latecomer.client, MEDIA_ROUTES.uploads),
|
|
244
|
+
readPageAccess(owner, MEDIA_ROUTES.uploads),
|
|
245
|
+
]);
|
|
246
|
+
expect(ownerAccess).to.include({
|
|
247
|
+
ownRouteStatus: HTTP_OK,
|
|
248
|
+
hasAccess: true,
|
|
249
|
+
});
|
|
250
|
+
expect(ownerAccess.servedBlocks).to.be.greaterThan(0);
|
|
251
|
+
expect(memberAccess).to.include({ hasAccess: false, servedBlocks: 0 });
|
|
252
|
+
expect(memberAccess.ownRouteStatus).to.not.equal(HTTP_OK);
|
|
253
|
+
});
|
|
254
|
+
|
|
255
|
+
it("is disabled for a member who can upload to no folder", async () => {
|
|
256
|
+
await setRolePermissions(roles.latecomer, [LIBRARY_VIEW_PERMISSION]);
|
|
257
|
+
expect(await latecomerAvailability()).to.deep.equal({
|
|
258
|
+
reason: "$dms_media.uploads.no_writable_folder",
|
|
259
|
+
});
|
|
260
|
+
});
|
|
261
|
+
|
|
262
|
+
it("is enabled once the member may upload somewhere", async () => {
|
|
263
|
+
await setRolePermissions(roles.latecomer, [
|
|
264
|
+
LIBRARY_VIEW_PERMISSION,
|
|
265
|
+
LIBRARY_UPLOAD_PERMISSION,
|
|
266
|
+
]);
|
|
267
|
+
expect(await latecomerAvailability()).to.equal(undefined);
|
|
268
|
+
});
|
|
269
|
+
});
|
|
270
|
+
|
|
271
|
+
describe("binding lifecycle", () => {
|
|
272
|
+
it("resyncs the linked folder ACL when the mapping changes", async () => {
|
|
273
|
+
RegisterAssetBinding({
|
|
274
|
+
id: STOCK_BINDING_ID,
|
|
275
|
+
folderName: STOCK_FOLDER_NAME,
|
|
276
|
+
permissionMapping: {
|
|
277
|
+
read: [WAREHOUSE_VIEW_PERMISSION],
|
|
278
|
+
write: [WAREHOUSE_EDIT_PERMISSION],
|
|
279
|
+
},
|
|
280
|
+
});
|
|
281
|
+
await fetchTree(owner);
|
|
282
|
+
expect(await readFolderAcl(folders.stock)).to.deep.include(
|
|
283
|
+
permissionEntry(WAREHOUSE_VIEW_PERMISSION, ["read"]),
|
|
284
|
+
);
|
|
285
|
+
const tree = await fetchTree(sessions.clerk.client);
|
|
286
|
+
expect(
|
|
287
|
+
requireById(tree, folders.stock).rights.write,
|
|
288
|
+
"clerk keeps write after resync",
|
|
289
|
+
).to.equal(true);
|
|
290
|
+
});
|
|
291
|
+
});
|
|
292
|
+
}
|
|
@@ -2,6 +2,7 @@ import { expect } from "chai";
|
|
|
2
2
|
import { parseFolderAcl, serializeAcl } from "../../../acl/entries";
|
|
3
3
|
import type { MediaFolder } from "../../../db/tables";
|
|
4
4
|
import type { AclEntry } from "../../../types";
|
|
5
|
+
import { folder } from "../library/fixtures";
|
|
5
6
|
|
|
6
7
|
const READ_ENTRY: AclEntry = {
|
|
7
8
|
subject: { kind: "role", id: "editors" },
|
|
@@ -9,7 +10,7 @@ const READ_ENTRY: AclEntry = {
|
|
|
9
10
|
};
|
|
10
11
|
|
|
11
12
|
function folderWithAcl(json_acl: string | undefined): MediaFolder {
|
|
12
|
-
return { json_acl }
|
|
13
|
+
return folder("folder", undefined, [], { json_acl });
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
describe("[unit] acl/entries — parseFolderAcl", () => {
|
|
@@ -27,13 +27,23 @@ function buildFolder(seed: FolderSeed): MediaFolder {
|
|
|
27
27
|
visibility: "private",
|
|
28
28
|
createdAt: new Date(),
|
|
29
29
|
updatedAt: new Date(),
|
|
30
|
-
}
|
|
30
|
+
};
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
function buildActor(permissions: string[], roleIds: string[] = []): AclActor {
|
|
34
34
|
return { permissions: new Set(permissions), roleIds };
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
+
/** The ids `acl` names as subjects of `kind`: an actor holding them all is matched by every entry. */
|
|
38
|
+
function subjectIds(
|
|
39
|
+
acl: readonly AclEntry[],
|
|
40
|
+
kind: AclEntry["subject"]["kind"],
|
|
41
|
+
): string[] {
|
|
42
|
+
return acl
|
|
43
|
+
.filter((entry) => entry.subject.kind === kind)
|
|
44
|
+
.map((entry) => entry.subject.id);
|
|
45
|
+
}
|
|
46
|
+
|
|
37
47
|
const EDIT_ARTICLES_PERMISSION = "articles.table.edit";
|
|
38
48
|
const LIBRARY_VIEW_PERMISSION = "library.view";
|
|
39
49
|
const LIBRARY_UPLOAD_PERMISSION = "library.upload";
|
|
@@ -218,6 +228,11 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
218
228
|
const folders = [buildFolder({ id: "root" })];
|
|
219
229
|
const actor = buildActor([MEDIA_PAGE_PERMISSION]);
|
|
220
230
|
expect(resolveRootRights(actor, DEFAULT_ROOT_ACL).size).to.equal(0);
|
|
231
|
+
const named = buildActor(
|
|
232
|
+
subjectIds(DEFAULT_ROOT_ACL, "permission"),
|
|
233
|
+
subjectIds(DEFAULT_ROOT_ACL, "role"),
|
|
234
|
+
);
|
|
235
|
+
expect(resolveRootRights(named, DEFAULT_ROOT_ACL).size).to.equal(0);
|
|
221
236
|
const access = resolveFolderAccess(folders, actor, DEFAULT_ROOT_ACL);
|
|
222
237
|
expect(access.readable.size).to.equal(0);
|
|
223
238
|
const owner = resolveFolderAccess(
|
|
@@ -282,14 +297,11 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
282
297
|
});
|
|
283
298
|
|
|
284
299
|
it("ignores unknown rights and unknown subject kinds", () => {
|
|
285
|
-
|
|
286
|
-
// and an unknown subject kind are what this test feeds the resolver.
|
|
287
|
-
// oxlint-disable-next-line anti-slop/no-chained-type-assertions
|
|
288
|
-
const exoticAcl = [
|
|
300
|
+
const exoticAcl = JSON.stringify([
|
|
289
301
|
{ subject: { kind: "role", id: "editors" }, rights: ["teleport"] },
|
|
290
302
|
{ subject: { kind: "group", id: "editors" }, rights: ["manage"] },
|
|
291
|
-
]
|
|
292
|
-
const folders = [buildFolder({ id: "root",
|
|
303
|
+
]);
|
|
304
|
+
const folders = [buildFolder({ id: "root", rawAcl: exoticAcl })];
|
|
293
305
|
const editor = resolveFolderAccess(
|
|
294
306
|
folders,
|
|
295
307
|
buildActor([], ["editors"]),
|
|
@@ -6,6 +6,7 @@ export function folder(
|
|
|
6
6
|
id: string,
|
|
7
7
|
parentId?: string,
|
|
8
8
|
path: string[] = [],
|
|
9
|
+
overrides: Partial<MediaFolder> = {},
|
|
9
10
|
): MediaFolder {
|
|
10
11
|
return {
|
|
11
12
|
_id: id,
|
|
@@ -15,7 +16,8 @@ export function folder(
|
|
|
15
16
|
visibility: "private",
|
|
16
17
|
createdAt: EPOCH,
|
|
17
18
|
updatedAt: EPOCH,
|
|
18
|
-
|
|
19
|
+
...overrides,
|
|
20
|
+
};
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
export function asset(
|
|
@@ -28,11 +30,15 @@ export function asset(
|
|
|
28
30
|
name: `${id}.jpg`,
|
|
29
31
|
mimetype: "image/jpeg",
|
|
30
32
|
size: 100,
|
|
33
|
+
storageKey: `${id}.jpg`,
|
|
31
34
|
visibility: "inherit",
|
|
35
|
+
mediaRevision: "revision",
|
|
36
|
+
json_retiredFiles: "[]",
|
|
37
|
+
createdBy: "user",
|
|
32
38
|
createdAt: EPOCH,
|
|
33
39
|
updatedAt: EPOCH,
|
|
34
40
|
...overrides,
|
|
35
|
-
}
|
|
41
|
+
};
|
|
36
42
|
}
|
|
37
43
|
|
|
38
44
|
export function event(
|
|
@@ -48,5 +54,5 @@ export function event(
|
|
|
48
54
|
folderId: "root",
|
|
49
55
|
createdAt: EPOCH,
|
|
50
56
|
...overrides,
|
|
51
|
-
}
|
|
57
|
+
};
|
|
52
58
|
}
|
|
@@ -3,12 +3,7 @@ import { buildActivityItems } from "../../../library/activity";
|
|
|
3
3
|
import { buildUploadBatches } from "../../../library/batches";
|
|
4
4
|
import { composedBytes, composedText } from "../../../library/composed-text";
|
|
5
5
|
import { computeFolderStats } from "../../../library/folder-stats";
|
|
6
|
-
import {
|
|
7
|
-
fileLink,
|
|
8
|
-
folderLink,
|
|
9
|
-
MEDIA_ROUTES,
|
|
10
|
-
viewLink,
|
|
11
|
-
} from "../../../library/links";
|
|
6
|
+
import { fileLink, folderLink, viewLink } from "../../../library/links";
|
|
12
7
|
import { countByTypeGroup, pageAssets } from "../../../library/listing";
|
|
13
8
|
import { searchAssets, searchFolders } from "../../../library/search";
|
|
14
9
|
import {
|
|
@@ -216,7 +211,6 @@ describe("[unit] library — composed texts", () => {
|
|
|
216
211
|
|
|
217
212
|
describe("[unit] library — links", () => {
|
|
218
213
|
it("points at the pages of the media module", () => {
|
|
219
|
-
expect(MEDIA_ROUTES.overview).to.equal("/modules/media/overview");
|
|
220
214
|
expect(folderLink("f 1")).to.equal("/modules/media/files?folder=f%201");
|
|
221
215
|
expect(fileLink("a1")).to.equal("/modules/media/file?asset=a1");
|
|
222
216
|
expect(viewLink("missing-alt")).to.equal(
|
|
@@ -20,8 +20,8 @@ describe("[unit] library — realtime", () => {
|
|
|
20
20
|
let messages: RealtimeMessage[];
|
|
21
21
|
let unsubscribe: () => void;
|
|
22
22
|
|
|
23
|
+
/** Changes the integration suites made may still be waiting to be announced: drop them first. */
|
|
23
24
|
beforeEach(() => {
|
|
24
|
-
// Changes the integration suites made may still be waiting to be announced.
|
|
25
25
|
cancelLibraryChange();
|
|
26
26
|
messages = [];
|
|
27
27
|
unsubscribe = SubscribeMessage(MEDIA_LIBRARY_TOPIC, (message) => {
|
|
@@ -77,7 +77,7 @@ describe("[unit] library/search — accent-free, multi-word search", () => {
|
|
|
77
77
|
});
|
|
78
78
|
|
|
79
79
|
describe("[unit] library — listing facets and folder counts", () => {
|
|
80
|
-
const
|
|
80
|
+
const candidates = [
|
|
81
81
|
asset("wide", { width: 400, height: 200 }),
|
|
82
82
|
asset("tall", { width: 200, height: 400 }),
|
|
83
83
|
asset("even", { width: 300, height: 300 }),
|
|
@@ -85,7 +85,7 @@ describe("[unit] library — listing facets and folder counts", () => {
|
|
|
85
85
|
];
|
|
86
86
|
|
|
87
87
|
function keep(orientation: AssetFilterQuery["orientation"]): string[] {
|
|
88
|
-
return filterAssets(
|
|
88
|
+
return filterAssets(candidates, {
|
|
89
89
|
query: { ...ANY_FILTER, orientation },
|
|
90
90
|
now: NOW,
|
|
91
91
|
visibilityOf: () => "private",
|