From 41d1d075011174e73dccb74006181a92a618d7b4 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 13 Jul 2021 11:05:15 +0200
Subject: Introduce login command

---
 server/tests/api/activitypub/fetch.ts              |  3 +-
 server/tests/api/check-params/abuses.ts            |  3 +-
 server/tests/api/check-params/blocklist.ts         |  5 +-
 server/tests/api/check-params/bulk.ts              |  5 +-
 server/tests/api/check-params/config.ts            |  5 +-
 server/tests/api/check-params/custom-pages.ts      |  5 +-
 server/tests/api/check-params/debug.ts             |  5 +-
 server/tests/api/check-params/follows.ts           |  5 +-
 server/tests/api/check-params/jobs.ts              |  5 +-
 server/tests/api/check-params/live.ts              |  7 +-
 server/tests/api/check-params/logs.ts              |  5 +-
 server/tests/api/check-params/plugins.ts           |  5 +-
 server/tests/api/check-params/redundancy.ts        |  3 +-
 server/tests/api/check-params/upload-quota.ts      |  5 +-
 .../tests/api/check-params/user-subscriptions.ts   |  5 +-
 server/tests/api/check-params/users.ts             |  9 +--
 server/tests/api/check-params/video-blacklist.ts   |  5 +-
 server/tests/api/check-params/video-captions.ts    |  5 +-
 server/tests/api/check-params/video-channels.ts    |  5 +-
 server/tests/api/check-params/video-comments.ts    |  7 +-
 server/tests/api/check-params/video-imports.ts     |  7 +-
 server/tests/api/check-params/videos-filter.ts     |  7 +-
 server/tests/api/check-params/videos.ts            |  7 +-
 server/tests/api/moderation/abuses.ts              |  3 +-
 .../tests/api/moderation/blocklist-notification.ts |  7 +-
 server/tests/api/moderation/blocklist.ts           |  7 +-
 server/tests/api/moderation/video-blacklist.ts     |  5 +-
 .../search/search-activitypub-video-channels.ts    |  3 +-
 server/tests/api/server/bulk.ts                    | 11 ++-
 server/tests/api/server/email.ts                   |  7 +-
 server/tests/api/server/follow-constraints.ts      |  5 +-
 server/tests/api/server/follows.ts                 |  3 +-
 server/tests/api/server/reverse-proxy.ts           | 23 +++---
 server/tests/api/server/stats.ts                   |  3 +-
 server/tests/api/users/user-subscriptions.ts       |  3 +-
 server/tests/api/users/users-multiple-servers.ts   |  3 +-
 server/tests/api/users/users-verification.ts       | 28 ++++---
 server/tests/api/users/users.ts                    | 91 +++++++++++-----------
 server/tests/api/videos/multiple-servers.ts        |  3 +-
 server/tests/api/videos/video-change-ownership.ts  | 11 ++-
 server/tests/api/videos/video-channels.ts          |  3 +-
 server/tests/api/videos/video-comments.ts          |  3 +-
 server/tests/api/videos/video-nsfw.ts              |  5 +-
 server/tests/api/videos/video-playlists.ts         |  6 +-
 server/tests/api/videos/video-privacy.ts           | 23 +++---
 server/tests/api/videos/videos-filter.ts           | 11 ++-
 server/tests/api/videos/videos-history.ts          |  3 +-
 47 files changed, 175 insertions(+), 218 deletions(-)

(limited to 'server/tests/api')

diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts
index d5e21404c..c1af23016 100644
--- a/server/tests/api/activitypub/fetch.ts
+++ b/server/tests/api/activitypub/fetch.ts
@@ -11,7 +11,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '../../../../shared/extra-utils'
 import { Video } from '../../../../shared/models/videos'
@@ -36,7 +35,7 @@ describe('Test ActivityPub fetcher', function () {
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
     }
 
-    const userAccessToken = await userLogin(servers[0], user)
+    const userAccessToken = await servers[0].loginCommand.getAccessToken(user)
 
     await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video root' })
     const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'bad video root' })
diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts
index e158e50dc..14949d301 100644
--- a/server/tests/api/check-params/abuses.ts
+++ b/server/tests/api/check-params/abuses.ts
@@ -18,7 +18,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { AbuseCreate, AbuseState } from '@shared/models'
@@ -47,7 +46,7 @@ describe('Test abuses API validators', function () {
     const username = 'user1'
     const password = 'my super password'
     await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
-    userToken = await userLogin(server, { username, password })
+    userToken = await server.loginCommand.getAccessToken({ username, password })
 
     userToken2 = await generateUserAccessToken(server, 'user_2')
 
diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts
index 5ed8810ce..11a79387f 100644
--- a/server/tests/api/check-params/blocklist.ts
+++ b/server/tests/api/check-params/blocklist.ts
@@ -11,8 +11,7 @@ import {
   makeGetRequest,
   makePostBodyRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import {
   checkBadCountPagination,
@@ -37,7 +36,7 @@ describe('Test blocklist API validators', function () {
     const user = { username: 'user1', password: 'password' }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
 
     await doubleFollow(servers[0], servers[1])
   })
diff --git a/server/tests/api/check-params/bulk.ts b/server/tests/api/check-params/bulk.ts
index 07b920ba7..85520b3bd 100644
--- a/server/tests/api/check-params/bulk.ts
+++ b/server/tests/api/check-params/bulk.ts
@@ -6,8 +6,7 @@ import {
   createUser,
   flushAndRunServer,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import { makePostBodyRequest } from '../../../../shared/extra-utils/requests/requests'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
@@ -27,7 +26,7 @@ describe('Test bulk API validators', function () {
     const user = { username: 'user1', password: 'password' }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When removing comments of', function () {
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 291de93ea..e93523e4b 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -11,8 +11,7 @@ import {
   makeGetRequest,
   makePutBodyRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '@shared/extra-utils'
 import { CustomConfig } from '@shared/models'
 
@@ -208,7 +207,7 @@ describe('Test config API validators', function () {
       password: 'password'
     }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When getting the configuration', function () {
diff --git a/server/tests/api/check-params/custom-pages.ts b/server/tests/api/check-params/custom-pages.ts
index 74ca3384c..c1dd258aa 100644
--- a/server/tests/api/check-params/custom-pages.ts
+++ b/server/tests/api/check-params/custom-pages.ts
@@ -7,8 +7,7 @@ import {
   createUser,
   flushAndRunServer,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import { makeGetRequest, makePutBodyRequest } from '../../../../shared/extra-utils/requests/requests'
 
@@ -29,7 +28,7 @@ describe('Test custom pages validators', function () {
     const user = { username: 'user1', password: 'password' }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When updating instance homepage', function () {
diff --git a/server/tests/api/check-params/debug.ts b/server/tests/api/check-params/debug.ts
index 37bf0f99b..dc033a441 100644
--- a/server/tests/api/check-params/debug.ts
+++ b/server/tests/api/check-params/debug.ts
@@ -7,8 +7,7 @@ import {
   createUser,
   flushAndRunServer,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
@@ -32,7 +31,7 @@ describe('Test debug API validators', function () {
       password: 'my super password'
     }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When getting debug endpoint', function () {
diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts
index c03dd5c9c..8cf5b130e 100644
--- a/server/tests/api/check-params/follows.ts
+++ b/server/tests/api/check-params/follows.ts
@@ -9,8 +9,7 @@ import {
   makeDeleteRequest, makeGetRequest,
   makePostBodyRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import {
   checkBadCountPagination,
@@ -42,7 +41,7 @@ describe('Test server follows API validators', function () {
       }
 
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.loginCommand.getAccessToken(user)
     })
 
     describe('When adding follows', function () {
diff --git a/server/tests/api/check-params/jobs.ts b/server/tests/api/check-params/jobs.ts
index 3c1d2049b..cbe6a28b8 100644
--- a/server/tests/api/check-params/jobs.ts
+++ b/server/tests/api/check-params/jobs.ts
@@ -7,8 +7,7 @@ import {
   createUser,
   flushAndRunServer,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import {
   checkBadCountPagination,
@@ -37,7 +36,7 @@ describe('Test jobs API validators', function () {
       password: 'my super password'
     }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When listing jobs', function () {
diff --git a/server/tests/api/check-params/live.ts b/server/tests/api/check-params/live.ts
index 394967285..045f3a1b1 100644
--- a/server/tests/api/check-params/live.ts
+++ b/server/tests/api/check-params/live.ts
@@ -17,8 +17,7 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   stopFfmpeg,
-  uploadVideoAndGetId,
-  userLogin
+  uploadVideoAndGetId
 } from '../../../../shared/extra-utils'
 
 describe('Test video lives API validator', function () {
@@ -53,7 +52,7 @@ describe('Test video lives API validator', function () {
     const username = 'user1'
     const password = 'my super password'
     await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
-    userAccessToken = await userLogin(server, { username, password })
+    userAccessToken = await server.loginCommand.getAccessToken({ username, password })
 
     {
       const res = await getMyUserInformation(server.url, server.accessToken)
@@ -150,7 +149,7 @@ describe('Test video lives API validator', function () {
       }
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-      const accessTokenUser = await userLogin(server, user)
+      const accessTokenUser = await server.loginCommand.getAccessToken(user)
       const res = await getMyUserInformation(server.url, accessTokenUser)
       const customChannelId = res.body.videoChannels[0].id
 
diff --git a/server/tests/api/check-params/logs.ts b/server/tests/api/check-params/logs.ts
index dac1e6b98..83ecfec93 100644
--- a/server/tests/api/check-params/logs.ts
+++ b/server/tests/api/check-params/logs.ts
@@ -7,8 +7,7 @@ import {
   createUser,
   flushAndRunServer,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
@@ -32,7 +31,7 @@ describe('Test logs API validators', function () {
       password: 'my super password'
     }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When getting logs', function () {
diff --git a/server/tests/api/check-params/plugins.ts b/server/tests/api/check-params/plugins.ts
index 8509b8ac5..130cf6869 100644
--- a/server/tests/api/check-params/plugins.ts
+++ b/server/tests/api/check-params/plugins.ts
@@ -13,8 +13,7 @@ import {
   makePostBodyRequest,
   makePutBodyRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '@shared/extra-utils'
 import { PeerTubePlugin, PluginType } from '@shared/models'
 
@@ -45,7 +44,7 @@ describe('Test server plugins API validators', function () {
     }
 
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
 
     {
       const res = await server.pluginsCommand.install({ npmName: npmPlugin })
diff --git a/server/tests/api/check-params/redundancy.ts b/server/tests/api/check-params/redundancy.ts
index dac6938de..2e10e378a 100644
--- a/server/tests/api/check-params/redundancy.ts
+++ b/server/tests/api/check-params/redundancy.ts
@@ -19,7 +19,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideoAndGetId,
-  userLogin,
   waitJobs
 } from '../../../../shared/extra-utils'
 
@@ -45,7 +44,7 @@ describe('Test server redundancy API validators', function () {
     }
 
     await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(servers[0], user)
+    userAccessToken = await servers[0].loginCommand.getAccessToken(user)
 
     videoIdLocal = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video' })).id
 
diff --git a/server/tests/api/check-params/upload-quota.ts b/server/tests/api/check-params/upload-quota.ts
index c444663b8..3dc6cf2b4 100644
--- a/server/tests/api/check-params/upload-quota.ts
+++ b/server/tests/api/check-params/upload-quota.ts
@@ -15,7 +15,6 @@ import {
   setDefaultVideoChannel,
   updateUser,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '../../../../shared/extra-utils'
 
@@ -50,7 +49,7 @@ describe('Test upload quota', function () {
 
       const user = { username: 'registered' + randomInt(1, 1500), password: 'password' }
       await registerUser(server.url, user.username, user.password)
-      const userAccessToken = await userLogin(server, user)
+      const userAccessToken = await server.loginCommand.getAccessToken(user)
 
       const videoAttributes = { fixture: 'video_short2.webm' }
       for (let i = 0; i < 5; i++) {
@@ -65,7 +64,7 @@ describe('Test upload quota', function () {
 
       const user = { username: 'registered' + randomInt(1, 1500), password: 'password' }
       await registerUser(server.url, user.username, user.password)
-      const userAccessToken = await userLogin(server, user)
+      const userAccessToken = await server.loginCommand.getAccessToken(user)
 
       const videoAttributes = { fixture: 'video_short2.webm' }
       for (let i = 0; i < 5; i++) {
diff --git a/server/tests/api/check-params/user-subscriptions.ts b/server/tests/api/check-params/user-subscriptions.ts
index 538201647..64e2703b9 100644
--- a/server/tests/api/check-params/user-subscriptions.ts
+++ b/server/tests/api/check-params/user-subscriptions.ts
@@ -10,8 +10,7 @@ import {
   makeGetRequest,
   makePostBodyRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 
 import {
@@ -41,7 +40,7 @@ describe('Test user subscriptions API validators', function () {
       password: 'my super password'
     }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   describe('When listing my subscriptions', function () {
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index fda7e9640..54baeebe1 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -27,8 +27,7 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   unblockUser,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '../../../../shared/extra-utils'
 import { MockSmtpServer } from '../../../../shared/extra-utils/mock-servers/mock-email'
 import {
@@ -87,7 +86,7 @@ describe('Test users API validators', function () {
         password: user.password,
         videoQuota: videoQuota
       })
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.loginCommand.getAccessToken(user)
     }
 
     {
@@ -104,7 +103,7 @@ describe('Test users API validators', function () {
         role: UserRole.MODERATOR
       })
 
-      moderatorAccessToken = await userLogin(server, moderator)
+      moderatorAccessToken = await server.loginCommand.getAccessToken(moderator)
     }
 
     {
@@ -394,7 +393,7 @@ describe('Test users API validators', function () {
         username: 'user1',
         password: 'my super password'
       }
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.loginCommand.getAccessToken(user)
 
       const fields = {
         username: 'user3',
diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts
index 98cf2e11a..c33bc196d 100644
--- a/server/tests/api/check-params/video-blacklist.ts
+++ b/server/tests/api/check-params/video-blacklist.ts
@@ -19,7 +19,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { VideoBlacklistType, VideoDetails } from '@shared/models'
@@ -46,14 +45,14 @@ describe('Test video blacklist API validators', function () {
       const username = 'user1'
       const password = 'my super password'
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: username, password: password })
-      userAccessToken1 = await userLogin(servers[0], { username, password })
+      userAccessToken1 = await servers[0].loginCommand.getAccessToken({ username, password })
     }
 
     {
       const username = 'user2'
       const password = 'my super password'
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: username, password: password })
-      userAccessToken2 = await userLogin(servers[0], { username, password })
+      userAccessToken2 = await servers[0].loginCommand.getAccessToken({ username, password })
     }
 
     {
diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts
index baab0f276..f2fd61b91 100644
--- a/server/tests/api/check-params/video-captions.ts
+++ b/server/tests/api/check-params/video-captions.ts
@@ -12,8 +12,7 @@ import {
   makeUploadRequest,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '@shared/extra-utils'
 import { VideoCreateResult } from '@shared/models'
 
@@ -44,7 +43,7 @@ describe('Test video captions API validator', function () {
         password: 'my super password'
       }
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.loginCommand.getAccessToken(user)
     }
   })
 
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index 3b72d3796..5361f6917 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -18,8 +18,7 @@ import {
   makePutBodyRequest,
   makeUploadRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '@shared/extra-utils'
 import { VideoChannelUpdate } from '@shared/models'
 
@@ -47,7 +46,7 @@ describe('Test video channels API validator', function () {
 
     {
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      accessTokenUser = await userLogin(server, user)
+      accessTokenUser = await server.loginCommand.getAccessToken(user)
     }
 
     command = server.channelsCommand
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index 0f8c81392..c21aebaae 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -15,8 +15,7 @@ import {
   makePostBodyRequest,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '@shared/extra-utils'
 import { VideoCreateResult } from '@shared/models'
 
@@ -55,13 +54,13 @@ describe('Test video comments API validator', function () {
     {
       const user = { username: 'user1', password: 'my super password' }
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.loginCommand.getAccessToken(user)
     }
 
     {
       const user = { username: 'user2', password: 'my super password' }
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-      userAccessToken2 = await userLogin(server, user)
+      userAccessToken2 = await server.loginCommand.getAccessToken(user)
     }
   })
 
diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts
index 2cc124cc1..51260affa 100644
--- a/server/tests/api/check-params/video-imports.ts
+++ b/server/tests/api/check-params/video-imports.ts
@@ -17,8 +17,7 @@ import {
   makePostBodyRequest,
   makeUploadRequest,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '@shared/extra-utils'
 import { VideoPrivacy } from '@shared/models'
 
@@ -40,7 +39,7 @@ describe('Test video imports API validator', function () {
     const username = 'user1'
     const password = 'my super password'
     await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
-    userAccessToken = await userLogin(server, { username, password })
+    userAccessToken = await server.loginCommand.getAccessToken({ username, password })
 
     {
       const res = await getMyUserInformation(server.url, server.accessToken)
@@ -167,7 +166,7 @@ describe('Test video imports API validator', function () {
       }
       await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-      const accessTokenUser = await userLogin(server, user)
+      const accessTokenUser = await server.loginCommand.getAccessToken(user)
       const res = await getMyUserInformation(server.url, accessTokenUser)
       const customChannelId = res.body.videoChannels[0].id
 
diff --git a/server/tests/api/check-params/videos-filter.ts b/server/tests/api/check-params/videos-filter.ts
index 4d54a4fd0..095b94656 100644
--- a/server/tests/api/check-params/videos-filter.ts
+++ b/server/tests/api/check-params/videos-filter.ts
@@ -8,8 +8,7 @@ import {
   makeGetRequest,
   ServerInfo,
   setAccessTokensToServers,
-  setDefaultVideoChannel,
-  userLogin
+  setDefaultVideoChannel
 } from '../../../../shared/extra-utils'
 import { UserRole } from '../../../../shared/models/users'
 import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
@@ -52,7 +51,7 @@ describe('Test video filters validators', function () {
 
     const user = { username: 'user1', password: 'my super password' }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
 
     const moderator = { username: 'moderator', password: 'my super password' }
     await createUser(
@@ -66,7 +65,7 @@ describe('Test video filters validators', function () {
         role: UserRole.MODERATOR
       }
     )
-    moderatorAccessToken = await userLogin(server, moderator)
+    moderatorAccessToken = await server.loginCommand.getAccessToken(moderator)
   })
 
   describe('When setting a video filter', function () {
diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts
index 6549063b1..8e11232bd 100644
--- a/server/tests/api/check-params/videos.ts
+++ b/server/tests/api/check-params/videos.ts
@@ -22,8 +22,7 @@ import {
   removeVideo,
   root,
   ServerInfo,
-  setAccessTokensToServers,
-  userLogin
+  setAccessTokensToServers
 } from '../../../../shared/extra-utils'
 import {
   checkBadCountPagination,
@@ -55,7 +54,7 @@ describe('Test videos API validator', function () {
     const username = 'user1'
     const password = 'my super password'
     await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
-    userAccessToken = await userLogin(server, { username, password })
+    userAccessToken = await server.loginCommand.getAccessToken({ username, password })
 
     {
       const res = await getMyUserInformation(server.url, server.accessToken)
@@ -286,7 +285,7 @@ describe('Test videos API validator', function () {
         }
         await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-        const accessTokenUser = await userLogin(server, user)
+        const accessTokenUser = await server.loginCommand.getAccessToken(user)
         const res = await getMyUserInformation(server.url, accessTokenUser)
         const customChannelId = res.body.videoChannels[0].id
 
diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts
index e428cf1a8..d7462f38f 100644
--- a/server/tests/api/moderation/abuses.ts
+++ b/server/tests/api/moderation/abuses.ts
@@ -17,7 +17,6 @@ import {
   setAccessTokensToServers,
   uploadVideo,
   uploadVideoAndGetId,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models'
@@ -280,7 +279,7 @@ describe('Test abuses', function () {
       // register a second user to have two reporters/reportees
       const user = { username: 'user2', password: 'password' }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, ...user })
-      const userAccessToken = await userLogin(servers[0], user)
+      const userAccessToken = await servers[0].loginCommand.getAccessToken(user)
 
       // upload a third video via this user
       const video3Attributes = {
diff --git a/server/tests/api/moderation/blocklist-notification.ts b/server/tests/api/moderation/blocklist-notification.ts
index b676a4db4..4f2be6198 100644
--- a/server/tests/api/moderation/blocklist-notification.ts
+++ b/server/tests/api/moderation/blocklist-notification.ts
@@ -10,7 +10,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { UserNotificationType } from '@shared/models'
@@ -86,7 +85,7 @@ describe('Test blocklist', function () {
         videoQuotaDaily: -1
       })
 
-      userToken1 = await userLogin(servers[0], user)
+      userToken1 = await servers[0].loginCommand.getAccessToken(user)
       await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' })
     }
 
@@ -94,14 +93,14 @@ describe('Test blocklist', function () {
       const user = { username: 'user2', password: 'password' }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
 
-      userToken2 = await userLogin(servers[0], user)
+      userToken2 = await servers[0].loginCommand.getAccessToken(user)
     }
 
     {
       const user = { username: 'user3', password: 'password' }
       await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
 
-      remoteUserToken = await userLogin(servers[1], user)
+      remoteUserToken = await servers[1].loginCommand.getAccessToken(user)
     }
 
     await doubleFollow(servers[0], servers[1])
diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts
index 44e3de4e4..c38a7dad4 100644
--- a/server/tests/api/moderation/blocklist.ts
+++ b/server/tests/api/moderation/blocklist.ts
@@ -14,7 +14,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { UserNotificationType, Video } from '@shared/models'
@@ -94,7 +93,7 @@ describe('Test blocklist', function () {
       const user = { username: 'user1', password: 'password' }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
 
-      userToken1 = await userLogin(servers[0], user)
+      userToken1 = await servers[0].loginCommand.getAccessToken(user)
       await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' })
     }
 
@@ -102,14 +101,14 @@ describe('Test blocklist', function () {
       const user = { username: 'moderator', password: 'password' }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
 
-      userModeratorToken = await userLogin(servers[0], user)
+      userModeratorToken = await servers[0].loginCommand.getAccessToken(user)
     }
 
     {
       const user = { username: 'user2', password: 'password' }
       await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
 
-      userToken2 = await userLogin(servers[1], user)
+      userToken2 = await servers[1].loginCommand.getAccessToken(user)
       await uploadVideo(servers[1].url, userToken2, { name: 'video user 2' })
     }
 
diff --git a/server/tests/api/moderation/video-blacklist.ts b/server/tests/api/moderation/video-blacklist.ts
index 8b4723a2b..b61effc57 100644
--- a/server/tests/api/moderation/video-blacklist.ts
+++ b/server/tests/api/moderation/video-blacklist.ts
@@ -19,7 +19,6 @@ import {
   setAccessTokensToServers,
   updateVideo,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { User, UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models'
@@ -366,7 +365,7 @@ describe('Test video blacklist', function () {
           role: UserRole.USER
         })
 
-        userWithoutFlag = await userLogin(servers[0], user)
+        userWithoutFlag = await servers[0].loginCommand.getAccessToken(user)
 
         const res = await getMyUserInformation(servers[0].url, userWithoutFlag)
         const body: User = res.body
@@ -384,7 +383,7 @@ describe('Test video blacklist', function () {
           role: UserRole.USER
         })
 
-        userWithFlag = await userLogin(servers[0], user)
+        userWithFlag = await servers[0].loginCommand.getAccessToken(user)
       }
 
       await waitJobs(servers)
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts
index 83be9cd1e..3cba2b019 100644
--- a/server/tests/api/search/search-activitypub-video-channels.ts
+++ b/server/tests/api/search/search-activitypub-video-channels.ts
@@ -13,7 +13,6 @@ import {
   updateMyUser,
   updateVideo,
   uploadVideo,
-  userLogin,
   wait,
   waitJobs
 } from '@shared/extra-utils'
@@ -47,7 +46,7 @@ describe('Test ActivityPub video channels search', function () {
     {
       const user = { username: 'user1_server2', password: 'password' }
       await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
-      userServer2Token = await userLogin(servers[1], user)
+      userServer2Token = await servers[1].loginCommand.getAccessToken(user)
 
       const channel = {
         name: 'channel1_server2',
diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts
index 5c8673e00..a09c21228 100644
--- a/server/tests/api/server/bulk.ts
+++ b/server/tests/api/server/bulk.ts
@@ -2,7 +2,6 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { Video } from '@shared/models'
 import {
   BulkCommand,
   cleanupTests,
@@ -13,9 +12,9 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   waitJobs
-} from '../../../../shared/extra-utils/index'
+} from '@shared/extra-utils'
+import { Video } from '@shared/models'
 
 const expect = chai.expect
 
@@ -41,21 +40,21 @@ describe('Test bulk actions', function () {
       const user = { username: 'user1', password: 'password' }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
 
-      user1Token = await userLogin(servers[0], user)
+      user1Token = await servers[0].loginCommand.getAccessToken(user)
     }
 
     {
       const user = { username: 'user2', password: 'password' }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
 
-      user2Token = await userLogin(servers[0], user)
+      user2Token = await servers[0].loginCommand.getAccessToken(user)
     }
 
     {
       const user = { username: 'user3', password: 'password' }
       await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
 
-      user3Token = await userLogin(servers[1], user)
+      user3Token = await servers[1].loginCommand.getAccessToken(user)
     }
 
     await doubleFollow(servers[0], servers[1])
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 5d997713b..c64c120e3 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -15,7 +15,6 @@ import {
   setAccessTokensToServers,
   unblockUser,
   uploadVideo,
-  userLogin,
   verifyEmail
 } from '../../../../shared/extra-utils'
 import { MockSmtpServer } from '../../../../shared/extra-utils/mock-servers/mock-email'
@@ -62,7 +61,7 @@ describe('Test emails', function () {
       const res = await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
       userId = res.body.user.id
 
-      userAccessToken = await userLogin(server, user)
+      userAccessToken = await server.loginCommand.getAccessToken(user)
     }
 
     {
@@ -128,7 +127,7 @@ describe('Test emails', function () {
     it('Should login with this new password', async function () {
       user.password = 'super_password2'
 
-      await userLogin(server, user)
+      await server.loginCommand.getAccessToken(user)
     })
   })
 
@@ -175,7 +174,7 @@ describe('Test emails', function () {
     })
 
     it('Should login with this new password', async function () {
-      await userLogin(server, {
+      await server.loginCommand.getAccessToken({
         username: 'create_password',
         password: 'newly_created_password'
       })
diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts
index 0f1c6264d..74cdf353b 100644
--- a/server/tests/api/server/follow-constraints.ts
+++ b/server/tests/api/server/follow-constraints.ts
@@ -15,8 +15,7 @@ import {
   getVideoWithToken,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '../../../../shared/extra-utils'
 
 const expect = chai.expect
@@ -49,7 +48,7 @@ describe('Test follow constraints', function () {
       password: 'super_password'
     }
     await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(servers[0], user)
+    userAccessToken = await servers[0].loginCommand.getAccessToken(user)
 
     await doubleFollow(servers[0], servers[1])
   })
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index 4a9ed2d05..c2a0620a5 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -16,7 +16,6 @@ import {
   setAccessTokensToServers,
   testCaptionFile,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { Video, VideoPrivacy } from '@shared/models'
@@ -330,7 +329,7 @@ describe('Test follows', function () {
       {
         const user = { username: 'captain', password: 'password' }
         await createUser({ url: servers[2].url, accessToken: servers[2].accessToken, username: user.username, password: user.password })
-        const userAccessToken = await userLogin(servers[2], user)
+        const userAccessToken = await servers[2].loginCommand.getAccessToken(user)
 
         const resVideos = await getVideosList(servers[2].url)
         video4 = resVideos.body.data.find(v => v.name === 'server3-4')
diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts
index 17d1ee4a5..d9c669571 100644
--- a/server/tests/api/server/reverse-proxy.ts
+++ b/server/tests/api/server/reverse-proxy.ts
@@ -1,12 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
-import { cleanupTests, getVideo, registerUser, uploadVideo, userLogin, viewVideo, wait } from '../../../../shared/extra-utils'
-import { flushAndRunServer, setAccessTokensToServers } from '../../../../shared/extra-utils/index'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
-
-const expect = chai.expect
+import { expect } from 'chai'
+import { HttpStatusCode } from '@shared/core-utils'
+import {
+  cleanupTests,
+  flushAndRunServer,
+  getVideo,
+  registerUser,
+  setAccessTokensToServers,
+  uploadVideo,
+  viewVideo,
+  wait
+} from '@shared/extra-utils'
 
 describe('Test application behind a reverse proxy', function () {
   let server = null
@@ -97,10 +102,10 @@ describe('Test application behind a reverse proxy', function () {
     const user = { username: 'root', password: 'fail' }
 
     for (let i = 0; i < 19; i++) {
-      await userLogin(server, user, HttpStatusCode.BAD_REQUEST_400)
+      await server.loginCommand.getAccessToken(user, HttpStatusCode.BAD_REQUEST_400)
     }
 
-    await userLogin(server, user, HttpStatusCode.TOO_MANY_REQUESTS_429)
+    await server.loginCommand.getAccessToken(user, HttpStatusCode.TOO_MANY_REQUESTS_429)
   })
 
   it('Should rate limit signup', async function () {
diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts
index ded305899..aa26f978d 100644
--- a/server/tests/api/server/stats.ts
+++ b/server/tests/api/server/stats.ts
@@ -10,7 +10,6 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  userLogin,
   viewVideo,
   wait,
   waitJobs
@@ -119,7 +118,7 @@ describe('Test stats (excluding redundancy)', function () {
     }
 
     {
-      await userLogin(server, user)
+      await server.loginCommand.getAccessToken(user)
 
       const data = await server.statsCommand.get()
 
diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index c119622ad..1d0fc35f1 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -13,7 +13,6 @@ import {
   SubscriptionsCommand,
   updateVideo,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 
@@ -42,7 +41,7 @@ describe('Test users subscriptions', function () {
         const user = { username: 'user' + server.serverNumber, password: 'password' }
         await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
-        const accessToken = await userLogin(server, user)
+        const accessToken = await server.loginCommand.getAccessToken(user)
         users.push({ accessToken })
 
         const videoName1 = 'video 1-' + server.serverNumber
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 7b650cb8f..99fa08fe2 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -19,7 +19,6 @@ import {
   updateMyAvatar,
   updateMyUser,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { User } from '@shared/models'
@@ -64,7 +63,7 @@ describe('Test users with multiple servers', function () {
         password: user.password
       })
       userId = res.body.user.id
-      userAccessToken = await userLogin(servers[0], user)
+      userAccessToken = await servers[0].loginCommand.getAccessToken(user)
     }
 
     {
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index 23f81d804..ade730323 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -2,23 +2,21 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { HttpStatusCode } from '@shared/core-utils'
 import {
   cleanupTests,
   flushAndRunServer,
   getMyUserInformation,
   getUserInformation,
-  login,
+  MockSmtpServer,
   registerUser,
   ServerInfo,
+  setAccessTokensToServers,
   updateMyUser,
-  userLogin,
-  verifyEmail
-} from '../../../../shared/extra-utils'
-import { MockSmtpServer } from '../../../../shared/extra-utils/mock-servers/mock-email'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
-import { User } from '../../../../shared/models/users'
+  verifyEmail,
+  waitJobs
+} from '@shared/extra-utils'
+import { User } from '@shared/models'
 
 const expect = chai.expect
 
@@ -91,15 +89,15 @@ describe('Test users account verification', function () {
   })
 
   it('Should not allow login for user with unverified email', async function () {
-    const resLogin = await login(server.url, server.client, user1, HttpStatusCode.BAD_REQUEST_400)
-    expect(resLogin.body.detail).to.contain('User email is not verified.')
+    const { detail } = await server.loginCommand.login({ user: user1, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
+    expect(detail).to.contain('User email is not verified.')
   })
 
   it('Should verify the user via email and allow login', async function () {
     await verifyEmail(server.url, userId, verificationString)
 
-    const res = await login(server.url, server.client, user1)
-    userAccessToken = res.body.access_token
+    const body = await server.loginCommand.login({ user: user1 })
+    userAccessToken = body.access_token
 
     const resUserVerified = await getUserInformation(server.url, server.accessToken, userId)
     expect(resUserVerified.body.emailVerified).to.be.true
@@ -164,7 +162,7 @@ describe('Test users account verification', function () {
     await waitJobs(server)
     expect(emails).to.have.lengthOf(expectedEmailsLength)
 
-    const accessToken = await userLogin(server, user2)
+    const accessToken = await server.loginCommand.getAccessToken(user2)
 
     const resMyUserInfo = await getMyUserInformation(server.url, accessToken)
     expect(resMyUserInfo.body.emailVerified).to.be.null
@@ -181,7 +179,7 @@ describe('Test users account verification', function () {
       }
     })
 
-    await userLogin(server, user2)
+    await server.loginCommand.getAccessToken(user2)
   })
 
   after(async function () {
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 69a8dba34..608bedb8b 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -18,11 +18,8 @@ import {
   getUsersListPaginationAndSort,
   getVideosList,
   killallServers,
-  login,
-  logout,
   makePutBodyRequest,
   rateVideo,
-  refreshToken,
   registerUserWithChannel,
   removeUser,
   removeVideo,
@@ -35,7 +32,6 @@ import {
   updateMyUser,
   updateUser,
   uploadVideo,
-  userLogin,
   waitJobs
 } from '@shared/extra-utils'
 import { AbuseState, MyUser, OAuth2ErrorCode, User, UserAdminFlag, UserRole, Video, VideoPlaylistType } from '@shared/models'
@@ -78,22 +74,22 @@ describe('Test users', function () {
 
     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, HttpStatusCode.BAD_REQUEST_400)
+      const body = await server.loginCommand.login({ client, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
 
-      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_CLIENT)
-      expect(res.body.error).to.contain('client is invalid')
-      expect(res.body.type.startsWith('https://')).to.be.true
-      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_CLIENT)
+      expect(body.code).to.equal(OAuth2ErrorCode.INVALID_CLIENT)
+      expect(body.error).to.contain('client is invalid')
+      expect(body.type.startsWith('https://')).to.be.true
+      expect(body.type).to.contain(OAuth2ErrorCode.INVALID_CLIENT)
     })
 
     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, HttpStatusCode.BAD_REQUEST_400)
+      const body = await server.loginCommand.login({ client, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
 
-      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_CLIENT)
-      expect(res.body.error).to.contain('client is invalid')
-      expect(res.body.type.startsWith('https://')).to.be.true
-      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_CLIENT)
+      expect(body.code).to.equal(OAuth2ErrorCode.INVALID_CLIENT)
+      expect(body.error).to.contain('client is invalid')
+      expect(body.type.startsWith('https://')).to.be.true
+      expect(body.type).to.contain(OAuth2ErrorCode.INVALID_CLIENT)
     })
   })
 
@@ -101,22 +97,22 @@ describe('Test users', function () {
 
     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, HttpStatusCode.BAD_REQUEST_400)
+      const body = await server.loginCommand.login({ user, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
 
-      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_GRANT)
-      expect(res.body.error).to.contain('credentials are invalid')
-      expect(res.body.type.startsWith('https://')).to.be.true
-      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_GRANT)
+      expect(body.code).to.equal(OAuth2ErrorCode.INVALID_GRANT)
+      expect(body.error).to.contain('credentials are invalid')
+      expect(body.type.startsWith('https://')).to.be.true
+      expect(body.type).to.contain(OAuth2ErrorCode.INVALID_GRANT)
     })
 
     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, HttpStatusCode.BAD_REQUEST_400)
+      const body = await server.loginCommand.login({ user, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
 
-      expect(res.body.code).to.equal(OAuth2ErrorCode.INVALID_GRANT)
-      expect(res.body.error).to.contain('credentials are invalid')
-      expect(res.body.type.startsWith('https://')).to.be.true
-      expect(res.body.type).to.contain(OAuth2ErrorCode.INVALID_GRANT)
+      expect(body.code).to.equal(OAuth2ErrorCode.INVALID_GRANT)
+      expect(body.error).to.contain('credentials are invalid')
+      expect(body.type.startsWith('https://')).to.be.true
+      expect(body.type).to.contain(OAuth2ErrorCode.INVALID_GRANT)
     })
 
     it('Should not be able to upload a video', async function () {
@@ -139,20 +135,20 @@ describe('Test users', function () {
     it('Should not be able to unfollow')
 
     it('Should be able to login', async function () {
-      const res = await login(server.url, server.client, server.user, HttpStatusCode.OK_200)
+      const body = await server.loginCommand.login({ expectedStatus: HttpStatusCode.OK_200 })
 
-      accessToken = res.body.access_token
+      accessToken = body.access_token
     })
 
     it('Should be able to login with an insensitive username', async function () {
       const user = { username: 'RoOt', password: server.user.password }
-      await login(server.url, server.client, user, HttpStatusCode.OK_200)
+      await server.loginCommand.login({ user, expectedStatus: HttpStatusCode.OK_200 })
 
       const user2 = { username: 'rOoT', password: server.user.password }
-      await login(server.url, server.client, user2, HttpStatusCode.OK_200)
+      await server.loginCommand.login({ user: user2, expectedStatus: HttpStatusCode.OK_200 })
 
       const user3 = { username: 'ROOt', password: server.user.password }
-      await login(server.url, server.client, user3, HttpStatusCode.OK_200)
+      await server.loginCommand.login({ user: user3, expectedStatus: HttpStatusCode.OK_200 })
     })
   })
 
@@ -222,7 +218,7 @@ describe('Test users', function () {
 
   describe('Logout', function () {
     it('Should logout (revoke token)', async function () {
-      await logout(server.url, server.accessToken)
+      await server.loginCommand.logout({ token: server.accessToken })
     })
 
     it('Should not be able to get the user information', async function () {
@@ -250,9 +246,9 @@ describe('Test users', function () {
     })
 
     it('Should be able to login again', async function () {
-      const res = await login(server.url, server.client, server.user)
-      server.accessToken = res.body.access_token
-      server.refreshToken = res.body.refresh_token
+      const body = await server.loginCommand.login()
+      server.accessToken = body.access_token
+      server.refreshToken = body.refresh_token
     })
 
     it('Should be able to get my user information again', async function () {
@@ -268,11 +264,11 @@ describe('Test users', function () {
       await killallServers([ server ])
       await reRunServer(server)
 
-      await getMyUserInformation(server.url, server.accessToken, 401)
+      await getMyUserInformation(server.url, server.accessToken, HttpStatusCode.UNAUTHORIZED_401)
     })
 
     it('Should not be able to refresh an access token with an expired refresh token', async function () {
-      await refreshToken(server, server.refreshToken, 400)
+      await server.loginCommand.refreshToken({ refreshToken: server.refreshToken, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
     })
 
     it('Should refresh the token', async function () {
@@ -284,7 +280,7 @@ describe('Test users', function () {
       await killallServers([ server ])
       await reRunServer(server)
 
-      const res = await refreshToken(server, server.refreshToken)
+      const res = await server.loginCommand.refreshToken({ refreshToken: server.refreshToken })
       server.accessToken = res.body.access_token
       server.refreshToken = res.body.refresh_token
     })
@@ -308,7 +304,7 @@ describe('Test users', function () {
     })
 
     it('Should be able to login with this user', async function () {
-      accessTokenUser = await userLogin(server, user)
+      accessTokenUser = await server.loginCommand.getAccessToken(user)
     })
 
     it('Should be able to get user information', async function () {
@@ -562,6 +558,7 @@ describe('Test users', function () {
   })
 
   describe('Update my account', function () {
+
     it('Should update my password', async function () {
       await updateMyUser({
         url: server.url,
@@ -571,7 +568,7 @@ describe('Test users', function () {
       })
       user.password = 'new password'
 
-      await userLogin(server, user, HttpStatusCode.OK_200)
+      await server.loginCommand.login({ user })
     })
 
     it('Should be able to change the NSFW display attribute', async function () {
@@ -781,7 +778,7 @@ describe('Test users', function () {
     it('Should have removed the user token', async function () {
       await getMyUserVideoQuotaUsed(server.url, accessTokenUser, HttpStatusCode.UNAUTHORIZED_401)
 
-      accessTokenUser = await userLogin(server, user)
+      accessTokenUser = await server.loginCommand.getAccessToken(user)
     })
 
     it('Should be able to update another user password', async function () {
@@ -794,10 +791,10 @@ describe('Test users', function () {
 
       await getMyUserVideoQuotaUsed(server.url, accessTokenUser, HttpStatusCode.UNAUTHORIZED_401)
 
-      await userLogin(server, user, HttpStatusCode.BAD_REQUEST_400)
+      await server.loginCommand.login({ user, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
 
       user.password = 'password updated'
-      accessTokenUser = await userLogin(server, user)
+      accessTokenUser = await server.loginCommand.getAccessToken(user)
     })
   })
 
@@ -813,7 +810,7 @@ describe('Test users', function () {
     })
 
     it('Should not be able to login with this user', async function () {
-      await userLogin(server, user, HttpStatusCode.BAD_REQUEST_400)
+      await server.loginCommand.login({ user, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
     })
 
     it('Should not have videos of this user', async function () {
@@ -842,7 +839,7 @@ describe('Test users', function () {
         password: 'my super password'
       }
 
-      user15AccessToken = await userLogin(server, user15)
+      user15AccessToken = await server.loginCommand.getAccessToken(user15)
     })
 
     it('Should have the correct display name', async function () {
@@ -897,13 +894,13 @@ describe('Test users', function () {
       })
       user16Id = resUser.body.user.id
 
-      user16AccessToken = await userLogin(server, user16)
+      user16AccessToken = await server.loginCommand.getAccessToken(user16)
 
       await getMyUserInformation(server.url, user16AccessToken, HttpStatusCode.OK_200)
       await blockUser(server.url, user16Id, server.accessToken)
 
       await getMyUserInformation(server.url, user16AccessToken, HttpStatusCode.UNAUTHORIZED_401)
-      await userLogin(server, user16, HttpStatusCode.BAD_REQUEST_400)
+      await server.loginCommand.login({ user: user16, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
     })
 
     it('Should search user by banned status', async function () {
@@ -930,7 +927,7 @@ describe('Test users', function () {
 
     it('Should unblock a user', async function () {
       await unblockUser(server.url, user16Id, server.accessToken)
-      user16AccessToken = await userLogin(server, user16)
+      user16AccessToken = await server.loginCommand.getAccessToken(user16)
       await getMyUserInformation(server.url, user16AccessToken, HttpStatusCode.OK_200)
     })
   })
@@ -952,7 +949,7 @@ describe('Test users', function () {
       })
 
       user17Id = resUser.body.user.id
-      user17AccessToken = await userLogin(server, user17)
+      user17AccessToken = await server.loginCommand.getAccessToken(user17)
 
       const res = await getUserInformation(server.url, server.accessToken, user17Id, true)
       const user: User = res.body
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 1905aac83..740314bfd 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -24,7 +24,6 @@ import {
   testImage,
   updateVideo,
   uploadVideo,
-  userLogin,
   viewVideo,
   wait,
   waitJobs,
@@ -155,7 +154,7 @@ describe('Test multiple servers', function () {
         password: 'super_password'
       }
       await createUser({ url: servers[1].url, accessToken: servers[1].accessToken, username: user.username, password: user.password })
-      const userAccessToken = await userLogin(servers[1], user)
+      const userAccessToken = await servers[1].loginCommand.getAccessToken(user)
 
       const videoAttributes = {
         name: 'my super name for server 2',
diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts
index 1b81fe047..17c738e6f 100644
--- a/server/tests/api/videos/video-change-ownership.ts
+++ b/server/tests/api/videos/video-change-ownership.ts
@@ -16,8 +16,7 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   setDefaultVideoChannel,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '../../../../shared/extra-utils'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { User } from '../../../../shared/models/users'
@@ -82,8 +81,8 @@ describe('Test video change ownership - nominal', function () {
       videoQuota: videoQuota
     })
 
-    firstUserToken = await userLogin(servers[0], firstUser)
-    secondUserToken = await userLogin(servers[0], secondUser)
+    firstUserToken = await servers[0].loginCommand.getAccessToken(firstUser)
+    secondUserToken = await servers[0].loginCommand.getAccessToken(secondUser)
 
     {
       const res = await getMyUserInformation(servers[0].url, firstUserToken)
@@ -323,8 +322,8 @@ describe('Test video change ownership - quota too small', function () {
       videoQuota: limitedVideoQuota
     })
 
-    firstUserToken = await userLogin(server, firstUser)
-    secondUserToken = await userLogin(server, secondUser)
+    firstUserToken = await server.loginCommand.getAccessToken(firstUser)
+    secondUserToken = await server.loginCommand.getAccessToken(secondUser)
 
     // Upload some videos on the server
     const video1Attributes = {
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index e441ebbd4..83645640c 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -16,7 +16,6 @@ import {
   testImage,
   updateVideo,
   uploadVideo,
-  userLogin,
   wait
 } from '../../../../shared/extra-utils'
 import { getMyUserInformation, ServerInfo, setAccessTokensToServers, viewVideo } from '../../../../shared/extra-utils/index'
@@ -391,7 +390,7 @@ describe('Test video channels', function () {
 
     {
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: 'toto', password: 'password' })
-      const accessToken = await userLogin(servers[0], { username: 'toto', password: 'password' })
+      const accessToken = await servers[0].loginCommand.getAccessToken({ username: 'toto', password: 'password' })
 
       const res = await getMyUserInformation(servers[0].url, accessToken)
       const videoChannel = res.body.videoChannels[0]
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index 548d9fbf5..f9bd23646 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -8,7 +8,6 @@ import {
   createUser,
   dateIsValid,
   flushAndRunServer,
-  getAccessToken,
   ServerInfo,
   setAccessTokensToServers,
   testImage,
@@ -52,7 +51,7 @@ describe('Test video comments', function () {
       username: 'user1',
       password: 'password'
     })
-    userAccessTokenServer1 = await getAccessToken(server.url, 'user1', 'password')
+    userAccessTokenServer1 = await server.loginCommand.getAccessToken('user1', 'password')
 
     command = server.commentsCommand
   })
diff --git a/server/tests/api/videos/video-nsfw.ts b/server/tests/api/videos/video-nsfw.ts
index c9c3792eb..a30b11ace 100644
--- a/server/tests/api/videos/video-nsfw.ts
+++ b/server/tests/api/videos/video-nsfw.ts
@@ -15,8 +15,7 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   updateMyUser,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '@shared/extra-utils'
 import { BooleanBothQuery, CustomConfig, ResultList, User, Video, VideosOverview } from '@shared/models'
 
@@ -151,7 +150,7 @@ describe('Test video NSFW policy', function () {
       const password = 'my super password'
       await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
 
-      userAccessToken = await userLogin(server, { username, password })
+      userAccessToken = await server.loginCommand.getAccessToken({ username, password })
 
       const res = await getMyUserInformation(server.url, userAccessToken)
       const user = res.body
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index 2bb019348..38133e2ce 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -10,7 +10,6 @@ import {
   doubleFollow,
   flushAndRunMultipleServers,
   generateUserAccessToken,
-  getAccessToken,
   getMyUserInformation,
   PlaylistsCommand,
   removeUser,
@@ -21,7 +20,6 @@ import {
   updateVideo,
   uploadVideo,
   uploadVideoAndGetId,
-  userLogin,
   wait,
   waitJobs
 } from '@shared/extra-utils'
@@ -122,7 +120,7 @@ describe('Test video playlists', function () {
         username: 'user1',
         password: 'password'
       })
-      userTokenServer1 = await getAccessToken(servers[0].url, 'user1', 'password')
+      userTokenServer1 = await servers[0].loginCommand.getAccessToken('user1', 'password')
     }
 
     await waitJobs(servers)
@@ -1129,7 +1127,7 @@ describe('Test video playlists', function () {
       })
 
       const userId = res.body.user.id
-      const userAccessToken = await userLogin(servers[0], user)
+      const userAccessToken = await servers[0].loginCommand.getAccessToken(user)
 
       const resChannel = await getMyUserInformation(servers[0].url, userAccessToken)
       const userChannel = (resChannel.body as User).videoChannels[0]
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts
index 950aeb7cf..f831dd8a9 100644
--- a/server/tests/api/videos/video-privacy.ts
+++ b/server/tests/api/videos/video-privacy.ts
@@ -2,23 +2,24 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { Video, VideoCreateResult } from '@shared/models'
+import { HttpStatusCode } from '@shared/core-utils'
 import {
   cleanupTests,
+  createUser,
+  doubleFollow,
   flushAndRunServer,
+  getMyVideos,
+  getVideo,
   getVideosList,
   getVideosListWithToken,
+  getVideoWithToken,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo
-} from '../../../../shared/extra-utils/index'
-import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
-import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { userLogin } from '../../../../shared/extra-utils/users/login'
-import { createUser } from '../../../../shared/extra-utils/users/users'
-import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../../../shared/extra-utils/videos/videos'
-import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
+  updateVideo,
+  uploadVideo,
+  waitJobs
+} from '@shared/extra-utils'
+import { Video, VideoCreateResult, VideoPrivacy } from '@shared/models'
 
 const expect = chai.expect
 
@@ -126,7 +127,7 @@ describe('Test video privacy', function () {
       }
       await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, password: user.password })
 
-      anotherUserToken = await userLogin(servers[0], user)
+      anotherUserToken = await servers[0].loginCommand.getAccessToken(user)
       await getVideoWithToken(servers[0].url, anotherUserToken, privateVideoUUID, HttpStatusCode.FORBIDDEN_403)
     })
 
diff --git a/server/tests/api/videos/videos-filter.ts b/server/tests/api/videos/videos-filter.ts
index 7428b82c5..519dad646 100644
--- a/server/tests/api/videos/videos-filter.ts
+++ b/server/tests/api/videos/videos-filter.ts
@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
   cleanupTests,
   createUser,
@@ -10,12 +11,10 @@ import {
   makeGetRequest,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo,
-  userLogin
+  uploadVideo
 } from '../../../../shared/extra-utils'
-import { Video, VideoPrivacy } from '../../../../shared/models/videos'
 import { UserRole } from '../../../../shared/models/users'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { Video, VideoPrivacy } from '../../../../shared/models/videos'
 
 const expect = chai.expect
 
@@ -72,7 +71,7 @@ describe('Test videos filter', function () {
           role: UserRole.MODERATOR
         }
       )
-      server['moderatorAccessToken'] = await userLogin(server, moderator)
+      server['moderatorAccessToken'] = await server.loginCommand.getAccessToken(moderator)
 
       await uploadVideo(server.url, server.accessToken, { name: 'public ' + server.serverNumber })
 
diff --git a/server/tests/api/videos/videos-history.ts b/server/tests/api/videos/videos-history.ts
index 9a7635c35..256271bd0 100644
--- a/server/tests/api/videos/videos-history.ts
+++ b/server/tests/api/videos/videos-history.ts
@@ -16,7 +16,6 @@ import {
   setAccessTokensToServers,
   updateMyUser,
   uploadVideo,
-  userLogin,
   wait
 } from '@shared/extra-utils'
 import { Video, VideoDetails } from '@shared/models'
@@ -61,7 +60,7 @@ describe('Test videos history', function () {
       password: 'super password'
     }
     await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
-    userAccessToken = await userLogin(server, user)
+    userAccessToken = await server.loginCommand.getAccessToken(user)
   })
 
   it('Should get videos, without watching history', async function () {
-- 
cgit v1.2.3