refactor API errors to standard error format

1 files changed, 22 insertions, 5 deletions

diff --git a/server/controllers/download.ts b/server/controllers/download.ts
index 9a8194c5c..4293a32e2 100644
--- a/server/controllers/download.ts
+++ b/server/controllers/download.ts
@@ -41,7 +41,12 @@ export {
 
 async function downloadTorrent (req: express.Request, res: express.Response) {
   const result = await VideosTorrentCache.Instance.getFilePath(req.params.filename)
-  if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+  if (!result) {
+    return res.fail({
+      status: HttpStatusCode.NOT_FOUND_404,
+      message: 'Torrent file not found'
+    })
+  }
 
   const allowParameters = { torrentPath: result.path, downloadName: result.downloadName }
 
@@ -60,7 +65,12 @@ async function downloadVideoFile (req: express.Request, res: express.Response) {
   const video = res.locals.videoAll
 
   const videoFile = getVideoFile(req, video.VideoFiles)
-  if (!videoFile) return res.status(HttpStatusCode.NOT_FOUND_404).end()
+  if (!videoFile) {
+    return res.fail({
+      status: HttpStatusCode.NOT_FOUND_404,
+      message: 'Video file not found'
+    })
+  }
 
   const allowParameters = { video, videoFile }
 
@@ -81,7 +91,12 @@ async function downloadHLSVideoFile (req: express.Request, res: express.Response
   if (!streamingPlaylist) return res.status(HttpStatusCode.NOT_FOUND_404).end
 
   const videoFile = getVideoFile(req, streamingPlaylist.VideoFiles)
-  if (!videoFile) return res.status(HttpStatusCode.NOT_FOUND_404).end()
+  if (!videoFile) {
+    return res.fail({
+      status: HttpStatusCode.NOT_FOUND_404,
+      message: 'Video file not found'
+    })
+  }
 
   const allowParameters = { video, streamingPlaylist, videoFile }
 
@@ -131,9 +146,11 @@ function isVideoDownloadAllowed (_object: {
 function checkAllowResult (res: express.Response, allowParameters: any, result?: AllowedResult) {
   if (!result || result.allowed !== true) {
     logger.info('Download is not allowed.', { result, allowParameters })
-    res.status(HttpStatusCode.FORBIDDEN_403)
-       .json({ error: result?.errorMessage || 'Refused download' })
 
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: result?.errorMessage || 'Refused download'
+    })
     return false
   }