X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fcli.ts;h=4607d052a9a19051fe0b9c009a0a85aa08f4bdb8;hb=c5b28f63367ac373bfa38d4b21791a0a5f1d78c1;hp=a844b9dcfd66bc28c1a76a2b0570faf670baed02;hpb=c3edc5b074aa4bb1861ed0a94d3713808e87170f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/cli.ts b/server/tools/cli.ts
index a844b9dcf..4607d052a 100644
--- a/server/tools/cli.ts
+++ b/server/tools/cli.ts
@@ -20,7 +20,7 @@ async function getAdminTokenOrDie (server: PeerTubeServer, username: string, pas
   const token = await server.login.getAccessToken(username, password)
   const me = await server.users.getMyInfo({ token })
 
-  if (me.role !== UserRole.ADMINISTRATOR) {
+  if (me.role.id !== UserRole.ADMINISTRATOR) {
     console.error('You must be an administrator.')
     process.exit(-1)
   }
@@ -73,35 +73,51 @@ function getRemoteObjectOrDie (
 ): { url: string, username: string, password: string } {
   const options = program.opts()
 
-  if (!options.url || !options.username || !options.password) {
-    // No remote and we don't have program parameters: quit
-    if (settings.remotes.length === 0 || Object.keys(netrc.machines).length === 0) {
-      if (!options.url) console.error('--url field is required.')
-      if (!options.username) console.error('--username field is required.')
-      if (!options.password) console.error('--password field is required.')
+  function exitIfNoOptions (optionNames: string[], errorPrefix: string = '') {
+    let exit = false
 
-      return process.exit(-1)
-    }
+    for (const key of optionNames) {
+      if (!options[key]) {
+        if (exit === false && errorPrefix) console.error(errorPrefix)
 
-    let url: string = options.url
-    let username: string = options.username
-    let password: string = options.password
+        console.error(`--${key} field is required`)
+        exit = true
+      }
+    }
 
-    if (!url && settings.default !== -1) url = settings.remotes[settings.default]
+    if (exit) process.exit(-1)
+  }
 
-    const machine = netrc.machines[url]
+  // If username or password are specified, both are mandatory
+  if (options.username || options.password) {
+    exitIfNoOptions([ 'username', 'password' ])
+  }
 
-    if (!username && machine) username = machine.login
-    if (!password && machine) password = machine.password
+  // If no available machines, url, username and password args are mandatory
+  if (Object.keys(netrc.machines).length === 0) {
+    exitIfNoOptions([ 'url', 'username', 'password' ], 'No account found in netrc')
+  }
 
-    return { url, username, password }
+  if (settings.remotes.length === 0 || settings.default === -1) {
+    exitIfNoOptions([ 'url' ], 'No default instance found')
   }
 
-  return {
-    url: options.url,
-    username: options.username,
-    password: options.password
+  let url: string = options.url
+  let username: string = options.username
+  let password: string = options.password
+
+  if (!url && settings.default !== -1) url = settings.remotes[settings.default]
+
+  const machine = netrc.machines[url]
+  if ((!username || !password) && !machine) {
+    console.error('Cannot find existing configuration for %s.', url)
+    process.exit(-1)
   }
+
+  if (!username && machine) username = machine.login
+  if (!password && machine) password = machine.password
+
+  return { url, username, password }
 }
 
 function buildCommonVideoOptions (command: Command) {