Introduce login command

2 files changed, 3 insertions, 13 deletions

diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index 5ab07edb0..e055b4684 100644
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -21,7 +21,6 @@ import {
   setAccessTokensToServers,
   testHelloWorldRegisteredSettings,
   uploadVideoAndGetId,
-  userLogin,
   waitJobs
 } from '../../../shared/extra-utils'
 
@@ -41,7 +40,7 @@ describe('Test CLI wrapper', function () {
 
     await createUser({ url: server.url, accessToken: server.accessToken, username: 'user_1', password: 'super_password' })
 
-    userAccessToken = await userLogin(server, { username: 'user_1', password: 'super_password' })
+    userAccessToken = await server.loginCommand.getAccessToken({ username: 'user_1', password: 'super_password' })
 
     {
       const attributes = { name: 'user_channel', displayName: 'User channel', support: 'super support text' }
diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts
index 97a6eae15..a5f958bf7 100644
--- a/server/tests/cli/reset-password.ts
+++ b/server/tests/cli/reset-password.ts
@@ -1,14 +1,5 @@
 import 'mocha'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-import {
-  cleanupTests,
-  CLICommand,
-  createUser,
-  flushAndRunServer,
-  login,
-  ServerInfo,
-  setAccessTokensToServers
-} from '../../../shared/extra-utils'
+import { cleanupTests, CLICommand, createUser, flushAndRunServer, ServerInfo, setAccessTokensToServers } from '../../../shared/extra-utils'
 
 describe('Test reset password scripts', function () {
   let server: ServerInfo
@@ -27,7 +18,7 @@ describe('Test reset password scripts', function () {
     const env = server.cliCommand.getEnv()
     await CLICommand.exec(`echo coucou | ${env} npm run reset-password -- -u user_1`)
 
-    await login(server.url, server.client, { username: 'user_1', password: 'coucou' }, HttpStatusCode.OK_200)
+    await server.loginCommand.login({ user: { username: 'user_1', password: 'coucou' } })
   })
 
   after(async function () {