4 files changed, 486 insertions, 421 deletions

diff --git a/server/tests/api/users/blocklist.ts b/server/tests/api/users/blocklist.ts
index 4bca27a94..638a443ba 100644
--- a/server/tests/api/users/blocklist.ts
+++ b/server/tests/api/users/blocklist.ts
@@ -86,7 +86,7 @@ describe('Test blocklist', function () {
 
     {
       const user = { username: 'user1', password: 'password' }
-      await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
+      await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: user.username, password: user.password })
 
       userToken1 = await userLogin(servers[0], user)
       await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' })
@@ -94,14 +94,14 @@ describe('Test blocklist', function () {
 
     {
       const user = { username: 'moderator', password: 'password' }
-      await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
+      await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: user.username, password: user.password })
 
       userModeratorToken = await userLogin(servers[0], user)
     }
 
     {
       const user = { username: 'user2', password: 'password' }
-      await createUser(servers[1].url, servers[1].accessToken, user.username, user.password)
+      await createUser({ url: servers[ 1 ].url, accessToken: servers[ 1 ].accessToken, username: user.username, password: user.password })
 
       userToken2 = await userLogin(servers[1], user)
       await uploadVideo(servers[1].url, userToken2, { name: 'video user 2' })
diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index 88a7187d6..037a79a76 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -45,7 +45,7 @@ describe('Test users subscriptions', function () {
     {
       for (const server of servers) {
         const user = { username: 'user' + server.serverNumber, password: 'password' }
-        await createUser(server.url, server.accessToken, user.username, user.password)
+        await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
         const accessToken = await userLogin(server, user)
         users.push({ accessToken })
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index c46c2b7d7..0510b2de9 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -57,7 +57,12 @@ describe('Test users with multiple servers', function () {
         username: 'user1',
         password: 'password'
       }
-      const res = await createUser(servers[ 0 ].url, servers[ 0 ].accessToken, user.username, user.password)
+      const res = await createUser({
+        url: servers[ 0 ].url,
+        accessToken: servers[ 0 ].accessToken,
+        username: user.username,
+        password: user.password
+      })
       userId = res.body.user.id
       userAccessToken = await userLogin(servers[ 0 ], user)
     }
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 6e7de9c38..13511e070 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -37,6 +37,7 @@ import {
 import { follow } from '../../../../shared/utils/server/follows'
 import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
 import { getMyVideos } from '../../../../shared/utils/videos/videos'
+import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
 
 const expect = chai.expect
 
@@ -60,563 +61,622 @@ describe('Test users', function () {
     await setAccessTokensToServers([ server ])
   })
 
-  it('Should create a new client')
+  describe('OAuth client', function () {
+    it('Should create a new client')
 
-  it('Should return the first client')
+    it('Should return the first client')
 
-  it('Should remove the last client')
+    it('Should remove the last client')
 
-  it('Should not login with an invalid client id', async function () {
-    const client = { id: 'client', secret: server.client.secret }
-    const res = await login(server.url, client, server.user, 400)
+    it('Should not login with an invalid client id', async function () {
+      const client = { id: 'client', secret: server.client.secret }
+      const res = await login(server.url, client, server.user, 400)
 
-    expect(res.body.error).to.contain('client is invalid')
-  })
+      expect(res.body.error).to.contain('client is invalid')
+    })
 
-  it('Should not login with an invalid client secret', async function () {
-    const client = { id: server.client.id, secret: 'coucou' }
-    const res = await login(server.url, client, server.user, 400)
+    it('Should not login with an invalid client secret', async function () {
+      const client = { id: server.client.id, secret: 'coucou' }
+      const res = await login(server.url, client, server.user, 400)
 
-    expect(res.body.error).to.contain('client is invalid')
+      expect(res.body.error).to.contain('client is invalid')
+    })
   })
 
-  it('Should not login with an invalid username', async function () {
-    const user = { username: 'captain crochet', password: server.user.password }
-    const res = await login(server.url, server.client, user, 400)
-
-    expect(res.body.error).to.contain('credentials are invalid')
-  })
+  describe('Login', function () {
 
-  it('Should not login with an invalid password', async function () {
-    const user = { username: server.user.username, password: 'mew_three' }
-    const res = await login(server.url, server.client, user, 400)
+    it('Should not login with an invalid username', async function () {
+      const user = { username: 'captain crochet', password: server.user.password }
+      const res = await login(server.url, server.client, user, 400)
 
-    expect(res.body.error).to.contain('credentials are invalid')
-  })
+      expect(res.body.error).to.contain('credentials are invalid')
+    })
 
-  it('Should not be able to upload a video', async function () {
-    accessToken = 'my_super_token'
+    it('Should not login with an invalid password', async function () {
+      const user = { username: server.user.username, password: 'mew_three' }
+      const res = await login(server.url, server.client, user, 400)
 
-    const videoAttributes = {}
-    await uploadVideo(server.url, accessToken, videoAttributes, 401)
-  })
+      expect(res.body.error).to.contain('credentials are invalid')
+    })
 
-  it('Should not be able to follow', async function () {
-    accessToken = 'my_super_token'
-    await follow(server.url, [ 'http://example.com' ], accessToken, 401)
-  })
+    it('Should not be able to upload a video', async function () {
+      accessToken = 'my_super_token'
 
-  it('Should not be able to unfollow')
+      const videoAttributes = {}
+      await uploadVideo(server.url, accessToken, videoAttributes, 401)
+    })
 
-  it('Should be able to login', async function () {
-    const res = await login(server.url, server.client, server.user, 200)
+    it('Should not be able to follow', async function () {
+      accessToken = 'my_super_token'
+      await follow(server.url, [ 'http://example.com' ], accessToken, 401)
+    })
 
-    accessToken = res.body.access_token
-  })
+    it('Should not be able to unfollow')
 
-  it('Should upload the video with the correct token', async function () {
-    const videoAttributes = {}
-    await uploadVideo(server.url, accessToken, videoAttributes)
-    const res = await getVideosList(server.url)
-    const video = res.body.data[ 0 ]
+    it('Should be able to login', async function () {
+      const res = await login(server.url, server.client, server.user, 200)
 
-    expect(video.account.name).to.equal('root')
-    videoId = video.id
+      accessToken = res.body.access_token
+    })
   })
 
-  it('Should upload the video again with the correct token', async function () {
-    const videoAttributes = {}
-    await uploadVideo(server.url, accessToken, videoAttributes)
-  })
+  describe('Upload', function () {
 
-  it('Should retrieve a video rating', async function () {
-    await rateVideo(server.url, accessToken, videoId, 'like')
-    const res = await getMyUserVideoRating(server.url, accessToken, videoId)
-    const rating = res.body
+    it('Should upload the video with the correct token', async function () {
+      const videoAttributes = {}
+      await uploadVideo(server.url, accessToken, videoAttributes)
+      const res = await getVideosList(server.url)
+      const video = res.body.data[ 0 ]
 
-    expect(rating.videoId).to.equal(videoId)
-    expect(rating.rating).to.equal('like')
+      expect(video.account.name).to.equal('root')
+      videoId = video.id
+    })
+
+    it('Should upload the video again with the correct token', async function () {
+      const videoAttributes = {}
+      await uploadVideo(server.url, accessToken, videoAttributes)
+    })
   })
 
-  it('Should retrieve ratings list', async function () {
-    await rateVideo(server.url, accessToken, videoId, 'like')
+  describe('Ratings', function () {
 
-    const res = await getAccountRatings(server.url, server.user.username, server.accessToken, null, 200)
-    const ratings = res.body
+    it('Should retrieve a video rating', async function () {
+      await rateVideo(server.url, accessToken, videoId, 'like')
+      const res = await getMyUserVideoRating(server.url, accessToken, videoId)
+      const rating = res.body
 
-    expect(ratings.total).to.equal(1)
-    expect(ratings.data[0].video.id).to.equal(videoId)
-    expect(ratings.data[0].rating).to.equal('like')
-  })
+      expect(rating.videoId).to.equal(videoId)
+      expect(rating.rating).to.equal('like')
+    })
 
-  it('Should retrieve ratings list by rating type', async function () {
-    {
-      const res = await getAccountRatings(server.url, server.user.username, server.accessToken, 'like')
-      const ratings = res.body
-      expect(ratings.data.length).to.equal(1)
-    }
+    it('Should retrieve ratings list', async function () {
+      await rateVideo(server.url, accessToken, videoId, 'like')
 
-    {
-      const res = await getAccountRatings(server.url, server.user.username, server.accessToken, 'dislike')
+      const res = await getAccountRatings(server.url, server.user.username, server.accessToken, null, 200)
       const ratings = res.body
-      expect(ratings.data.length).to.equal(0)
-    }
-  })
-
-  it('Should not be able to remove the video with an incorrect token', async function () {
-    await removeVideo(server.url, 'bad_token', videoId, 401)
-  })
 
-  it('Should not be able to remove the video with the token of another account')
+      expect(ratings.total).to.equal(1)
+      expect(ratings.data[ 0 ].video.id).to.equal(videoId)
+      expect(ratings.data[ 0 ].rating).to.equal('like')
+    })
 
-  it('Should be able to remove the video with the correct token', async function () {
-    await removeVideo(server.url, accessToken, videoId)
+    it('Should retrieve ratings list by rating type', async function () {
+      {
+        const res = await getAccountRatings(server.url, server.user.username, server.accessToken, 'like')
+        const ratings = res.body
+        expect(ratings.data.length).to.equal(1)
+      }
+
+      {
+        const res = await getAccountRatings(server.url, server.user.username, server.accessToken, 'dislike')
+        const ratings = res.body
+        expect(ratings.data.length).to.equal(0)
+      }
+    })
   })
 
-  it('Should logout (revoke token)')
-
-  it('Should not be able to get the user information')
-
-  it('Should not be able to upload a video')
-
-  it('Should not be able to remove a video')
+  describe('Remove video', function () {
+    it('Should not be able to remove the video with an incorrect token', async function () {
+      await removeVideo(server.url, 'bad_token', videoId, 401)
+    })
 
-  it('Should not be able to rate a video', async function () {
-    const path = '/api/v1/videos/'
-    const data = {
-      rating: 'likes'
-    }
+    it('Should not be able to remove the video with the token of another account')
 
-    const options = {
-      url: server.url,
-      path: path + videoId,
-      token: 'wrong token',
-      fields: data,
-      statusCodeExpected: 401
-    }
-    await makePutBodyRequest(options)
+    it('Should be able to remove the video with the correct token', async function () {
+      await removeVideo(server.url, accessToken, videoId)
+    })
   })
 
-  it('Should be able to login again')
+  describe('Logout', function () {
+    it('Should logout (revoke token)')
 
-  it('Should have an expired access token')
+    it('Should not be able to get the user information')
 
-  it('Should refresh the token')
+    it('Should not be able to upload a video')
 
-  it('Should be able to upload a video again')
+    it('Should not be able to remove a video')
 
-  it('Should be able to create a new user', async function () {
-    await createUser(server.url, accessToken, user.username, user.password, 2 * 1024 * 1024)
-  })
+    it('Should not be able to rate a video', async function () {
+      const path = '/api/v1/videos/'
+      const data = {
+        rating: 'likes'
+      }
 
-  it('Should be able to login with this user', async function () {
-    accessTokenUser = await userLogin(server, user)
-  })
+      const options = {
+        url: server.url,
+        path: path + videoId,
+        token: 'wrong token',
+        fields: data,
+        statusCodeExpected: 401
+      }
+      await makePutBodyRequest(options)
+    })
 
-  it('Should be able to get the user information', async function () {
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
-
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('user_1@example.com')
-    expect(user.nsfwPolicy).to.equal('display')
-    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
-    expect(user.roleLabel).to.equal('User')
-    expect(user.id).to.be.a('number')
-    expect(user.account.displayName).to.equal('user_1')
-    expect(user.account.description).to.be.null
-  })
+    it('Should be able to login again')
 
-  it('Should be able to upload a video with this user', async function () {
-    this.timeout(5000)
+    it('Should have an expired access token')
 
-    const videoAttributes = {
-      name: 'super user video',
-      fixture: 'video_short.webm'
-    }
-    await uploadVideo(server.url, accessTokenUser, videoAttributes)
+    it('Should refresh the token')
+
+    it('Should be able to upload a video again')
   })
 
-  it('Should have video quota updated', async function () {
-    const res = await getMyUserVideoQuotaUsed(server.url, accessTokenUser)
-    const data = res.body
+  describe('Creating a user', function () {
 
-    expect(data.videoQuotaUsed).to.equal(218910)
+    it('Should be able to create a new user', async function () {
+      await createUser({
+        url: server.url,
+        accessToken: accessToken,
+        username: user.username,
+        password: user.password,
+        videoQuota: 2 * 1024 * 1024,
+        adminFlags: UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST
+      })
+    })
 
-    const resUsers = await getUsersList(server.url, server.accessToken)
+    it('Should be able to login with this user', async function () {
+      accessTokenUser = await userLogin(server, user)
+    })
 
-    const users: User[] = resUsers.body.data
-    const tmpUser = users.find(u => u.username === user.username)
-    expect(tmpUser.videoQuotaUsed).to.equal(218910)
+    it('Should be able to get user information', async function () {
+      const res1 = await getMyUserInformation(server.url, accessTokenUser)
+      const userMe: User = res1.body
+
+      const res2 = await getUserInformation(server.url, server.accessToken, userMe.id)
+      const userGet: User = res2.body
+
+      for (const user of [ userMe, userGet ]) {
+        expect(user.username).to.equal('user_1')
+        expect(user.email).to.equal('user_1@example.com')
+        expect(user.nsfwPolicy).to.equal('display')
+        expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+        expect(user.roleLabel).to.equal('User')
+        expect(user.id).to.be.a('number')
+        expect(user.account.displayName).to.equal('user_1')
+        expect(user.account.description).to.be.null
+      }
+
+      expect(userMe.adminFlags).to.be.undefined
+      expect(userGet.adminFlags).to.equal(UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST)
+    })
   })
 
-  it('Should be able to list my videos', async function () {
-    const res = await getMyVideos(server.url, accessTokenUser, 0, 5)
-    expect(res.body.total).to.equal(1)
-
-    const videos = res.body.data
-    expect(videos).to.have.lengthOf(1)
+  describe('My videos & quotas', function () {
 
-    expect(videos[ 0 ].name).to.equal('super user video')
-  })
-
-  it('Should list all the users', async function () {
-    const res = await getUsersList(server.url, server.accessToken)
-    const result = res.body
-    const total = result.total
-    const users = result.data
+    it('Should be able to upload a video with this user', async function () {
+      this.timeout(5000)
 
-    expect(total).to.equal(2)
-    expect(users).to.be.an('array')
-    expect(users.length).to.equal(2)
+      const videoAttributes = {
+        name: 'super user video',
+        fixture: 'video_short.webm'
+      }
+      await uploadVideo(server.url, accessTokenUser, videoAttributes)
+    })
 
-    const user = users[ 0 ]
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('user_1@example.com')
-    expect(user.nsfwPolicy).to.equal('display')
+    it('Should have video quota updated', async function () {
+      const res = await getMyUserVideoQuotaUsed(server.url, accessTokenUser)
+      const data = res.body
 
-    const rootUser = users[ 1 ]
-    expect(rootUser.username).to.equal('root')
-    expect(rootUser.email).to.equal('admin1@example.com')
-    expect(user.nsfwPolicy).to.equal('display')
+      expect(data.videoQuotaUsed).to.equal(218910)
 
-    userId = user.id
-  })
+      const resUsers = await getUsersList(server.url, server.accessToken)
 
-  it('Should list only the first user by username asc', async function () {
-    const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, 'username')
+      const users: User[] = resUsers.body.data
+      const tmpUser = users.find(u => u.username === user.username)
+      expect(tmpUser.videoQuotaUsed).to.equal(218910)
+    })
 
-    const result = res.body
-    const total = result.total
-    const users = result.data
+    it('Should be able to list my videos', async function () {
+      const res = await getMyVideos(server.url, accessTokenUser, 0, 5)
+      expect(res.body.total).to.equal(1)
 
-    expect(total).to.equal(2)
-    expect(users.length).to.equal(1)
+      const videos = res.body.data
+      expect(videos).to.have.lengthOf(1)
 
-    const user = users[ 0 ]
-    expect(user.username).to.equal('root')
-    expect(user.email).to.equal('admin1@example.com')
-    expect(user.roleLabel).to.equal('Administrator')
-    expect(user.nsfwPolicy).to.equal('display')
+      expect(videos[ 0 ].name).to.equal('super user video')
+    })
   })
 
-  it('Should list only the first user by username desc', async function () {
-    const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, '-username')
-    const result = res.body
-    const total = result.total
-    const users = result.data
+  describe('Users listing', function () {
 
-    expect(total).to.equal(2)
-    expect(users.length).to.equal(1)
+    it('Should list all the users', async function () {
+      const res = await getUsersList(server.url, server.accessToken)
+      const result = res.body
+      const total = result.total
+      const users = result.data
 
-    const user = users[ 0 ]
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('user_1@example.com')
-    expect(user.nsfwPolicy).to.equal('display')
-  })
+      expect(total).to.equal(2)
+      expect(users).to.be.an('array')
+      expect(users.length).to.equal(2)
 
-  it('Should list only the second user by createdAt desc', async function () {
-    const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, '-createdAt')
-    const result = res.body
-    const total = result.total
-    const users = result.data
+      const user = users[ 0 ]
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('user_1@example.com')
+      expect(user.nsfwPolicy).to.equal('display')
 
-    expect(total).to.equal(2)
-    expect(users.length).to.equal(1)
+      const rootUser = users[ 1 ]
+      expect(rootUser.username).to.equal('root')
+      expect(rootUser.email).to.equal('admin1@example.com')
+      expect(user.nsfwPolicy).to.equal('display')
 
-    const user = users[ 0 ]
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('user_1@example.com')
-    expect(user.nsfwPolicy).to.equal('display')
-  })
+      userId = user.id
+    })
 
-  it('Should list all the users by createdAt asc', async function () {
-    const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt')
-    const result = res.body
-    const total = result.total
-    const users = result.data
+    it('Should list only the first user by username asc', async function () {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, 'username')
 
-    expect(total).to.equal(2)
-    expect(users.length).to.equal(2)
+      const result = res.body
+      const total = result.total
+      const users = result.data
 
-    expect(users[ 0 ].username).to.equal('root')
-    expect(users[ 0 ].email).to.equal('admin1@example.com')
-    expect(users[ 0 ].nsfwPolicy).to.equal('display')
+      expect(total).to.equal(2)
+      expect(users.length).to.equal(1)
 
-    expect(users[ 1 ].username).to.equal('user_1')
-    expect(users[ 1 ].email).to.equal('user_1@example.com')
-    expect(users[ 1 ].nsfwPolicy).to.equal('display')
-  })
+      const user = users[ 0 ]
+      expect(user.username).to.equal('root')
+      expect(user.email).to.equal('admin1@example.com')
+      expect(user.roleLabel).to.equal('Administrator')
+      expect(user.nsfwPolicy).to.equal('display')
+    })
 
-  it('Should search user by username', async function () {
-    const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'oot')
-    const users = res.body.data as User[]
+    it('Should list only the first user by username desc', async function () {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, '-username')
+      const result = res.body
+      const total = result.total
+      const users = result.data
 
-    expect(res.body.total).to.equal(1)
-    expect(users.length).to.equal(1)
+      expect(total).to.equal(2)
+      expect(users.length).to.equal(1)
 
-    expect(users[ 0 ].username).to.equal('root')
-  })
+      const user = users[ 0 ]
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('user_1@example.com')
+      expect(user.nsfwPolicy).to.equal('display')
+    })
 
-  it('Should search user by email', async function () {
-    {
-      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'r_1@exam')
-      const users = res.body.data as User[]
+    it('Should list only the second user by createdAt desc', async function () {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 1, '-createdAt')
+      const result = res.body
+      const total = result.total
+      const users = result.data
 
-      expect(res.body.total).to.equal(1)
+      expect(total).to.equal(2)
       expect(users.length).to.equal(1)
 
-      expect(users[ 0 ].username).to.equal('user_1')
-      expect(users[ 0 ].email).to.equal('user_1@example.com')
-    }
+      const user = users[ 0 ]
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('user_1@example.com')
+      expect(user.nsfwPolicy).to.equal('display')
+    })
 
-    {
-      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'example')
-      const users = res.body.data as User[]
+    it('Should list all the users by createdAt asc', async function () {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt')
+      const result = res.body
+      const total = result.total
+      const users = result.data
 
-      expect(res.body.total).to.equal(2)
+      expect(total).to.equal(2)
       expect(users.length).to.equal(2)
 
       expect(users[ 0 ].username).to.equal('root')
-      expect(users[ 1 ].username).to.equal('user_1')
-    }
-  })
+      expect(users[ 0 ].email).to.equal('admin1@example.com')
+      expect(users[ 0 ].nsfwPolicy).to.equal('display')
 
-  it('Should update my password', async function () {
-    await updateMyUser({
-      url: server.url,
-      accessToken: accessTokenUser,
-      currentPassword: 'super password',
-      newPassword: 'new password'
+      expect(users[ 1 ].username).to.equal('user_1')
+      expect(users[ 1 ].email).to.equal('user_1@example.com')
+      expect(users[ 1 ].nsfwPolicy).to.equal('display')
     })
-    user.password = 'new password'
 
-    await userLogin(server, user, 200)
-  })
+    it('Should search user by username', async function () {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'oot')
+      const users = res.body.data as User[]
+
+      expect(res.body.total).to.equal(1)
+      expect(users.length).to.equal(1)
 
-  it('Should be able to change the NSFW display attribute', async function () {
-    await updateMyUser({
-      url: server.url,
-      accessToken: accessTokenUser,
-      nsfwPolicy: 'do_not_list'
+      expect(users[ 0 ].username).to.equal('root')
     })
 
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
+    it('Should search user by email', async function () {
+      {
+        const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'r_1@exam')
+        const users = res.body.data as User[]
 
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('user_1@example.com')
-    expect(user.nsfwPolicy).to.equal('do_not_list')
-    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
-    expect(user.id).to.be.a('number')
-    expect(user.account.displayName).to.equal('user_1')
-    expect(user.account.description).to.be.null
-  })
+        expect(res.body.total).to.equal(1)
+        expect(users.length).to.equal(1)
 
-  it('Should be able to change the autoPlayVideo attribute', async function () {
-    await updateMyUser({
-      url: server.url,
-      accessToken: accessTokenUser,
-      autoPlayVideo: false
-    })
+        expect(users[ 0 ].username).to.equal('user_1')
+        expect(users[ 0 ].email).to.equal('user_1@example.com')
+      }
 
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
+      {
+        const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'example')
+        const users = res.body.data as User[]
 
-    expect(user.autoPlayVideo).to.be.false
-  })
+        expect(res.body.total).to.equal(2)
+        expect(users.length).to.equal(2)
 
-  it('Should be able to change the email display attribute', async function () {
-    await updateMyUser({
-      url: server.url,
-      accessToken: accessTokenUser,
-      email: 'updated@example.com'
+        expect(users[ 0 ].username).to.equal('root')
+        expect(users[ 1 ].username).to.equal('user_1')
+      }
     })
-
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
-
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('updated@example.com')
-    expect(user.nsfwPolicy).to.equal('do_not_list')
-    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
-    expect(user.id).to.be.a('number')
-    expect(user.account.displayName).to.equal('user_1')
-    expect(user.account.description).to.be.null
   })
 
-  it('Should be able to update my avatar', async function () {
-    const fixture = 'avatar.png'
+  describe('Update my account', function () {
+    it('Should update my password', async function () {
+      await updateMyUser({
+        url: server.url,
+        accessToken: accessTokenUser,
+        currentPassword: 'super password',
+        newPassword: 'new password'
+      })
+      user.password = 'new password'
 
-    await updateMyAvatar({
-      url: server.url,
-      accessToken: accessTokenUser,
-      fixture
+      await userLogin(server, user, 200)
     })
 
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
+    it('Should be able to change the NSFW display attribute', async function () {
+      await updateMyUser({
+        url: server.url,
+        accessToken: accessTokenUser,
+        nsfwPolicy: 'do_not_list'
+      })
+
+      const res = await getMyUserInformation(server.url, accessTokenUser)
+      const user = res.body
+
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('user_1@example.com')
+      expect(user.nsfwPolicy).to.equal('do_not_list')
+      expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+      expect(user.id).to.be.a('number')
+      expect(user.account.displayName).to.equal('user_1')
+      expect(user.account.description).to.be.null
+    })
 
-    await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.png')
-  })
+    it('Should be able to change the autoPlayVideo attribute', async function () {
+      await updateMyUser({
+        url: server.url,
+        accessToken: accessTokenUser,
+        autoPlayVideo: false
+      })
 
-  it('Should be able to update my display name', async function () {
-    await updateMyUser({
-      url: server.url,
-      accessToken: accessTokenUser,
-      displayName: 'new display name'
+      const res = await getMyUserInformation(server.url, accessTokenUser)
+      const user = res.body
+
+      expect(user.autoPlayVideo).to.be.false
     })
 
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
+    it('Should be able to change the email display attribute', async function () {
+      await updateMyUser({
+        url: server.url,
+        accessToken: accessTokenUser,
+        email: 'updated@example.com'
+      })
+
+      const res = await getMyUserInformation(server.url, accessTokenUser)
+      const user = res.body
+
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('updated@example.com')
+      expect(user.nsfwPolicy).to.equal('do_not_list')
+      expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+      expect(user.id).to.be.a('number')
+      expect(user.account.displayName).to.equal('user_1')
+      expect(user.account.description).to.be.null
+    })
 
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('updated@example.com')
-    expect(user.nsfwPolicy).to.equal('do_not_list')
-    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
-    expect(user.id).to.be.a('number')
-    expect(user.account.displayName).to.equal('new display name')
-    expect(user.account.description).to.be.null
-  })
+    it('Should be able to update my avatar', async function () {
+      const fixture = 'avatar.png'
 
-  it('Should be able to update my description', async function () {
-    await updateMyUser({
-      url: server.url,
-      accessToken: accessTokenUser,
-      description: 'my super description updated'
-    })
+      await updateMyAvatar({
+        url: server.url,
+        accessToken: accessTokenUser,
+        fixture
+      })
 
-    const res = await getMyUserInformation(server.url, accessTokenUser)
-    const user = res.body
+      const res = await getMyUserInformation(server.url, accessTokenUser)
+      const user = res.body
 
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('updated@example.com')
-    expect(user.nsfwPolicy).to.equal('do_not_list')
-    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
-    expect(user.id).to.be.a('number')
-    expect(user.account.displayName).to.equal('new display name')
-    expect(user.account.description).to.equal('my super description updated')
-  })
+      await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.png')
+    })
+
+    it('Should be able to update my display name', async function () {
+      await updateMyUser({
+        url: server.url,
+        accessToken: accessTokenUser,
+        displayName: 'new display name'
+      })
+
+      const res = await getMyUserInformation(server.url, accessTokenUser)
+      const user = res.body
+
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('updated@example.com')
+      expect(user.nsfwPolicy).to.equal('do_not_list')
+      expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+      expect(user.id).to.be.a('number')
+      expect(user.account.displayName).to.equal('new display name')
+      expect(user.account.description).to.be.null
+    })
 
-  it('Should be able to update another user', async function () {
-    await updateUser({
-      url: server.url,
-      userId,
-      accessToken,
-      email: 'updated2@example.com',
-      emailVerified: true,
-      videoQuota: 42,
-      role: UserRole.MODERATOR
-    })
-
-    const res = await getUserInformation(server.url, accessToken, userId)
-    const user = res.body
-
-    expect(user.username).to.equal('user_1')
-    expect(user.email).to.equal('updated2@example.com')
-    expect(user.emailVerified).to.be.true
-    expect(user.nsfwPolicy).to.equal('do_not_list')
-    expect(user.videoQuota).to.equal(42)
-    expect(user.roleLabel).to.equal('Moderator')
-    expect(user.id).to.be.a('number')
+    it('Should be able to update my description', async function () {
+      await updateMyUser({
+        url: server.url,
+        accessToken: accessTokenUser,
+        description: 'my super description updated'
+      })
+
+      const res = await getMyUserInformation(server.url, accessTokenUser)
+      const user = res.body
+
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('updated@example.com')
+      expect(user.nsfwPolicy).to.equal('do_not_list')
+      expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+      expect(user.id).to.be.a('number')
+      expect(user.account.displayName).to.equal('new display name')
+      expect(user.account.description).to.equal('my super description updated')
+    })
   })
 
-  it('Should have removed the user token', async function () {
-    await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
+  describe('Updating another user', function () {
+
+    it('Should be able to update another user', async function () {
+      await updateUser({
+        url: server.url,
+        userId,
+        accessToken,
+        email: 'updated2@example.com',
+        emailVerified: true,
+        videoQuota: 42,
+        role: UserRole.MODERATOR,
+        adminFlags: UserAdminFlag.NONE
+      })
+
+      const res = await getUserInformation(server.url, accessToken, userId)
+      const user = res.body
+
+      expect(user.username).to.equal('user_1')
+      expect(user.email).to.equal('updated2@example.com')
+      expect(user.emailVerified).to.be.true
+      expect(user.nsfwPolicy).to.equal('do_not_list')
+      expect(user.videoQuota).to.equal(42)
+      expect(user.roleLabel).to.equal('Moderator')
+      expect(user.id).to.be.a('number')
+      expect(user.adminFlags).to.equal(UserAdminFlag.NONE)
+    })
 
-    accessTokenUser = await userLogin(server, user)
-  })
+    it('Should have removed the user token', async function () {
+      await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
 
-  it('Should be able to update another user password', async function () {
-    await updateUser({
-      url: server.url,
-      userId,
-      accessToken,
-      password: 'password updated'
+      accessTokenUser = await userLogin(server, user)
     })
 
-    await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
+    it('Should be able to update another user password', async function () {
+      await updateUser({
+        url: server.url,
+        userId,
+        accessToken,
+        password: 'password updated'
+      })
 
-    await userLogin(server, user, 400)
+      await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
 
-    user.password = 'password updated'
-    accessTokenUser = await userLogin(server, user)
-  })
+      await userLogin(server, user, 400)
 
-  it('Should be able to list video blacklist by a moderator', async function () {
-    await getBlacklistedVideosList(server.url, accessTokenUser)
+      user.password = 'password updated'
+      accessTokenUser = await userLogin(server, user)
+    })
   })
 
-  it('Should be able to remove this user', async function () {
-    await removeUser(server.url, userId, accessToken)
+  describe('Video blacklists', function () {
+    it('Should be able to list video blacklist by a moderator', async function () {
+      await getBlacklistedVideosList({ url: server.url, token: accessTokenUser })
+    })
   })
 
-  it('Should not be able to login with this user', async function () {
-    await userLogin(server, user, 400)
-  })
+  describe('Remove a user', function () {
+    it('Should be able to remove this user', async function () {
+      await removeUser(server.url, userId, accessToken)
+    })
 
-  it('Should not have videos of this user', async function () {
-    const res = await getVideosList(server.url)
+    it('Should not be able to login with this user', async function () {
+      await userLogin(server, user, 400)
+    })
 
-    expect(res.body.total).to.equal(1)
+    it('Should not have videos of this user', async function () {
+      const res = await getVideosList(server.url)
 
-    const video = res.body.data[ 0 ]
-    expect(video.account.name).to.equal('root')
-  })
+      expect(res.body.total).to.equal(1)
 
-  it('Should register a new user', async function () {
-    await registerUser(server.url, 'user_15', 'my super password')
+      const video = res.body.data[ 0 ]
+      expect(video.account.name).to.equal('root')
+    })
   })
 
-  it('Should be able to login with this registered user', async function () {
-    const user15 = {
-      username: 'user_15',
-      password: 'my super password'
-    }
+  describe('Registering a new user', function () {
+    it('Should register a new user', async function () {
+      await registerUser(server.url, 'user_15', 'my super password')
+    })
 
-    accessToken = await userLogin(server, user15)
-  })
+    it('Should be able to login with this registered user', async function () {
+      const user15 = {
+        username: 'user_15',
+        password: 'my super password'
+      }
 
-  it('Should have the correct video quota', async function () {
-    const res = await getMyUserInformation(server.url, accessToken)
-    const user = res.body
+      accessToken = await userLogin(server, user15)
+    })
 
-    expect(user.videoQuota).to.equal(5 * 1024 * 1024)
-  })
+    it('Should have the correct video quota', async function () {
+      const res = await getMyUserInformation(server.url, accessToken)
+      const user = res.body
 
-  it('Should remove me', async function () {
-    {
-      const res = await getUsersList(server.url, server.accessToken)
-      expect(res.body.data.find(u => u.username === 'user_15')).to.not.be.undefined
-    }
+      expect(user.videoQuota).to.equal(5 * 1024 * 1024)
+    })
 
-    await deleteMe(server.url, accessToken)
+    it('Should remove me', async function () {
+      {
+        const res = await getUsersList(server.url, server.accessToken)
+        expect(res.body.data.find(u => u.username === 'user_15')).to.not.be.undefined
+      }
 
-    {
-      const res = await getUsersList(server.url, server.accessToken)
-      expect(res.body.data.find(u => u.username === 'user_15')).to.be.undefined
-    }
+      await deleteMe(server.url, accessToken)
+
+      {
+        const res = await getUsersList(server.url, server.accessToken)
+        expect(res.body.data.find(u => u.username === 'user_15')).to.be.undefined
+      }
+    })
   })
 
-  it('Should block and unblock a user', async function () {
-    const user16 = {
-      username: 'user_16',
-      password: 'my super password'
-    }
-    const resUser = await createUser(server.url, server.accessToken, user16.username, user16.password)
-    const user16Id = resUser.body.user.id
+  describe('User blocking', function () {
+    it('Should block and unblock a user', async function () {
+      const user16 = {
+        username: 'user_16',
+        password: 'my super password'
+      }
+      const resUser = await createUser({
+        url: server.url,
+        accessToken: server.accessToken,
+        username: user16.username,
+        password: user16.password
+      })
+      const user16Id = resUser.body.user.id
 
-    accessToken = await userLogin(server, user16)
+      accessToken = await userLogin(server, user16)
 
-    await getMyUserInformation(server.url, accessToken, 200)
-    await blockUser(server.url, user16Id, server.accessToken)
+      await getMyUserInformation(server.url, accessToken, 200)
+      await blockUser(server.url, user16Id, server.accessToken)
 
-    await getMyUserInformation(server.url, accessToken, 401)
-    await userLogin(server, user16, 400)
+      await getMyUserInformation(server.url, accessToken, 401)
+      await userLogin(server, user16, 400)
 
-    await unblockUser(server.url, user16Id, server.accessToken)
-    accessToken = await userLogin(server, user16)
-    await getMyUserInformation(server.url, accessToken, 200)
+      await unblockUser(server.url, user16Id, server.accessToken)
+      accessToken = await userLogin(server, user16)
+      await getMyUserInformation(server.url, accessToken, 200)
+    })
   })
 
   after(async function () {