@antelopejs/dms-media 0.7.0 → 0.7.2
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 -24
- 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/config.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 +3 -7
- 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.d.ts +1 -1
- package/dist/library/activity.js +2 -1
- package/dist/library/activity.js.map +1 -1
- package/dist/pages/uploads.js +1 -1
- package/dist/pages/uploads.js.map +1 -1
- package/dist/routes/media/asset-actions.js +12 -4
- package/dist/routes/media/asset-actions.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/overview.js +5 -1
- package/dist/routes/media/overview.js.map +1 -1
- package/dist/routes/media/storage-keys.js.map +1 -1
- package/dist/routes/media/upload.js +1 -3
- package/dist/routes/media/upload.js.map +1 -1
- package/dist/test/antelope.test.js +13 -6
- 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 +27 -4
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-file-history.test.d.ts +1 -0
- package/dist/test/integration/media-file-history.test.js +33 -0
- package/dist/test/integration/media-file-history.test.js.map +1 -0
- 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 +38 -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 +70 -20
- 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/stack-modules.json +7 -0
- package/dist/test/unit/declared.test.js +1 -1
- package/dist/test/unit/declared.test.js.map +1 -1
- package/dist/test/unit/library/activity-overview.test.js +9 -0
- package/dist/test/unit/library/activity-overview.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/pages/toolbar.test.js +4 -4
- package/dist/test/unit/pages/toolbar.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-checks.d.ts +1 -3
- package/dist/upload-checks.js +12 -14
- package/dist/upload-checks.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 +9 -9
- package/dist/validation/media.schema.js +5 -6
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/components/explorer/ExplorerShell.vue +11 -7
- package/frontend-vue/i18n/locales/media-en-GB.json +1 -0
- package/frontend-vue/i18n/locales/media-fr-FR.json +1 -0
- package/frontend-vue/package.json +39 -39
- package/package.json +14 -12
- package/skills/dms-media/SKILL.md +3 -3
- package/src/acl/entries.ts +5 -2
- package/src/asset-lifecycle.ts +2 -1
- package/src/config.ts +4 -3
- package/src/declared/assets.ts +8 -10
- package/src/declared/records.ts +5 -1
- package/src/library/activity.ts +9 -3
- package/src/pages/uploads.ts +1 -1
- package/src/routes/media/asset-actions.ts +24 -3
- package/src/routes/media/manage.ts +2 -2
- package/src/routes/media/overview.ts +5 -4
- package/src/routes/media/storage-keys.ts +1 -0
- package/src/routes/media/upload.ts +2 -5
- package/src/test/antelope.test.ts +10 -6
- 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 +28 -4
- package/src/test/integration/media-file-history.test.ts +38 -0
- 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 +48 -3
- 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 +84 -30
- package/src/test/integration/permissions-management.ts +16 -4
- package/src/test/stack-modules.json +7 -0
- package/src/test/unit/declared.test.ts +4 -1
- package/src/test/unit/library/activity-overview.test.ts +15 -0
- package/src/test/unit/library/zip-names.test.ts +26 -7
- package/src/test/unit/pages/toolbar.test.ts +4 -4
- package/src/test/unit/upload-rules.test.ts +11 -0
- package/src/transform-ops.ts +1 -0
- package/src/upload-checks.ts +22 -18
- package/src/upload-policy.ts +11 -11
- package/src/validation/media.schema.ts +9 -8
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { assert } from "@antelopejs/interface-api-util";
|
|
2
2
|
import { deleteMediaAsset } from "../../asset-lifecycle";
|
|
3
|
+
import { feedingBinding } from "../../bindings";
|
|
3
4
|
import type { MediaAsset, MediaFolder } from "../../db";
|
|
5
|
+
import { bindingAccepts } from "../../library/binding-labels";
|
|
4
6
|
import { recordMediaEvent } from "../../library/events";
|
|
5
7
|
import { forgetFavorites } from "../../library/favorites";
|
|
6
8
|
import type { AssetVisibility } from "../../types";
|
|
9
|
+
import { mimetypeMatches } from "../../upload-policy";
|
|
7
10
|
import { comparableName, MEDIA_ERRORS } from "../../validation/media.schema";
|
|
8
11
|
import {
|
|
9
12
|
assertMediaOwner,
|
|
@@ -13,6 +16,7 @@ import {
|
|
|
13
16
|
import { resolveEffectiveVisibility } from "./dto";
|
|
14
17
|
|
|
15
18
|
const HTTP_CONFLICT = 409;
|
|
19
|
+
const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
|
|
16
20
|
|
|
17
21
|
export interface AssetChanges {
|
|
18
22
|
name?: string;
|
|
@@ -30,14 +34,15 @@ function changesEffectiveVisibility(
|
|
|
30
34
|
);
|
|
31
35
|
}
|
|
32
36
|
|
|
33
|
-
/** Refuses a name another file of
|
|
37
|
+
/** Refuses a name another file of `folderId` already has, regardless of case. */
|
|
34
38
|
async function assertFreeAssetName(
|
|
35
39
|
context: MediaRequestContext,
|
|
36
40
|
asset: MediaAsset,
|
|
41
|
+
folderId: string,
|
|
37
42
|
name: string,
|
|
38
43
|
): Promise<void> {
|
|
39
44
|
const wanted = comparableName(name);
|
|
40
|
-
const siblings = await context.assetModel.getBy("folderId",
|
|
45
|
+
const siblings = await context.assetModel.getBy("folderId", folderId);
|
|
41
46
|
const clash = siblings.some(
|
|
42
47
|
(sibling) =>
|
|
43
48
|
sibling._id !== asset._id &&
|
|
@@ -54,7 +59,14 @@ export async function updateAssetDetails(
|
|
|
54
59
|
): Promise<void> {
|
|
55
60
|
requireFolderRight(context, asset.folderId, "write");
|
|
56
61
|
const isRename = changes.name !== undefined && changes.name !== asset.name;
|
|
57
|
-
if (isRename)
|
|
62
|
+
if (isRename) {
|
|
63
|
+
await assertFreeAssetName(
|
|
64
|
+
context,
|
|
65
|
+
asset,
|
|
66
|
+
asset.folderId,
|
|
67
|
+
changes.name ?? "",
|
|
68
|
+
);
|
|
69
|
+
}
|
|
58
70
|
await context.assetModel.update(asset._id, changes);
|
|
59
71
|
const isAltChange = changes.alt !== undefined && changes.alt !== asset.alt;
|
|
60
72
|
if (isRename) {
|
|
@@ -84,9 +96,18 @@ export async function moveAsset(
|
|
|
84
96
|
const sourceFolder = requireFolderRight(context, asset.folderId, "write");
|
|
85
97
|
const targetFolder = requireFolderRight(context, folderId, "write");
|
|
86
98
|
if (sourceFolder._id === targetFolder._id) return;
|
|
99
|
+
const accepted = bindingAccepts(
|
|
100
|
+
feedingBinding(targetFolder, context.foldersById),
|
|
101
|
+
);
|
|
102
|
+
assert(
|
|
103
|
+
!accepted || mimetypeMatches(asset.mimetype, accepted),
|
|
104
|
+
HTTP_UNSUPPORTED_MEDIA_TYPE,
|
|
105
|
+
MEDIA_ERRORS.fieldType,
|
|
106
|
+
);
|
|
87
107
|
if (changesEffectiveVisibility(asset, sourceFolder, targetFolder)) {
|
|
88
108
|
assertMediaOwner(context);
|
|
89
109
|
}
|
|
110
|
+
await assertFreeAssetName(context, asset, folderId, asset.name);
|
|
90
111
|
await context.assetModel.update(asset._id, { folderId });
|
|
91
112
|
await recordMediaEvent(context, {
|
|
92
113
|
kind: "asset.move",
|
|
@@ -55,9 +55,9 @@ function matchesFilters(
|
|
|
55
55
|
row: UploadBatchRow,
|
|
56
56
|
filters: Map<string, Set<string>>,
|
|
57
57
|
): boolean {
|
|
58
|
-
const fields
|
|
58
|
+
const fields = new Map<string, unknown>(Object.entries(row));
|
|
59
59
|
return [...filters].every(([column, values]) =>
|
|
60
|
-
values.has(String(fields
|
|
60
|
+
values.has(String(fields.get(column))),
|
|
61
61
|
);
|
|
62
62
|
}
|
|
63
63
|
|
|
@@ -208,10 +208,11 @@ export class MediaOverviewController extends MediaApiController {
|
|
|
208
208
|
MediaEventModel,
|
|
209
209
|
context.tenantId,
|
|
210
210
|
).listByAsset(assetId);
|
|
211
|
-
const items = buildActivityItems(
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
211
|
+
const items = buildActivityItems({
|
|
212
|
+
events,
|
|
213
|
+
foldersById: context.foldersById,
|
|
214
|
+
foldsBulkActions: false,
|
|
215
|
+
});
|
|
215
216
|
return { items: unlinkCurrentFile(items, assetId) };
|
|
216
217
|
}
|
|
217
218
|
}
|
|
@@ -2,6 +2,7 @@ import type { MediaAsset } from "../../db";
|
|
|
2
2
|
|
|
3
3
|
export function parseDerivatives(asset: MediaAsset): Record<string, string> {
|
|
4
4
|
if (!asset.json_derivatives) return {};
|
|
5
|
+
// SAFETY: json_derivatives is written only as "" or the JSON.stringify of a map from cache key to storage key (transform.ts, derivatives.ts, crons/sweep-derivatives.ts), so a non-empty value is that string map; a schema parse of a stored row on read is excluded by ruling.
|
|
5
6
|
return JSON.parse(asset.json_derivatives) as Record<string, string>;
|
|
6
7
|
}
|
|
7
8
|
|
|
@@ -19,11 +19,10 @@ import { ORIGINAL_FILENAME_METADATA_KEY } from "../../constants";
|
|
|
19
19
|
import { MediaUploadModel } from "../../db";
|
|
20
20
|
import { loadAssetsInFolders } from "../../library/listing";
|
|
21
21
|
import {
|
|
22
|
-
assertReadableImage,
|
|
23
22
|
assertUploadTypeAllowed,
|
|
24
23
|
assertWithinQuota,
|
|
25
24
|
type ImageProbe,
|
|
26
|
-
|
|
25
|
+
probeImage,
|
|
27
26
|
UploadRefusedError,
|
|
28
27
|
} from "../../upload-checks";
|
|
29
28
|
import { suggestFreeNames } from "../../upload-names";
|
|
@@ -73,13 +72,11 @@ async function readImage(
|
|
|
73
72
|
metadata: FileMetadata,
|
|
74
73
|
): Promise<ImageProbe> {
|
|
75
74
|
const storage = getMediaConfig().storage;
|
|
76
|
-
|
|
75
|
+
return probeImage(
|
|
77
76
|
() => readStoredFile(resourceKey, storage),
|
|
78
77
|
metadata.mimetype,
|
|
79
78
|
metadata.size,
|
|
80
79
|
);
|
|
81
|
-
assertReadableImage(probe, metadata.mimetype);
|
|
82
|
-
return probe;
|
|
83
80
|
}
|
|
84
81
|
|
|
85
82
|
async function assertUploadAccepted(
|
|
@@ -2,9 +2,12 @@ import { mkdtemp, rm } from "node:fs/promises";
|
|
|
2
2
|
import { createServer, type Server, type Socket } from "node:net";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
4
|
import { join } from "node:path";
|
|
5
|
+
import { version as DMS_VERSION } from "@antelopejs/dms/package.json";
|
|
5
6
|
import { defineConfig } from "@antelopejs/interface-core/config";
|
|
6
7
|
import { MongoMemoryReplSet } from "mongodb-memory-server-core";
|
|
7
8
|
import { isString } from "../guards";
|
|
9
|
+
import { SETUP_TOKEN } from "./helpers/setup-token";
|
|
10
|
+
import STACK_MODULES from "./stack-modules.json";
|
|
8
11
|
|
|
9
12
|
const API_PORT = 5019;
|
|
10
13
|
const LOCAL_BUILD_COMMAND = process.env.DMS_PREBUILT ? [] : ["pnpm build"];
|
|
@@ -110,7 +113,7 @@ export default defineConfig({
|
|
|
110
113
|
source: {
|
|
111
114
|
type: "package",
|
|
112
115
|
package: "@antelopejs/dms",
|
|
113
|
-
version:
|
|
116
|
+
version: DMS_VERSION,
|
|
114
117
|
},
|
|
115
118
|
config: {
|
|
116
119
|
/**
|
|
@@ -134,14 +137,14 @@ export default defineConfig({
|
|
|
134
137
|
source: {
|
|
135
138
|
type: "package",
|
|
136
139
|
package: "@antelopejs/mongodb",
|
|
137
|
-
version: "
|
|
140
|
+
version: STACK_MODULES["@antelopejs/mongodb"],
|
|
138
141
|
},
|
|
139
142
|
},
|
|
140
143
|
"auth-jwt": {
|
|
141
144
|
source: {
|
|
142
145
|
type: "package",
|
|
143
146
|
package: "@antelopejs/auth-jwt",
|
|
144
|
-
version: "
|
|
147
|
+
version: STACK_MODULES["@antelopejs/auth-jwt"],
|
|
145
148
|
},
|
|
146
149
|
config: {
|
|
147
150
|
secret: JWT_SECRET,
|
|
@@ -151,7 +154,7 @@ export default defineConfig({
|
|
|
151
154
|
source: {
|
|
152
155
|
type: "package",
|
|
153
156
|
package: "@antelopejs/api",
|
|
154
|
-
version: "
|
|
157
|
+
version: STACK_MODULES["@antelopejs/api"],
|
|
155
158
|
},
|
|
156
159
|
config: {
|
|
157
160
|
servers: [{ protocol: "http", host: "127.0.0.1", port: API_PORT }],
|
|
@@ -162,14 +165,14 @@ export default defineConfig({
|
|
|
162
165
|
source: {
|
|
163
166
|
type: "package",
|
|
164
167
|
package: "@antelopejs/file-storage-local",
|
|
165
|
-
version: "
|
|
168
|
+
version: STACK_MODULES["@antelopejs/file-storage-local"],
|
|
166
169
|
},
|
|
167
170
|
},
|
|
168
171
|
nodemailer: {
|
|
169
172
|
source: {
|
|
170
173
|
type: "package",
|
|
171
174
|
package: "@antelopejs/nodemailer",
|
|
172
|
-
version: "
|
|
175
|
+
version: STACK_MODULES["@antelopejs/nodemailer"],
|
|
173
176
|
},
|
|
174
177
|
config: {
|
|
175
178
|
host: SMTP_HOST,
|
|
@@ -193,6 +196,7 @@ export default defineConfig({
|
|
|
193
196
|
process.env.TEST_MONGO_URL = mongoUrl;
|
|
194
197
|
process.env.TEST_API_BASE_URL = `http://127.0.0.1:${API_PORT}`;
|
|
195
198
|
process.env.TEST_JWT_SECRET = JWT_SECRET;
|
|
199
|
+
process.env.DMS_SETUP_TOKEN = SETUP_TOKEN;
|
|
196
200
|
|
|
197
201
|
return {
|
|
198
202
|
modules: {
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import axios, { type AxiosInstance } from "axios";
|
|
2
2
|
import { expect } from "chai";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import { presignBody, readBody } from "./bodies";
|
|
3
5
|
import { getBaseUrl } from "./http";
|
|
4
6
|
|
|
5
7
|
const HTTP_OK = 200;
|
|
@@ -12,14 +14,16 @@ export const ONE_PIXEL_PNG = Buffer.from(
|
|
|
12
14
|
"base64",
|
|
13
15
|
);
|
|
14
16
|
|
|
15
|
-
|
|
16
|
-
id: string
|
|
17
|
-
folderId: string
|
|
18
|
-
name: string
|
|
19
|
-
width
|
|
20
|
-
height
|
|
21
|
-
url: string
|
|
22
|
-
}
|
|
17
|
+
const uploadedAssetBody = z.object({
|
|
18
|
+
id: z.string(),
|
|
19
|
+
folderId: z.string(),
|
|
20
|
+
name: z.string(),
|
|
21
|
+
width: z.number().nullish(),
|
|
22
|
+
height: z.number().nullish(),
|
|
23
|
+
url: z.string(),
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
export type UploadedAsset = z.infer<typeof uploadedAssetBody>;
|
|
23
27
|
|
|
24
28
|
export interface RawRedirectResponse {
|
|
25
29
|
status: number;
|
|
@@ -34,6 +38,18 @@ export interface BatchFile {
|
|
|
34
38
|
batchId?: string;
|
|
35
39
|
}
|
|
36
40
|
|
|
41
|
+
/** Sends the bytes to the storage URL a presign answered, the way a browser does. */
|
|
42
|
+
export function putPresigned(
|
|
43
|
+
presign: z.infer<typeof presignBody>,
|
|
44
|
+
body: Buffer,
|
|
45
|
+
) {
|
|
46
|
+
return axios.put(presign.uploadUrl, body, {
|
|
47
|
+
headers: presign.headers,
|
|
48
|
+
validateStatus: () => true,
|
|
49
|
+
transformRequest: [(data: Buffer) => data],
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
|
|
37
53
|
export function uploadAsset(
|
|
38
54
|
client: AxiosInstance,
|
|
39
55
|
folderId: string,
|
|
@@ -57,20 +73,17 @@ export async function uploadAssetInBatch(
|
|
|
57
73
|
mimetype,
|
|
58
74
|
});
|
|
59
75
|
expect(presign.status, "presign").to.equal(HTTP_OK);
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
validateStatus: () => true,
|
|
63
|
-
transformRequest: [(data) => data],
|
|
64
|
-
});
|
|
76
|
+
const presigned = readBody(presign, presignBody);
|
|
77
|
+
const put = await putPresigned(presigned, body);
|
|
65
78
|
expect(put.status, "storage PUT").to.be.lessThan(HTTP_REDIRECT_BOUNDARY);
|
|
66
79
|
const confirm = await client.post("/api/media/upload/confirm", {
|
|
67
80
|
folderId,
|
|
68
|
-
resourceKey:
|
|
81
|
+
resourceKey: presigned.resourceKey,
|
|
69
82
|
filename,
|
|
70
83
|
batchId,
|
|
71
84
|
});
|
|
72
85
|
expect(confirm.status, "confirm").to.equal(HTTP_OK);
|
|
73
|
-
return confirm.
|
|
86
|
+
return readBody(confirm, z.object({ asset: uploadedAssetBody })).asset;
|
|
74
87
|
}
|
|
75
88
|
|
|
76
89
|
export function uploadPixelPng(
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { z, type ZodType, type ZodTypeDef } from "zod";
|
|
2
|
+
|
|
3
|
+
/** A response body checked against the shape its route answers. */
|
|
4
|
+
export function readBody<Output>(
|
|
5
|
+
response: { data: unknown },
|
|
6
|
+
schema: ZodType<Output, ZodTypeDef, unknown>,
|
|
7
|
+
): Output {
|
|
8
|
+
return schema.parse(response.data);
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
/** What creating a folder answers. */
|
|
12
|
+
export const createdBody = z.object({ id: z.string() });
|
|
13
|
+
|
|
14
|
+
/** What presigning an upload answers. */
|
|
15
|
+
export const presignBody = z.object({
|
|
16
|
+
uploadUrl: z.string(),
|
|
17
|
+
headers: z.record(z.string()),
|
|
18
|
+
resourceKey: z.string(),
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
/** What a read-url answers. */
|
|
22
|
+
export const urlBody = z.object({ url: z.string() });
|
|
@@ -31,17 +31,20 @@ const folderNodeSchema = z.object({
|
|
|
31
31
|
name: z.string(),
|
|
32
32
|
parentId: z.string().nullable(),
|
|
33
33
|
binding: z.string().nullable(),
|
|
34
|
+
bound: z.boolean(),
|
|
34
35
|
acceptsSubfolders: z.boolean(),
|
|
35
36
|
accepts: z.array(z.string()).nullable(),
|
|
36
37
|
});
|
|
37
38
|
|
|
38
39
|
export type FolderNode = z.infer<typeof folderNodeSchema>;
|
|
39
40
|
|
|
40
|
-
/**
|
|
41
|
+
/** What `/api/media/tree` answers, checked against the fields the suites read. */
|
|
42
|
+
export const folderTreeBody = z.object({ folders: z.array(folderNodeSchema) });
|
|
43
|
+
|
|
44
|
+
/** The folders `/api/media/tree` answers. */
|
|
41
45
|
export async function fetchFolderNodes(
|
|
42
46
|
client: AxiosInstance,
|
|
43
47
|
): Promise<FolderNode[]> {
|
|
44
48
|
const response = await client.get("/api/media/tree");
|
|
45
|
-
return
|
|
46
|
-
.folders;
|
|
49
|
+
return folderTreeBody.parse(response.data).folders;
|
|
47
50
|
}
|
|
@@ -3,6 +3,8 @@ import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
|
3
3
|
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
4
4
|
import { RoleModel, UserInviteModel } from "@antelopejs/interface-dms/db";
|
|
5
5
|
import type { AxiosInstance } from "axios";
|
|
6
|
+
import { z } from "zod";
|
|
7
|
+
import { readBody } from "./bodies";
|
|
6
8
|
import { authorizedClient, createClient } from "./http";
|
|
7
9
|
import { withPermissionAncestors } from "./permission-ancestors";
|
|
8
10
|
|
|
@@ -11,6 +13,11 @@ const MEMBER_LANGUAGE = "en";
|
|
|
11
13
|
const INVITE_LIFETIME_MS = 3_600_000;
|
|
12
14
|
const HTTP_BAD_REQUEST = 400;
|
|
13
15
|
|
|
16
|
+
const signupBody = z.object({
|
|
17
|
+
access_token: z.string(),
|
|
18
|
+
user: z.object({ _id: z.string() }),
|
|
19
|
+
});
|
|
20
|
+
|
|
14
21
|
export interface MemberSession {
|
|
15
22
|
client: AxiosInstance;
|
|
16
23
|
accessToken: string;
|
|
@@ -74,10 +81,11 @@ export async function registerMember(
|
|
|
74
81
|
`Member signup failed [${signup.status}]: ${JSON.stringify(signup.data)}`,
|
|
75
82
|
);
|
|
76
83
|
}
|
|
84
|
+
const session = readBody(signup, signupBody);
|
|
77
85
|
return {
|
|
78
|
-
client: authorizedClient(
|
|
79
|
-
accessToken:
|
|
80
|
-
userId:
|
|
86
|
+
client: authorizedClient(session.access_token),
|
|
87
|
+
accessToken: session.access_token,
|
|
88
|
+
userId: session.user._id,
|
|
81
89
|
email,
|
|
82
90
|
};
|
|
83
91
|
}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { readBody } from "./bodies";
|
|
1
3
|
import { createClient } from "./http";
|
|
4
|
+
import { SETUP_TOKEN } from "./setup-token";
|
|
2
5
|
|
|
3
6
|
const OWNER_EMAIL = "owner@test.local";
|
|
4
7
|
const OWNER_PASSWORD = "TestPassw0rd!";
|
|
@@ -19,6 +22,7 @@ export async function ensureOwnerSession(): Promise<OwnerSession> {
|
|
|
19
22
|
lastName: OWNER_LAST_NAME,
|
|
20
23
|
email: OWNER_EMAIL,
|
|
21
24
|
password: OWNER_PASSWORD,
|
|
25
|
+
setupToken: SETUP_TOKEN,
|
|
22
26
|
});
|
|
23
27
|
const isRegistered = registration.status < HTTP_BAD_REQUEST;
|
|
24
28
|
const isAlreadyRegistered =
|
|
@@ -38,5 +42,6 @@ export async function ensureOwnerSession(): Promise<OwnerSession> {
|
|
|
38
42
|
`Login failed [${login.status}]: ${JSON.stringify(login.data)}`,
|
|
39
43
|
);
|
|
40
44
|
}
|
|
41
|
-
|
|
45
|
+
const session = readBody(login, z.object({ access_token: z.string() }));
|
|
46
|
+
return { accessToken: session.access_token, email: OWNER_EMAIL };
|
|
42
47
|
}
|
|
@@ -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 { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
4
5
|
import {
|
|
5
6
|
configureMediaModule,
|
|
@@ -8,6 +9,7 @@ import {
|
|
|
8
9
|
} from "../../config";
|
|
9
10
|
import { MEDIA_PAGE_PERMISSION } from "../../pages/files";
|
|
10
11
|
import type { AclEntry } from "../../types";
|
|
12
|
+
import { createdBody, readBody } from "../helpers/bodies";
|
|
11
13
|
import {
|
|
12
14
|
type UploadedAsset,
|
|
13
15
|
uploadPixelPng,
|
|
@@ -37,25 +39,27 @@ export const STOCK_FOLDER_NAME = "Warehouse stock";
|
|
|
37
39
|
export const CONTENT_ROOT_NAME = "Content";
|
|
38
40
|
export const ROTATE_QUARTER_TURN = 90;
|
|
39
41
|
|
|
40
|
-
|
|
41
|
-
id: string
|
|
42
|
-
name: string
|
|
43
|
-
parentId: string
|
|
44
|
-
shell: boolean
|
|
45
|
-
bound: boolean
|
|
46
|
-
visibility: string
|
|
47
|
-
rights: {
|
|
48
|
-
|
|
42
|
+
const treeFolderNodeBody = z.object({
|
|
43
|
+
id: z.string(),
|
|
44
|
+
name: z.string(),
|
|
45
|
+
parentId: z.string().nullable(),
|
|
46
|
+
shell: z.boolean(),
|
|
47
|
+
bound: z.boolean(),
|
|
48
|
+
visibility: z.string(),
|
|
49
|
+
rights: z.object({
|
|
50
|
+
read: z.boolean(),
|
|
51
|
+
write: z.boolean(),
|
|
52
|
+
manage: z.boolean(),
|
|
53
|
+
}),
|
|
54
|
+
});
|
|
49
55
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
manage: boolean
|
|
53
|
-
}
|
|
56
|
+
const treeBody = z.object({
|
|
57
|
+
folders: z.array(treeFolderNodeBody),
|
|
58
|
+
root: z.object({ write: z.boolean(), manage: z.boolean() }),
|
|
59
|
+
});
|
|
54
60
|
|
|
55
|
-
export
|
|
56
|
-
|
|
57
|
-
root: TreeRootRights;
|
|
58
|
-
}
|
|
61
|
+
export type TreeFolderNode = z.infer<typeof treeFolderNodeBody>;
|
|
62
|
+
export type TreeResponse = z.infer<typeof treeBody>;
|
|
59
63
|
|
|
60
64
|
export interface WorldRoles {
|
|
61
65
|
pageHolder: string;
|
|
@@ -103,7 +107,7 @@ export interface WorldAssets {
|
|
|
103
107
|
export async function fetchTree(client: AxiosInstance): Promise<TreeResponse> {
|
|
104
108
|
const response = await client.get("/api/media/tree");
|
|
105
109
|
expect(response.status, "tree").to.equal(HTTP_OK);
|
|
106
|
-
return response
|
|
110
|
+
return readBody(response, treeBody);
|
|
107
111
|
}
|
|
108
112
|
|
|
109
113
|
export function findByName(
|
|
@@ -134,7 +138,7 @@ export async function createFolder(
|
|
|
134
138
|
): Promise<string> {
|
|
135
139
|
const response = await owner.post("/api/media/folders", { name, parentId });
|
|
136
140
|
expect(response.status, `create folder ${name}`).to.equal(HTTP_OK);
|
|
137
|
-
return response.
|
|
141
|
+
return readBody(response, createdBody).id;
|
|
138
142
|
}
|
|
139
143
|
|
|
140
144
|
export function roleEntry(
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first-owner setup token of the test instance. The harness hands it to the
|
|
3
|
+
* DMS as `DMS_SETUP_TOKEN`, and the owner registration sends it back: from dms
|
|
4
|
+
* 0.15 onboarding refuses a registration without it.
|
|
5
|
+
*/
|
|
6
|
+
export const SETUP_TOKEN = "dms-media-test-setup-token";
|
|
@@ -28,14 +28,15 @@ describe("[integration] streaming derivative sweep", () => {
|
|
|
28
28
|
for (const [index, model] of models.entries()) {
|
|
29
29
|
await model.insert([{ ...fixture, _id: TENANTS[index] }]);
|
|
30
30
|
}
|
|
31
|
-
const visits:
|
|
31
|
+
const visits: unknown[] = [];
|
|
32
32
|
const restore = patchMethod<Query<unknown>, "cursor">(
|
|
33
33
|
Query.prototype,
|
|
34
34
|
"cursor",
|
|
35
35
|
(readCursor) =>
|
|
36
36
|
async function* (this: Query<unknown>) {
|
|
37
|
-
const table = this.stages.find(
|
|
38
|
-
|
|
37
|
+
const table: unknown = this.stages.find(
|
|
38
|
+
(stage) => stage.stage === "table",
|
|
39
|
+
)?.options?.id;
|
|
39
40
|
if (table === "tenants") {
|
|
40
41
|
for (const _id of TENANTS) yield { _id };
|
|
41
42
|
return;
|
|
@@ -6,6 +6,7 @@ import { uploadStorageBytes } from "../../derivatives";
|
|
|
6
6
|
import { deleteFolderTree } from "../../routes/media/folders";
|
|
7
7
|
|
|
8
8
|
const TENANT = "folder-cascade";
|
|
9
|
+
const TEST_TIMEOUT_MS = 20 * 1000;
|
|
9
10
|
|
|
10
11
|
async function insertFolder(
|
|
11
12
|
model: MediaFolderModel,
|
|
@@ -47,7 +48,8 @@ async function insertAsset(
|
|
|
47
48
|
return _id;
|
|
48
49
|
}
|
|
49
50
|
|
|
50
|
-
describe("[integration] folder deletion cascade", ()
|
|
51
|
+
describe("[integration] folder deletion cascade", function () {
|
|
52
|
+
this.timeout(TEST_TIMEOUT_MS);
|
|
51
53
|
let folderModel: MediaFolderModel;
|
|
52
54
|
let assetModel: MediaAssetModel;
|
|
53
55
|
|