Fix tests

[github/Chocobozzz/PeerTube.git] / server / controllers / api / users / me.ts

diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts
index 403842163187735629371bf1abd9c2d7a6f2b5b8..2300f5dbe301003290bf64d490d5bb3c83bb9e54 100644 (file)
--- a/server/controllers/api/users/me.ts
+++ b/server/controllers/api/users/me.ts
@@ -12,7 +12,7 @@ import {
   setDefaultPagination,
   setDefaultSort,
   userSubscriptionAddValidator,
-  userSubscriptionRemoveValidator,
+  userSubscriptionGetValidator,
   usersUpdateMeValidator,
   usersVideoRatingValidator
 } from '../../../middlewares'
@@ -97,6 +97,17 @@ meRouter.post('/me/avatar/pick',
 
 // ##### Subscriptions part #####
 
+meRouter.get('/me/subscriptions/videos',
+  authenticate,
+  authenticate,
+  paginationValidator,
+  videosSortValidator,
+  setDefaultSort,
+  setDefaultPagination,
+  commonVideosFiltersValidator,
+  asyncMiddleware(getUserSubscriptionVideos)
+)
+
 meRouter.get('/me/subscriptions',
   authenticate,
   paginationValidator,
@@ -112,21 +123,16 @@ meRouter.post('/me/subscriptions',
   asyncMiddleware(addUserSubscription)
 )
 
-meRouter.delete('/me/subscriptions/:uri',
+meRouter.get('/me/subscriptions/:uri',
   authenticate,
-  userSubscriptionRemoveValidator,
-  asyncMiddleware(deleteUserSubscription)
+  userSubscriptionGetValidator,
+  getUserSubscription
 )
 
-meRouter.get('/me/subscriptions/videos',
-  authenticate,
+meRouter.delete('/me/subscriptions/:uri',
   authenticate,
-  paginationValidator,
-  videosSortValidator,
-  setDefaultSort,
-  setDefaultPagination,
-  commonVideosFiltersValidator,
-  asyncMiddleware(getUserSubscriptionVideos)
+  userSubscriptionGetValidator,
+  asyncMiddleware(deleteUserSubscription)
 )
 
 // ---------------------------------------------------------------------------
@@ -153,6 +159,12 @@ async function addUserSubscription (req: express.Request, res: express.Response)
   return res.status(204).end()
 }
 
+function getUserSubscription (req: express.Request, res: express.Response) {
+  const subscription: ActorFollowModel = res.locals.subscription
+
+  return res.json(subscription.ActorFollowing.VideoChannel.toFormattedJSON())
+}
+
 async function deleteUserSubscription (req: express.Request, res: express.Response) {
   const subscription: ActorFollowModel = res.locals.subscription