diff --git a/client/src/app/shared/rest/rest-extractor.service.ts b/client/src/app/shared/rest/rest-extractor.service.ts index aafc9723e..b560e2fe4 100644 --- a/client/src/app/shared/rest/rest-extractor.service.ts +++ b/client/src/app/shared/rest/rest-extractor.service.ts @@ -45,8 +45,19 @@ export class RestExtractor { errorMessage = err.error.message console.error('An error occurred:', errorMessage) } else if (err.status !== undefined) { - const body = err.error - errorMessage = body ? body.error : 'Unknown error.' + // A server-side error occurred. + // TODO: remove when angular/angular#19477 (comment) is fixed + let body = JSON.parse(err.error) + if (body) { + if (body.errors) { + const errors = body.errors + const error = errors[Object.keys(errors)[0]] + errorMessage = error.msg // Take the message of the first error + } else if (body.error) { + errorMessage = body.error + } + } + errorMessage = errorMessage ? errorMessage : 'Unknown error.' console.error(`Backend returned code ${err.status}, body was: ${errorMessage}`) } else { errorMessage = err diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts index deed07524..f63348e66 100644 --- a/server/middlewares/validators/videos.ts +++ b/server/middlewares/validators/videos.ts @@ -23,7 +23,10 @@ import { } from '../../helpers' const videosAddValidator = [ - body('videofile').custom((value, { req }) => isVideoFile(req.files)).withMessage('Should have a valid file'), + body('videofile').custom((value, { req }) => isVideoFile(req.files)).withMessage( + 'This file is not supported. Are you sure it is of the following type : ' + + CONSTRAINTS_FIELDS.VIDEOS.EXTNAME + ), body('name').custom(isVideoNameValid).withMessage('Should have a valid name'), body('category').custom(isVideoCategoryValid).withMessage('Should have a valid category'), body('licence').custom(isVideoLicenceValid).withMessage('Should have a valid licence'),