mirror of
https://github.com/detleph/server.git
synced 2026-09-04 08:36:06 +02:00
Fix 404 error messages for HEAD and GET media
+ Add unnecessary console.error when successfully uploading media
This commit is contained in:
@@ -11,6 +11,7 @@ import { generateInvalidBodyError, DataType } from "./common";
|
|||||||
import { unlink } from "fs/promises";
|
import { unlink } from "fs/promises";
|
||||||
import ForwardableError from "../Middleware/error/ForwardableError";
|
import ForwardableError from "../Middleware/error/ForwardableError";
|
||||||
import { table } from "console";
|
import { table } from "console";
|
||||||
|
import logger from "../Middleware/error/logger";
|
||||||
|
|
||||||
require("express-async-errors");
|
require("express-async-errors");
|
||||||
|
|
||||||
@@ -110,7 +111,11 @@ export const uploadImage = async (req: Request, res: Response) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!fs.existsSync("media/" + fileName)) {
|
if (!fs.existsSync("media/" + fileName)) {
|
||||||
file.mv("media/" + fileName, console.error);
|
file.mv("media/" + fileName, (err) => {
|
||||||
|
if (err) {
|
||||||
|
logger.error(err);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return res.status(201).json({
|
return res.status(201).json({
|
||||||
@@ -188,6 +193,10 @@ export const deleteMedia = async (req: Request, res: Response) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const mediaNotFoundHandler = (req: Request<{ pid: string }>, res: Response) => {
|
||||||
|
throw new NotFoundError("media", req.params.pid);
|
||||||
|
};
|
||||||
|
|
||||||
export const linkMedia = async (req: Request<{ pid: string }, {}, { mediaPid: string }>, res: Response) => {
|
export const linkMedia = async (req: Request<{ pid: string }, {}, { mediaPid: string }>, res: Response) => {
|
||||||
if (req.auth?.permission_level != "ELEVATED") {
|
if (req.auth?.permission_level != "ELEVATED") {
|
||||||
res.status(403).json(createInsufficientPermissionsError());
|
res.status(403).json(createInsufficientPermissionsError());
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
getAllMedia,
|
getAllMedia,
|
||||||
getMediaMeta,
|
getMediaMeta,
|
||||||
linkMedia,
|
linkMedia,
|
||||||
|
mediaNotFoundHandler,
|
||||||
unlinkMedia,
|
unlinkMedia,
|
||||||
uploadImage,
|
uploadImage,
|
||||||
} from "../Controllers/media.controller";
|
} from "../Controllers/media.controller";
|
||||||
@@ -26,6 +27,9 @@ router.get("/:pid/meta", getMediaMeta);
|
|||||||
|
|
||||||
router.delete("/:pid", requireAuthentication, deleteMedia);
|
router.delete("/:pid", requireAuthentication, deleteMedia);
|
||||||
|
|
||||||
|
router.get("/:pid", mediaNotFoundHandler);
|
||||||
|
router.head("/:pid", mediaNotFoundHandler);
|
||||||
|
|
||||||
eventRouter.post<"/:pid/media", { pid: string }>("/:pid/media", requireAuthentication, linkMedia);
|
eventRouter.post<"/:pid/media", { pid: string }>("/:pid/media", requireAuthentication, linkMedia);
|
||||||
|
|
||||||
eventRouter.delete<"/:pid/media/:mediaPid", { pid: string; mediaPid: string }>(
|
eventRouter.delete<"/:pid/media/:mediaPid", { pid: string; mediaPid: string }>(
|
||||||
|
|||||||
Reference in New Issue
Block a user