From 0221f8c9b174c1c95b7348215f0d652bb1899c6b Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 25 Feb 2021 10:01:33 +0100
Subject: [PATCH] Trim video name also on server

---
 .../app/shared/form-validators/video-validators.ts    | 11 +++++------
 server/middlewares/validators/videos/videos.ts        |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/src/app/shared/form-validators/video-validators.ts b/client/src/app/shared/form-validators/video-validators.ts
index 0000f18ba..1382a7747 100644
--- a/client/src/app/shared/form-validators/video-validators.ts
+++ b/client/src/app/shared/form-validators/video-validators.ts
@@ -3,15 +3,14 @@ import { BuildFormValidator } from './form-validator.model'
 
 export const trimValidator: ValidatorFn = (control: FormControl) => {
   if (control.value.startsWith(' ') || control.value.endsWith(' ')) {
-    return {
-      'spaces': true
-    }
+    return { spaces: true }
   }
-  return null;
-};
+
+  return null
+}
 
 export const VIDEO_NAME_VALIDATOR: BuildFormValidator = {
-  VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120), trimValidator ],
+  VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120) ],
   MESSAGES: {
     'required': $localize`Video name is required.`,
     'minlength': $localize`Video name must be at least 3 characters long.`,
diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts
index 26a671a1e..be05b2a69 100644
--- a/server/middlewares/validators/videos/videos.ts
+++ b/server/middlewares/validators/videos/videos.ts
@@ -62,6 +62,7 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([
     .custom((value, { req }) => isFileFieldValid(req.files, 'videofile'))
     .withMessage('Should have a file'),
   body('name')
+    .trim()
     .custom(isVideoNameValid)
     .withMessage('Should have a valid name'),
   body('channelId')
@@ -129,6 +130,7 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([
   param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
   body('name')
     .optional()
+    .trim()
     .custom(isVideoNameValid).withMessage('Should have a valid name'),
   body('channelId')
     .optional()