diff options
Diffstat (limited to 'server/middlewares/validators/videos/video-files.ts')
-rw-r--r-- | server/middlewares/validators/videos/video-files.ts | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/server/middlewares/validators/videos/video-files.ts b/server/middlewares/validators/videos/video-files.ts index 282594ab6..c1fa77502 100644 --- a/server/middlewares/validators/videos/video-files.ts +++ b/server/middlewares/validators/videos/video-files.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import express from 'express' | 1 | import express from 'express' |
2 | import { MUser, MVideo } from '@server/types/models' | 2 | import { MVideo } from '@server/types/models' |
3 | import { HttpStatusCode, UserRight } from '../../../../shared' | 3 | import { HttpStatusCode } from '../../../../shared' |
4 | import { logger } from '../../../helpers/logger' | 4 | import { logger } from '../../../helpers/logger' |
5 | import { areValidationErrors, doesVideoExist, isValidVideoIdParam } from '../shared' | 5 | import { areValidationErrors, doesVideoExist, isValidVideoIdParam } from '../shared' |
6 | 6 | ||
@@ -14,9 +14,7 @@ const videoFilesDeleteWebTorrentValidator = [ | |||
14 | if (!await doesVideoExist(req.params.id, res)) return | 14 | if (!await doesVideoExist(req.params.id, res)) return |
15 | 15 | ||
16 | const video = res.locals.videoAll | 16 | const video = res.locals.videoAll |
17 | const user = res.locals.oauth.token.User | ||
18 | 17 | ||
19 | if (!checkUserCanDeleteFiles(user, res)) return | ||
20 | if (!checkLocalVideo(video, res)) return | 18 | if (!checkLocalVideo(video, res)) return |
21 | 19 | ||
22 | if (!video.hasWebTorrentFiles()) { | 20 | if (!video.hasWebTorrentFiles()) { |
@@ -47,9 +45,7 @@ const videoFilesDeleteHLSValidator = [ | |||
47 | if (!await doesVideoExist(req.params.id, res)) return | 45 | if (!await doesVideoExist(req.params.id, res)) return |
48 | 46 | ||
49 | const video = res.locals.videoAll | 47 | const video = res.locals.videoAll |
50 | const user = res.locals.oauth.token.User | ||
51 | 48 | ||
52 | if (!checkUserCanDeleteFiles(user, res)) return | ||
53 | if (!checkLocalVideo(video, res)) return | 49 | if (!checkLocalVideo(video, res)) return |
54 | 50 | ||
55 | if (!video.getHLSPlaylist()) { | 51 | if (!video.getHLSPlaylist()) { |
@@ -89,16 +85,3 @@ function checkLocalVideo (video: MVideo, res: express.Response) { | |||
89 | 85 | ||
90 | return true | 86 | return true |
91 | } | 87 | } |
92 | |||
93 | function checkUserCanDeleteFiles (user: MUser, res: express.Response) { | ||
94 | if (user.hasRight(UserRight.MANAGE_VIDEO_FILES) !== true) { | ||
95 | res.fail({ | ||
96 | status: HttpStatusCode.FORBIDDEN_403, | ||
97 | message: 'User cannot update video files' | ||
98 | }) | ||
99 | |||
100 | return false | ||
101 | } | ||
102 | |||
103 | return true | ||
104 | } | ||