diff options
Diffstat (limited to 'server/helpers/custom-validators')
-rw-r--r-- | server/helpers/custom-validators/users.ts | 4 | ||||
-rw-r--r-- | server/helpers/custom-validators/videos.ts | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts index 7792ffd74..750563ada 100644 --- a/server/helpers/custom-validators/users.ts +++ b/server/helpers/custom-validators/users.ts | |||
@@ -3,6 +3,8 @@ import * as validator from 'validator' | |||
3 | 3 | ||
4 | import { exists } from './misc' | 4 | import { exists } from './misc' |
5 | import { CONSTRAINTS_FIELDS, USER_ROLES } from '../../initializers' | 5 | import { CONSTRAINTS_FIELDS, USER_ROLES } from '../../initializers' |
6 | import { UserRole } from '../../../shared' | ||
7 | |||
6 | const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS | 8 | const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS |
7 | 9 | ||
8 | function isUserPasswordValid (value: string) { | 10 | function isUserPasswordValid (value: string) { |
@@ -10,7 +12,7 @@ function isUserPasswordValid (value: string) { | |||
10 | } | 12 | } |
11 | 13 | ||
12 | function isUserRoleValid (value: string) { | 14 | function isUserRoleValid (value: string) { |
13 | return values(USER_ROLES).indexOf(value) !== -1 | 15 | return values(USER_ROLES).indexOf(value as UserRole) !== -1 |
14 | } | 16 | } |
15 | 17 | ||
16 | function isUserUsernameValid (value: string) { | 18 | function isUserUsernameValid (value: string) { |
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index 8904975c0..72d226e81 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts | |||
@@ -11,6 +11,7 @@ import { | |||
11 | } from '../../initializers' | 11 | } from '../../initializers' |
12 | import { isUserUsernameValid } from './users' | 12 | import { isUserUsernameValid } from './users' |
13 | import { isArray, exists } from './misc' | 13 | import { isArray, exists } from './misc' |
14 | import { VideoRateType } from '../../../shared' | ||
14 | 15 | ||
15 | const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS | 16 | const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS |
16 | const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES | 17 | const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES |
@@ -105,7 +106,7 @@ function isVideoEventCountValid (value: string) { | |||
105 | } | 106 | } |
106 | 107 | ||
107 | function isVideoRatingTypeValid (value: string) { | 108 | function isVideoRatingTypeValid (value: string) { |
108 | return values(VIDEO_RATE_TYPES).indexOf(value) !== -1 | 109 | return values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1 |
109 | } | 110 | } |
110 | 111 | ||
111 | function isVideoFile (value: string, files: { [ fieldname: string ]: Express.Multer.File[] }) { | 112 | function isVideoFile (value: string, files: { [ fieldname: string ]: Express.Multer.File[] }) { |