-import * as validator from 'validator'
-import { UserRole } from '../../../shared'
+import validator from 'validator'
+import { UserRole } from '@shared/models'
+import { isEmailEnabled } from '../../initializers/config'
import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants'
-import { exists, isArray, isBooleanValid, isFileValid } from './misc'
-import { values } from 'lodash'
+import { exists, isArray, isBooleanValid } from './misc'
const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS
return validator.isLength(value, USERS_CONSTRAINTS_FIELDS.PASSWORD)
}
+function isUserPasswordValidOrEmpty (value: string) {
+ // Empty password is only possible if emailing is enabled.
+ if (value === '') return isEmailEnabled()
+
+ return isUserPasswordValid(value)
+}
+
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-z0-9._]{${min},${max}}$`))
+ return exists(value) &&
+ validator.matches(value, new RegExp(`^[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?$`)) &&
+ validator.isLength(value, USERS_CONSTRAINTS_FIELDS.USERNAME)
}
function isUserDisplayNameValid (value: string) {
return isBooleanValid(value)
}
-const nsfwPolicies = values(NSFW_POLICY_TYPES)
+const nsfwPolicies = new Set(Object.values(NSFW_POLICY_TYPES))
function isUserNSFWPolicyValid (value: any) {
- return exists(value) && nsfwPolicies.indexOf(value) !== -1
+ return exists(value) && nsfwPolicies.has(value)
}
-function isUserWebTorrentEnabledValid (value: any) {
+function isUserP2PEnabledValid (value: any) {
return isBooleanValid(value)
}
return isBooleanValid(value)
}
-function isNoInstanceConfigWarningModal (value: any) {
+function isUserAutoPlayNextVideoValid (value: any) {
+ return isBooleanValid(value)
+}
+
+function isUserAutoPlayNextVideoPlaylistValid (value: any) {
return isBooleanValid(value)
}
-function isNoWelcomeModal (value: any) {
+function isUserNoModal (value: any) {
return isBooleanValid(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)
+ return exists(value) && validator.isInt('' + value) && [ UserRole.ADMINISTRATOR, UserRole.MODERATOR, UserRole.USER ].includes(value)
}
// ---------------------------------------------------------------------------
isUserVideosHistoryEnabledValid,
isUserBlockedValid,
isUserPasswordValid,
+ isUserPasswordValidOrEmpty,
isUserVideoLanguages,
isUserBlockedReasonValid,
isUserRoleValid,
isUserAdminFlagsValid,
isUserEmailVerifiedValid,
isUserNSFWPolicyValid,
- isUserWebTorrentEnabledValid,
+ isUserP2PEnabledValid,
isUserAutoPlayVideoValid,
+ isUserAutoPlayNextVideoValid,
+ isUserAutoPlayNextVideoPlaylistValid,
isUserDisplayNameValid,
isUserDescriptionValid,
- isNoInstanceConfigWarningModal,
- isNoWelcomeModal,
- isAvatarFile
+ isUserNoModal
}