aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/activitypub/client.ts10
-rw-r--r--server/controllers/api/server/follows.ts2
-rw-r--r--server/controllers/api/users.ts16
-rw-r--r--server/controllers/api/videos/abuse.ts2
-rw-r--r--server/controllers/api/videos/blacklist.ts4
-rw-r--r--server/controllers/api/videos/channel.ts12
-rw-r--r--server/controllers/api/videos/index.ts8
-rw-r--r--server/controllers/api/videos/rate.ts2
-rw-r--r--server/controllers/services.ts8
-rw-r--r--server/controllers/webfinger.ts3
10 files changed, 36 insertions, 31 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index 41272bca0..62cde1fc7 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -19,22 +19,22 @@ import { VideoShareInstance } from '../../models/video/video-share-interface'
19const activityPubClientRouter = express.Router() 19const activityPubClientRouter = express.Router()
20 20
21activityPubClientRouter.get('/account/:name', 21activityPubClientRouter.get('/account/:name',
22 executeIfActivityPub(localAccountValidator), 22 executeIfActivityPub(asyncMiddleware(localAccountValidator)),
23 executeIfActivityPub(accountController) 23 executeIfActivityPub(accountController)
24) 24)
25 25
26activityPubClientRouter.get('/account/:name/followers', 26activityPubClientRouter.get('/account/:name/followers',
27 executeIfActivityPub(localAccountValidator), 27 executeIfActivityPub(asyncMiddleware(localAccountValidator)),
28 executeIfActivityPub(asyncMiddleware(accountFollowersController)) 28 executeIfActivityPub(asyncMiddleware(accountFollowersController))
29) 29)
30 30
31activityPubClientRouter.get('/account/:name/following', 31activityPubClientRouter.get('/account/:name/following',
32 executeIfActivityPub(localAccountValidator), 32 executeIfActivityPub(asyncMiddleware(localAccountValidator)),
33 executeIfActivityPub(asyncMiddleware(accountFollowingController)) 33 executeIfActivityPub(asyncMiddleware(accountFollowingController))
34) 34)
35 35
36activityPubClientRouter.get('/videos/watch/:id', 36activityPubClientRouter.get('/videos/watch/:id',
37 executeIfActivityPub(videosGetValidator), 37 executeIfActivityPub(asyncMiddleware(videosGetValidator)),
38 executeIfActivityPub(videoController) 38 executeIfActivityPub(videoController)
39) 39)
40 40
@@ -44,7 +44,7 @@ activityPubClientRouter.get('/videos/watch/:id/announces/:accountId',
44) 44)
45 45
46activityPubClientRouter.get('/video-channels/:id', 46activityPubClientRouter.get('/video-channels/:id',
47 executeIfActivityPub(videoChannelsGetValidator), 47 executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)),
48 executeIfActivityPub(asyncMiddleware(videoChannelController)) 48 executeIfActivityPub(asyncMiddleware(videoChannelController))
49) 49)
50 50
diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index 535d530f7..c2fb37c39 100644
--- a/server/controllers/api/server/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -41,7 +41,7 @@ serverFollowsRouter.post('/following',
41serverFollowsRouter.delete('/following/:accountId', 41serverFollowsRouter.delete('/following/:accountId',
42 authenticate, 42 authenticate,
43 ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW), 43 ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW),
44 removeFollowingValidator, 44 asyncMiddleware(removeFollowingValidator),
45 asyncMiddleware(removeFollow) 45 asyncMiddleware(removeFollow)
46) 46)
47 47
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index ac7c87517..721b23301 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -43,7 +43,7 @@ usersRouter.get('/me/videos',
43 43
44usersRouter.get('/me/videos/:videoId/rating', 44usersRouter.get('/me/videos/:videoId/rating',
45 authenticate, 45 authenticate,
46 usersVideoRatingValidator, 46 asyncMiddleware(usersVideoRatingValidator),
47 asyncMiddleware(getUserVideoRating) 47 asyncMiddleware(getUserVideoRating)
48) 48)
49 49
@@ -56,20 +56,20 @@ usersRouter.get('/',
56) 56)
57 57
58usersRouter.get('/:id', 58usersRouter.get('/:id',
59 usersGetValidator, 59 asyncMiddleware(usersGetValidator),
60 getUser 60 getUser
61) 61)
62 62
63usersRouter.post('/', 63usersRouter.post('/',
64 authenticate, 64 authenticate,
65 ensureUserHasRight(UserRight.MANAGE_USERS), 65 ensureUserHasRight(UserRight.MANAGE_USERS),
66 usersAddValidator, 66 asyncMiddleware(usersAddValidator),
67 createUserRetryWrapper 67 asyncMiddleware(createUserRetryWrapper)
68) 68)
69 69
70usersRouter.post('/register', 70usersRouter.post('/register',
71 ensureUserRegistrationAllowed, 71 asyncMiddleware(ensureUserRegistrationAllowed),
72 usersRegisterValidator, 72 asyncMiddleware(usersRegisterValidator),
73 asyncMiddleware(registerUserRetryWrapper) 73 asyncMiddleware(registerUserRetryWrapper)
74) 74)
75 75
@@ -82,14 +82,14 @@ usersRouter.put('/me',
82usersRouter.put('/:id', 82usersRouter.put('/:id',
83 authenticate, 83 authenticate,
84 ensureUserHasRight(UserRight.MANAGE_USERS), 84 ensureUserHasRight(UserRight.MANAGE_USERS),
85 usersUpdateValidator, 85 asyncMiddleware(usersUpdateValidator),
86 asyncMiddleware(updateUser) 86 asyncMiddleware(updateUser)
87) 87)
88 88
89usersRouter.delete('/:id', 89usersRouter.delete('/:id',
90 authenticate, 90 authenticate,
91 ensureUserHasRight(UserRight.MANAGE_USERS), 91 ensureUserHasRight(UserRight.MANAGE_USERS),
92 usersRemoveValidator, 92 asyncMiddleware(usersRemoveValidator),
93 asyncMiddleware(removeUser) 93 asyncMiddleware(removeUser)
94) 94)
95 95
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index 88b3d538d..29e1175c5 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -33,7 +33,7 @@ abuseVideoRouter.get('/abuse',
33) 33)
34abuseVideoRouter.post('/:id/abuse', 34abuseVideoRouter.post('/:id/abuse',
35 authenticate, 35 authenticate,
36 videoAbuseReportValidator, 36 asyncMiddleware(videoAbuseReportValidator),
37 asyncMiddleware(reportVideoAbuseRetryWrapper) 37 asyncMiddleware(reportVideoAbuseRetryWrapper)
38) 38)
39 39
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index be7cf6ea4..06333c271 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -21,7 +21,7 @@ const blacklistRouter = express.Router()
21blacklistRouter.post('/:videoId/blacklist', 21blacklistRouter.post('/:videoId/blacklist',
22 authenticate, 22 authenticate,
23 ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), 23 ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
24 videosBlacklistAddValidator, 24 asyncMiddleware(videosBlacklistAddValidator),
25 asyncMiddleware(addVideoToBlacklist) 25 asyncMiddleware(addVideoToBlacklist)
26) 26)
27 27
@@ -38,7 +38,7 @@ blacklistRouter.get('/blacklist',
38blacklistRouter.delete('/:videoId/blacklist', 38blacklistRouter.delete('/:videoId/blacklist',
39 authenticate, 39 authenticate,
40 ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), 40 ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST),
41 videosBlacklistRemoveValidator, 41 asyncMiddleware(videosBlacklistRemoveValidator),
42 asyncMiddleware(removeVideoFromBlacklistController) 42 asyncMiddleware(removeVideoFromBlacklistController)
43) 43)
44 44
diff --git a/server/controllers/api/videos/channel.ts b/server/controllers/api/videos/channel.ts
index ce2656e71..d99f47c32 100644
--- a/server/controllers/api/videos/channel.ts
+++ b/server/controllers/api/videos/channel.ts
@@ -3,6 +3,7 @@ import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared'
3import { getFormattedObjects, logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers' 3import { getFormattedObjects, logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers'
4import { database as db } from '../../../initializers' 4import { database as db } from '../../../initializers'
5import { createVideoChannel } from '../../../lib' 5import { createVideoChannel } from '../../../lib'
6import { sendUpdateVideoChannel } from '../../../lib/activitypub/send/send-update'
6import { 7import {
7 asyncMiddleware, 8 asyncMiddleware,
8 authenticate, 9 authenticate,
@@ -10,14 +11,13 @@ import {
10 paginationValidator, 11 paginationValidator,
11 setPagination, 12 setPagination,
12 setVideoChannelsSort, 13 setVideoChannelsSort,
13 videoChannelsGetValidator,
14 videoChannelsAddValidator, 14 videoChannelsAddValidator,
15 videoChannelsGetValidator,
15 videoChannelsRemoveValidator, 16 videoChannelsRemoveValidator,
16 videoChannelsSortValidator, 17 videoChannelsSortValidator,
17 videoChannelsUpdateValidator 18 videoChannelsUpdateValidator
18} from '../../../middlewares' 19} from '../../../middlewares'
19import { AccountInstance, VideoChannelInstance } from '../../../models' 20import { AccountInstance, VideoChannelInstance } from '../../../models'
20import { sendUpdateVideoChannel } from '../../../lib/activitypub/send/send-update'
21 21
22const videoChannelRouter = express.Router() 22const videoChannelRouter = express.Router()
23 23
@@ -30,7 +30,7 @@ videoChannelRouter.get('/channels',
30) 30)
31 31
32videoChannelRouter.get('/accounts/:accountId/channels', 32videoChannelRouter.get('/accounts/:accountId/channels',
33 listVideoAccountChannelsValidator, 33 asyncMiddleware(listVideoAccountChannelsValidator),
34 asyncMiddleware(listVideoAccountChannels) 34 asyncMiddleware(listVideoAccountChannels)
35) 35)
36 36
@@ -42,18 +42,18 @@ videoChannelRouter.post('/channels',
42 42
43videoChannelRouter.put('/channels/:id', 43videoChannelRouter.put('/channels/:id',
44 authenticate, 44 authenticate,
45 videoChannelsUpdateValidator, 45 asyncMiddleware(videoChannelsUpdateValidator),
46 updateVideoChannelRetryWrapper 46 updateVideoChannelRetryWrapper
47) 47)
48 48
49videoChannelRouter.delete('/channels/:id', 49videoChannelRouter.delete('/channels/:id',
50 authenticate, 50 authenticate,
51 videoChannelsRemoveValidator, 51 asyncMiddleware(videoChannelsRemoveValidator),
52 asyncMiddleware(removeVideoChannelRetryWrapper) 52 asyncMiddleware(removeVideoChannelRetryWrapper)
53) 53)
54 54
55videoChannelRouter.get('/channels/:id', 55videoChannelRouter.get('/channels/:id',
56 videoChannelsGetValidator, 56 asyncMiddleware(videoChannelsGetValidator),
57 asyncMiddleware(getVideoChannel) 57 asyncMiddleware(getVideoChannel)
58) 58)
59 59
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 2b5afd632..244d91914 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -86,7 +86,7 @@ videosRouter.get('/',
86) 86)
87videosRouter.put('/:id', 87videosRouter.put('/:id',
88 authenticate, 88 authenticate,
89 videosUpdateValidator, 89 asyncMiddleware(videosUpdateValidator),
90 asyncMiddleware(updateVideoRetryWrapper) 90 asyncMiddleware(updateVideoRetryWrapper)
91) 91)
92videosRouter.post('/upload', 92videosRouter.post('/upload',
@@ -97,17 +97,17 @@ videosRouter.post('/upload',
97) 97)
98 98
99videosRouter.get('/:id/description', 99videosRouter.get('/:id/description',
100 videosGetValidator, 100 asyncMiddleware(videosGetValidator),
101 asyncMiddleware(getVideoDescription) 101 asyncMiddleware(getVideoDescription)
102) 102)
103videosRouter.get('/:id', 103videosRouter.get('/:id',
104 videosGetValidator, 104 asyncMiddleware(videosGetValidator),
105 getVideo 105 getVideo
106) 106)
107 107
108videosRouter.delete('/:id', 108videosRouter.delete('/:id',
109 authenticate, 109 authenticate,
110 videosRemoveValidator, 110 asyncMiddleware(videosRemoveValidator),
111 asyncMiddleware(removeVideoRetryWrapper) 111 asyncMiddleware(removeVideoRetryWrapper)
112) 112)
113 113
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index 134284df7..0c6a988cf 100644
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -12,7 +12,7 @@ const rateVideoRouter = express.Router()
12 12
13rateVideoRouter.put('/:id/rate', 13rateVideoRouter.put('/:id/rate',
14 authenticate, 14 authenticate,
15 videoRateValidator, 15 asyncMiddleware(videoRateValidator),
16 asyncMiddleware(rateVideoRetryWrapper) 16 asyncMiddleware(rateVideoRetryWrapper)
17) 17)
18 18
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 0db6e5498..0c325678c 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,12 +1,16 @@
1import * as express from 'express' 1import * as express from 'express'
2 2
3import { CONFIG, PREVIEWS_SIZE, EMBED_SIZE } from '../initializers' 3import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
4import { oembedValidator } from '../middlewares' 4import { oembedValidator } from '../middlewares'
5import { asyncMiddleware } from '../middlewares/async'
5import { VideoInstance } from '../models' 6import { VideoInstance } from '../models'
6 7
7const servicesRouter = express.Router() 8const servicesRouter = express.Router()
8 9
9servicesRouter.use('/oembed', oembedValidator, generateOEmbed) 10servicesRouter.use('/oembed',
11 asyncMiddleware(oembedValidator),
12 generateOEmbed
13)
10 14
11// --------------------------------------------------------------------------- 15// ---------------------------------------------------------------------------
12 16
diff --git a/server/controllers/webfinger.ts b/server/controllers/webfinger.ts
index cc28a8909..1cea513a1 100644
--- a/server/controllers/webfinger.ts
+++ b/server/controllers/webfinger.ts
@@ -1,11 +1,12 @@
1import * as express from 'express' 1import * as express from 'express'
2import { asyncMiddleware } from '../middlewares/async'
2import { webfingerValidator } from '../middlewares/validators/webfinger' 3import { webfingerValidator } from '../middlewares/validators/webfinger'
3import { AccountInstance } from '../models/account/account-interface' 4import { AccountInstance } from '../models/account/account-interface'
4 5
5const webfingerRouter = express.Router() 6const webfingerRouter = express.Router()
6 7
7webfingerRouter.get('/.well-known/webfinger', 8webfingerRouter.get('/.well-known/webfinger',
8 webfingerValidator, 9 asyncMiddleware(webfingerValidator),
9 webfingerController 10 webfingerController
10) 11)
11 12