refactor API errors to standard error format

1 files changed, 35 insertions, 26 deletions

diff --git a/server/middlewares/validators/videos/video-live.ts b/server/middlewares/validators/videos/video-live.ts
index ec4c7f32f..9544fa4f5 100644
--- a/server/middlewares/validators/videos/video-live.ts
+++ b/server/middlewares/validators/videos/video-live.ts
@@ -30,7 +30,12 @@ const videoLiveGetValidator = [
     if (!checkUserCanManageVideo(user, res.locals.videoAll, UserRight.GET_ANY_LIVE, res, false)) return
 
     const videoLive = await VideoLiveModel.loadByVideoId(res.locals.videoAll.id)
-    if (!videoLive) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+    if (!videoLive) {
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: 'Live video not found'
+      })
+    }
 
     res.locals.videoLive = videoLive
 
@@ -66,22 +71,25 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
     if (CONFIG.LIVE.ENABLED !== true) {
       cleanUpReqFiles(req)
 
-      return res.status(HttpStatusCode.FORBIDDEN_403)
-        .json({ error: 'Live is not enabled on this instance' })
+      return res.fail({
+        status: HttpStatusCode.FORBIDDEN_403,
+        message: 'Live is not enabled on this instance'
+      })
     }
 
     if (CONFIG.LIVE.ALLOW_REPLAY !== true && req.body.saveReplay === true) {
       cleanUpReqFiles(req)
 
-      return res.status(HttpStatusCode.FORBIDDEN_403)
-        .json({ error: 'Saving live replay is not allowed instance' })
+      return res.fail({
+        status: HttpStatusCode.FORBIDDEN_403,
+        message: 'Saving live replay is not allowed instance'
+      })
     }
 
     if (req.body.permanentLive && req.body.saveReplay) {
       cleanUpReqFiles(req)
 
-      return res.status(HttpStatusCode.BAD_REQUEST_400)
-        .json({ error: 'Cannot set this live as permanent while saving its replay' })
+      return res.fail({ message: 'Cannot set this live as permanent while saving its replay' })
     }
 
     const user = res.locals.oauth.token.User
@@ -93,11 +101,11 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
       if (totalInstanceLives >= CONFIG.LIVE.MAX_INSTANCE_LIVES) {
         cleanUpReqFiles(req)
 
-        return res.status(HttpStatusCode.FORBIDDEN_403)
-          .json({
-            code: ServerErrorCode.MAX_INSTANCE_LIVES_LIMIT_REACHED,
-            error: 'Cannot create this live because the max instance lives limit is reached.'
-          })
+        return res.fail({
+          status: HttpStatusCode.FORBIDDEN_403,
+          message: 'Cannot create this live because the max instance lives limit is reached.',
+          type: ServerErrorCode.MAX_INSTANCE_LIVES_LIMIT_REACHED.toString()
+        })
       }
     }
 
@@ -107,11 +115,11 @@ const videoLiveAddValidator = getCommonVideoEditAttributes().concat([
       if (totalUserLives >= CONFIG.LIVE.MAX_USER_LIVES) {
         cleanUpReqFiles(req)
 
-        return res.status(HttpStatusCode.FORBIDDEN_403)
-          .json({
-            code: ServerErrorCode.MAX_USER_LIVES_LIMIT_REACHED,
-            error: 'Cannot create this live because the max user lives limit is reached.'
-          })
+        return res.fail({
+          status: HttpStatusCode.FORBIDDEN_403,
+          type: ServerErrorCode.MAX_USER_LIVES_LIMIT_REACHED.toString(),
+          message: 'Cannot create this live because the max user lives limit is reached.'
+        })
       }
     }
 
@@ -133,18 +141,18 @@ const videoLiveUpdateValidator = [
     if (areValidationErrors(req, res)) return
 
     if (req.body.permanentLive && req.body.saveReplay) {
-      return res.status(HttpStatusCode.BAD_REQUEST_400)
-        .json({ error: 'Cannot set this live as permanent while saving its replay' })
+      return res.fail({ message: 'Cannot set this live as permanent while saving its replay' })
     }
 
     if (CONFIG.LIVE.ALLOW_REPLAY !== true && req.body.saveReplay === true) {
-      return res.status(HttpStatusCode.FORBIDDEN_403)
-        .json({ error: 'Saving live replay is not allowed instance' })
+      return res.fail({
+        status: HttpStatusCode.FORBIDDEN_403,
+        message: 'Saving live replay is not allowed instance'
+      })
     }
 
     if (res.locals.videoAll.state !== VideoState.WAITING_FOR_LIVE) {
-      return res.status(HttpStatusCode.BAD_REQUEST_400)
-        .json({ error: 'Cannot update a live that has already started' })
+      return res.fail({ message: 'Cannot update a live that has already started' })
     }
 
     // Check the user can manage the live
@@ -180,9 +188,10 @@ async function isLiveVideoAccepted (req: express.Request, res: express.Response)
   if (!acceptedResult || acceptedResult.accepted !== true) {
     logger.info('Refused local live video.', { acceptedResult, acceptParameters })
 
-    res.status(HttpStatusCode.FORBIDDEN_403)
-       .json({ error: acceptedResult.errorMessage || 'Refused local live video' })
-
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: acceptedResult.errorMessage || 'Refused local live video'
+    })
     return false
   }