Introduce login command

9 files changed, 30 insertions, 38 deletions

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 () {