X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fusers.ts;h=ce1323e947189b4f03c997afaf2e2bebed47bbe9;hb=cf7a61b5a2b68fd966c4a355e37e84b048ed296b;hp=7792ffd74eb82865f65dede8f37a36a6373b5dc7;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts
index 7792ffd74..ce1323e94 100644
--- a/server/helpers/custom-validators/users.ts
+++ b/server/helpers/custom-validators/users.ts
@@ -1,44 +1,69 @@
-import { values } from 'lodash'
+import 'express-validator'
 import * as validator from 'validator'
+import { UserRole } from '../../../shared'
+import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers'
+import { exists, isFileValid } from './misc'
+import { values } from 'lodash'
 
-import { exists } from './misc'
-import { CONSTRAINTS_FIELDS, USER_ROLES } from '../../initializers'
 const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS
 
 function isUserPasswordValid (value: string) {
   return validator.isLength(value, USERS_CONSTRAINTS_FIELDS.PASSWORD)
 }
 
-function isUserRoleValid (value: string) {
-  return values(USER_ROLES).indexOf(value) !== -1
+function isUserVideoQuotaValid (value: string) {
+  return exists(value) && validator.isInt(value + '', USERS_CONSTRAINTS_FIELDS.VIDEO_QUOTA)
 }
 
 function isUserUsernameValid (value: string) {
   const max = USERS_CONSTRAINTS_FIELDS.USERNAME.max
   const min = USERS_CONSTRAINTS_FIELDS.USERNAME.min
-  return exists(value) && validator.matches(value, new RegExp(`^[a-zA-Z0-9._]{${min},${max}}$`))
+  return exists(value) && validator.matches(value, new RegExp(`^[a-z0-9._]{${min},${max}}$`))
+}
+
+function isUserDisplayNameValid (value: string) {
+  return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.NAME))
 }
 
-function isUserDisplayNSFWValid (value: any) {
+function isUserDescriptionValid (value: string) {
+  return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.DESCRIPTION))
+}
+
+function isBoolean (value: any) {
   return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value))
 }
 
+const nsfwPolicies = values(NSFW_POLICY_TYPES)
+function isUserNSFWPolicyValid (value: any) {
+  return exists(value) && nsfwPolicies.indexOf(value) !== -1
+}
+
+function isUserAutoPlayVideoValid (value: any) {
+  return isBoolean(value)
+}
+
+function isUserRoleValid (value: any) {
+  return exists(value) && validator.isInt('' + value) && UserRole[value] !== undefined
+}
+
+const avatarMimeTypes = CONSTRAINTS_FIELDS.ACTORS.AVATAR.EXTNAME
+  .map(v => v.replace('.', ''))
+  .join('|')
+const avatarMimeTypesRegex = `image/(${avatarMimeTypes})`
+function isAvatarFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
+  return isFileValid(files, avatarMimeTypesRegex, 'avatarfile', CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max)
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   isUserPasswordValid,
   isUserRoleValid,
+  isUserVideoQuotaValid,
   isUserUsernameValid,
-  isUserDisplayNSFWValid
-}
-
-declare global {
-  namespace ExpressValidator {
-    export interface Validator {
-      isUserPasswordValid,
-      isUserRoleValid,
-      isUserUsernameValid,
-      isUserDisplayNSFWValid
-    }
-  }
+  isUserNSFWPolicyValid,
+  isUserAutoPlayVideoValid,
+  isUserDisplayNameValid,
+  isUserDescriptionValid,
+  isAvatarFile
 }