fix: 修复本地图片上传与发布进程切换

This commit is contained in:
que01 committed 2026-10-13 16:00:42 +08:00
1 parent 7f67f4d685
commit dcf1d76944
7 files changed
+121 -25

No files matched your search

+6 -1
View File
@@ -52,7 +52,12 @@ export function ImageUrlField({ id, value, onChange, placeholder, scope }: Image
});
const response = await fetch(presign.uploadUrl, {
method: "PUT",
headers: { "content-type": file.type },
headers: {
"content-type": file.type,
...(presign.uploadUrl.startsWith("/api/")
? { authorization: `Bearer ${localStorage.getItem("adminToken") ?? ""}` }
: {}),
},
body: file,
});
if (!response.ok) throw new Error(`upload failed: ${response.status}`);
@@ -136,7 +136,7 @@ export class AdminUploadController {
const target = path.join(this.localMediaRoot, key);
await mkdir(path.dirname(target), { recursive: true });
return {
uploadUrl: `/admin/uploads/local?key=${encodeURIComponent(key)}`,
uploadUrl: `/api/admin/uploads/local?key=${encodeURIComponent(key)}`,
key,
publicUrl: `${this.localMediaBaseUrl}/${key}`,
mode: "local",
+38
View File
@@ -1,4 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, rm } from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import test from "node:test";
test("upload presign DTO rejects unsupported media type and oversized names", async () => {
@@ -16,3 +19,38 @@ test("upload presign DTO rejects unsupported media type and oversized names", as
valid.contentType = "image/jpeg";
assert.deepEqual(await validator.validate(valid), []);
});
test("local upload presign targets the API route and requires brand access", async () => {
const { AdminUploadController } =
await import("../dist/modules/admin/admin-upload.controller.js");
const mediaRoot = await mkdtemp(path.join(os.tmpdir(), "personal-brand-upload-"));
const previousRoot = process.env.LOCAL_MEDIA_ROOT;
const previousBucket = process.env.OBJECT_STORAGE_BUCKET;
const previousAccessKey = process.env.OBJECT_STORAGE_ACCESS_KEY;
const previousSecretKey = process.env.OBJECT_STORAGE_SECRET_KEY;
const access = { requireBrand: async () => ({ brandId: "brand-test" }) };
process.env.LOCAL_MEDIA_ROOT = mediaRoot;
delete process.env.OBJECT_STORAGE_BUCKET;
delete process.env.OBJECT_STORAGE_ACCESS_KEY;
delete process.env.OBJECT_STORAGE_SECRET_KEY;
try {
const controller = new AdminUploadController(access);
const result = await controller.presign(
{},
{ fileName: "portrait.jpg", contentType: "image/jpeg" },
);
assert.match(result.uploadUrl, /^\/api\/admin\/uploads\/local\?key=\d{4}%2F[a-f0-9]{16}\.jpg$/);
assert.equal(result.mode, "local");
} finally {
for (const [name, value] of [
["LOCAL_MEDIA_ROOT", previousRoot],
["OBJECT_STORAGE_BUCKET", previousBucket],
["OBJECT_STORAGE_ACCESS_KEY", previousAccessKey],
["OBJECT_STORAGE_SECRET_KEY", previousSecretKey],
]) {
if (value === undefined) delete process.env[name];
else process.env[name] = value;
}
await rm(mediaRoot, { recursive: true, force: true });
}
});