4 files changed, 121 insertions, 51 deletions

diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index 43c5462ee..acb6bdd57 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -4,15 +4,29 @@ import * as chai from 'chai'
 import { omit } from 'lodash'
 import 'mocha'
 import {
-  createUser, deleteVideoChannel, flushTests, getAccountVideoChannelsList, getVideoChannelsList, immutableAssign, killallServers,
-  makeGetRequest, makePostBodyRequest, makePutBodyRequest, runServer, ServerInfo, setAccessTokensToServers, userLogin
+  createUser,
+  deleteVideoChannel,
+  flushTests,
+  getAccountVideoChannelsList,
+  getVideoChannelsList,
+  immutableAssign,
+  killallServers,
+  makeGetRequest,
+  makePostBodyRequest,
+  makePutBodyRequest,
+  runServer,
+  ServerInfo,
+  setAccessTokensToServers,
+  userLogin
 } from '../../utils'
 import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
+import { getAccountsList } from '../../utils/users/accounts'
 
 const expect = chai.expect
 
 describe('Test videos API validator', function () {
-  const path = '/api/v1/videos/channels'
+  const videoChannelPath = '/api/v1/video-channels'
+  const accountPath = '/api/v1/accounts/'
   let server: ServerInfo
   let accessTokenUser: string
 
@@ -37,15 +51,15 @@ describe('Test videos API validator', function () {
 
   describe('When listing a video channels', function () {
     it('Should fail with a bad start pagination', async function () {
-      await checkBadStartPagination(server.url, path, server.accessToken)
+      await checkBadStartPagination(server.url, videoChannelPath, server.accessToken)
     })
 
     it('Should fail with a bad count pagination', async function () {
-      await checkBadCountPagination(server.url, path, server.accessToken)
+      await checkBadCountPagination(server.url, videoChannelPath, server.accessToken)
     })
 
     it('Should fail with an incorrect sort', async function () {
-      await checkBadSortPagination(server.url, path, server.accessToken)
+      await checkBadSortPagination(server.url, videoChannelPath, server.accessToken)
     })
   })
 
@@ -60,12 +74,20 @@ describe('Test videos API validator', function () {
   })
 
   describe('When adding a video channel', function () {
+    let path: string
+
     const baseCorrectParams = {
       name: 'hello',
       description: 'super description',
       support: 'super support text'
     }
 
+    before(async function () {
+      const res = await getAccountsList(server.url)
+      const accountId = res.body.data[0].id
+      path = accountPath + accountId + '/video-channels'
+    })
+
     it('Should fail with a non authenticated user', async function () {
       await makePostBodyRequest({ url: server.url, path, token: 'none', fields: baseCorrectParams, statusCodeExpected: 401 })
     })
@@ -107,22 +129,27 @@ describe('Test videos API validator', function () {
   })
 
   describe('When updating a video channel', function () {
+    let path: string
+
     const baseCorrectParams = {
       name: 'hello',
       description: 'super description'
     }
 
-    let videoChannelId
-
     before(async function () {
-      const res = await getVideoChannelsList(server.url, 0, 1)
-      videoChannelId = res.body.data[0].id
+      const res1 = await getVideoChannelsList(server.url, 0, 1)
+      const videoChannelId = res1.body.data[0].id
+
+      const res2 = await getAccountsList(server.url)
+      const accountId = res2.body.data[0].id
+
+      path = accountPath + accountId + '/video-channels/' + videoChannelId
     })
 
     it('Should fail with a non authenticated user', async function () {
       await makePutBodyRequest({
         url: server.url,
-        path: path + '/' + videoChannelId,
+        path,
         token: 'hi',
         fields: baseCorrectParams,
         statusCodeExpected: 401
@@ -132,7 +159,7 @@ describe('Test videos API validator', function () {
     it('Should fail with another authenticated user', async function () {
       await makePutBodyRequest({
         url: server.url,
-        path: path + '/' + videoChannelId,
+        path,
         token: accessTokenUser,
         fields: baseCorrectParams,
         statusCodeExpected: 403
@@ -141,23 +168,23 @@ describe('Test videos API validator', function () {
 
     it('Should fail with a long name', async function () {
       const fields = immutableAssign(baseCorrectParams, { name: 'super'.repeat(25) })
-      await makePutBodyRequest({ url: server.url, path: path + '/' + videoChannelId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
     it('Should fail with a long description', async function () {
       const fields = immutableAssign(baseCorrectParams, { description: 'super'.repeat(60) })
-      await makePutBodyRequest({ url: server.url, path: path + '/' + videoChannelId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
     it('Should fail with a long support text', async function () {
       const fields = immutableAssign(baseCorrectParams, { support: 'super'.repeat(70) })
-      await makePutBodyRequest({ url: server.url, path: path + '/' + videoChannelId, token: server.accessToken, fields })
+      await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
     it('Should succeed with the correct parameters', async function () {
       await makePutBodyRequest({
         url: server.url,
-        path: path + '/' + videoChannelId,
+        path,
         token: server.accessToken,
         fields: baseCorrectParams,
         statusCodeExpected: 204
@@ -166,17 +193,23 @@ describe('Test videos API validator', function () {
   })
 
   describe('When getting a video channel', function () {
+    let basePath: string
     let videoChannelId: number
 
     before(async function () {
-      const res = await getVideoChannelsList(server.url, 0, 1)
-      videoChannelId = res.body.data[0].id
+      const res1 = await getVideoChannelsList(server.url, 0, 1)
+      videoChannelId = res1.body.data[0].id
+
+      const res2 = await getAccountsList(server.url)
+      const accountId = res2.body.data[0].id
+
+      basePath = accountPath + accountId + '/video-channels'
     })
 
     it('Should return the list of the video channels with nothing', async function () {
       const res = await makeGetRequest({
         url: server.url,
-        path,
+        path: basePath,
         statusCodeExpected: 200
       })
 
@@ -186,7 +219,7 @@ describe('Test videos API validator', function () {
     it('Should fail without a correct uuid', async function () {
       await makeGetRequest({
         url: server.url,
-        path: path + '/coucou',
+        path: basePath + '/coucou',
         statusCodeExpected: 400
       })
     })
@@ -194,7 +227,7 @@ describe('Test videos API validator', function () {
     it('Should return 404 with an incorrect video channel', async function () {
       await makeGetRequest({
         url: server.url,
-        path: path + '/4da6fde3-88f7-4d16-b119-108df5630b06',
+        path: basePath + '/4da6fde3-88f7-4d16-b119-108df5630b06',
         statusCodeExpected: 404
       })
     })
@@ -202,7 +235,7 @@ describe('Test videos API validator', function () {
     it('Should succeed with the correct parameters', async function () {
       await makeGetRequest({
         url: server.url,
-        path: path + '/' + videoChannelId,
+        path: basePath + '/' + videoChannelId,
         statusCodeExpected: 200
       })
     })
@@ -210,33 +243,41 @@ describe('Test videos API validator', function () {
 
   describe('When deleting a video channel', function () {
     let videoChannelId: number
+    let accountId: number
 
     before(async function () {
-      const res = await getVideoChannelsList(server.url, 0, 1)
-      videoChannelId = res.body.data[0].id
+      const res1 = await getVideoChannelsList(server.url, 0, 1)
+      videoChannelId = res1.body.data[0].id
+
+      const res2 = await getAccountsList(server.url)
+      accountId = res2.body.data[0].id
     })
 
     it('Should fail with a non authenticated user', async function () {
-      await deleteVideoChannel(server.url, 'coucou', videoChannelId, 401)
+      await deleteVideoChannel(server.url, 'coucou', accountId, videoChannelId, 401)
     })
 
     it('Should fail with another authenticated user', async function () {
-      await deleteVideoChannel(server.url, accessTokenUser, videoChannelId, 403)
+      await deleteVideoChannel(server.url, accessTokenUser, accountId, videoChannelId, 403)
+    })
+
+    it('Should fail with an unknown account id', async function () {
+      await deleteVideoChannel(server.url, server.accessToken, 454554,videoChannelId, 404)
     })
 
-    it('Should fail with an unknown id', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, 454554, 404)
+    it('Should fail with an unknown video channel id', async function () {
+      await deleteVideoChannel(server.url, server.accessToken, accountId,454554, 404)
     })
 
     it('Should succeed with the correct parameters', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, videoChannelId)
+      await deleteVideoChannel(server.url, server.accessToken, accountId, videoChannelId)
     })
 
     it('Should fail to delete the last user video channel', async function () {
       const res = await getVideoChannelsList(server.url, 0, 1)
       videoChannelId = res.body.data[0].id
 
-      await deleteVideoChannel(server.url, server.accessToken, videoChannelId, 409)
+      await deleteVideoChannel(server.url, server.accessToken, accountId, videoChannelId, 409)
     })
   })
 
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 2563939ec..6238cdc08 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -39,6 +39,7 @@ import {
   getVideoCommentThreads,
   getVideoThreadComments
 } from '../../utils/videos/video-comments'
+import { getAccountsList } from '../../utils/users/accounts'
 
 const expect = chai.expect
 
@@ -46,6 +47,7 @@ describe('Test multiple servers', function () {
   let servers: ServerInfo[] = []
   const toRemove = []
   let videoUUID = ''
+  let accountId: number
   let videoChannelId: number
 
   before(async function () {
@@ -56,13 +58,20 @@ describe('Test multiple servers', function () {
     // Get the access tokens
     await setAccessTokensToServers(servers)
 
-    const videoChannel = {
-      name: 'my channel',
-      description: 'super channel'
+    {
+      const res = await getAccountsList(servers[0].url)
+      accountId = res.body.data[0].id
+    }
+
+    {
+      const videoChannel = {
+        name: 'my channel',
+        description: 'super channel'
+      }
+      await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, accountId, videoChannel)
+      const channelRes = await getVideoChannelsList(servers[ 0 ].url, 0, 1)
+      videoChannelId = channelRes.body.data[ 0 ].id
     }
-    await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
-    const channelRes = await getVideoChannelsList(servers[0].url, 0, 1)
-    videoChannelId = channelRes.body.data[0].id
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index b9c9bbf3c..a7552a83a 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -17,12 +17,14 @@ import {
   setAccessTokensToServers,
   updateVideoChannel
 } from '../../utils/index'
+import { getAccountsList } from '../../utils/users/accounts'
 
 const expect = chai.expect
 
 describe('Test video channels', function () {
   let servers: ServerInfo[]
   let userInfo: User
+  let accountId: number
   let videoChannelId: number
 
   before(async function () {
@@ -35,6 +37,11 @@ describe('Test video channels', function () {
     await setAccessTokensToServers(servers)
     await doubleFollow(servers[0], servers[1])
 
+    {
+      const res = await getAccountsList(servers[0].url)
+      accountId = res.body.data[0].id
+    }
+
     await wait(5000)
   })
 
@@ -54,7 +61,7 @@ describe('Test video channels', function () {
       description: 'super video channel description',
       support: 'super video channel support text'
     }
-    const res = await addVideoChannel(servers[0].url, servers[0].accessToken, videoChannel)
+    const res = await addVideoChannel(servers[0].url, servers[0].accessToken, accountId, videoChannel)
     videoChannelId = res.body.videoChannel.id
 
     // The channel is 1 is propagated to servers 2
@@ -120,7 +127,7 @@ describe('Test video channels', function () {
       support: 'video channel support text updated'
     }
 
-    await updateVideoChannel(servers[0].url, servers[0].accessToken, videoChannelId, videoChannelAttributes)
+    await updateVideoChannel(servers[0].url, servers[0].accessToken, accountId, videoChannelId, videoChannelAttributes)
 
     await wait(3000)
   })
@@ -139,7 +146,7 @@ describe('Test video channels', function () {
   })
 
   it('Should get video channel', async function () {
-    const res = await getVideoChannel(servers[0].url, videoChannelId)
+    const res = await getVideoChannel(servers[0].url, accountId, videoChannelId)
 
     const videoChannel = res.body
     expect(videoChannel.displayName).to.equal('video channel updated')
@@ -148,7 +155,7 @@ describe('Test video channels', function () {
   })
 
   it('Should delete video channel', async function () {
-    await deleteVideoChannel(servers[0].url, servers[0].accessToken, videoChannelId)
+    await deleteVideoChannel(servers[0].url, servers[0].accessToken, accountId, videoChannelId)
   })
 
   it('Should have video channel deleted', async function () {
diff --git a/server/tests/utils/videos/video-channels.ts b/server/tests/utils/videos/video-channels.ts
index 2d095d8ab..cfc541431 100644
--- a/server/tests/utils/videos/video-channels.ts
+++ b/server/tests/utils/videos/video-channels.ts
@@ -7,7 +7,7 @@ type VideoChannelAttributes = {
 }
 
 function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
-  const path = '/api/v1/videos/channels'
+  const path = '/api/v1/video-channels'
 
   const req = request(url)
     .get(path)
@@ -22,7 +22,7 @@ function getVideoChannelsList (url: string, start: number, count: number, sort?:
 }
 
 function getAccountVideoChannelsList (url: string, accountId: number | string, specialStatus = 200) {
-  const path = '/api/v1/videos/accounts/' + accountId + '/channels'
+  const path = '/api/v1/accounts/' + accountId + '/video-channels'
 
   return request(url)
     .get(path)
@@ -31,8 +31,14 @@ function getAccountVideoChannelsList (url: string, accountId: number | string, s
     .expect('Content-Type', /json/)
 }
 
-function addVideoChannel (url: string, token: string, videoChannelAttributesArg: VideoChannelAttributes, expectedStatus = 200) {
-  const path = '/api/v1/videos/channels'
+function addVideoChannel (
+  url: string,
+  token: string,
+  accountId: number,
+  videoChannelAttributesArg: VideoChannelAttributes,
+  expectedStatus = 200
+) {
+  const path = '/api/v1/accounts/' + accountId + '/video-channels/'
 
   // Default attributes
   let attributes = {
@@ -50,9 +56,16 @@ function addVideoChannel (url: string, token: string, videoChannelAttributesArg:
     .expect(expectedStatus)
 }
 
-function updateVideoChannel (url: string, token: string, channelId: number, attributes: VideoChannelAttributes, expectedStatus = 204) {
+function updateVideoChannel (
+  url: string,
+  token: string,
+  accountId: number,
+  channelId: number,
+  attributes: VideoChannelAttributes,
+  expectedStatus = 204
+) {
   const body = {}
-  const path = '/api/v1/videos/channels/' + channelId
+  const path = '/api/v1/accounts/' + accountId + '/video-channels/' + channelId
 
   if (attributes.name) body['name'] = attributes.name
   if (attributes.description) body['description'] = attributes.description
@@ -66,18 +79,18 @@ function updateVideoChannel (url: string, token: string, channelId: number, attr
     .expect(expectedStatus)
 }
 
-function deleteVideoChannel (url: string, token: string, channelId: number, expectedStatus = 204) {
-  const path = '/api/v1/videos/channels/'
+function deleteVideoChannel (url: string, token: string, accountId: number, channelId: number, expectedStatus = 204) {
+  const path = '/api/v1/accounts/' + accountId + '/video-channels/' + channelId
 
   return request(url)
-    .delete(path + channelId)
+    .delete(path)
     .set('Accept', 'application/json')
     .set('Authorization', 'Bearer ' + token)
     .expect(expectedStatus)
 }
 
-function getVideoChannel (url: string, channelId: number) {
-  const path = '/api/v1/videos/channels/' + channelId
+function getVideoChannel (url: string, accountId: number, channelId: number) {
+  const path = '/api/v1/accounts/' + accountId + '/video-channels/' + channelId
 
   return request(url)
     .get(path)