Clean up peertube auth

server/tests/cli/peertube.ts

@@ -44,6 +44,8 @@ describe('Test CLI wrapper', function () {
   })
 
   after(async function () {
+    this.timeout(10000)
+
     await execCLI(cmd + ` auth del ${server.url}`)
 
     killallServers([ server ])

server/tools/peertube-auth.ts

@@ -5,34 +5,25 @@ import { getSettings, writeSettings, netrc } from './cli'
 import { isHostValid } from '../helpers/custom-validators/servers'
 import { isUserUsernameValid } from '../helpers/custom-validators/users'
 
-function delInstance (url: string) {
-  return new Promise((res, rej): void => {
-    getSettings()
-      .then(async (settings) => {
+async function delInstance (url: string) {
+  const settings = await getSettings()
+
   settings.remotes.splice(settings.remotes.indexOf(url))
   await writeSettings(settings)
+
   delete netrc.machines[url]
-        netrc.save()
-        res()
-      })
-      .catch(err => rej(err))
-  })
+  await netrc.save()
 }
 
 async function setInstance (url: string, username: string, password: string) {
-  return new Promise((res, rej): void => {
-    getSettings()
-      .then(async settings => {
+  const settings = await getSettings()
   if (settings.remotes.indexOf(url) === -1) {
     settings.remotes.push(url)
   }
   await writeSettings(settings)
+
   netrc.machines[url] = { login: username, password }
-        netrc.save()
-        res()
-      })
-      .catch(err => rej(err))
-  })
+  await netrc.save()
 }
 
 function isURLaPeerTubeInstance (url: string) {
@@ -71,24 +62,27 @@ program
           required: true
         }
       }
-    }, (_, result) => {
-      setInstance(result.url, result.username, result.password)
+    }, async (_, result) => {
+      await setInstance(result.url, result.username, result.password)
+
+      process.exit(0)
     })
   })
 
 program
   .command('del <url>')
   .description('unregisters a remote instance')
-  .action((url) => {
-    delInstance(url)
+  .action(async url => {
+    await delInstance(url)
+
+    process.exit(0)
   })
 
 program
   .command('list')
   .description('lists registered remote instances')
-  .action(() => {
-    getSettings()
-      .then(settings => {
+  .action(async () => {
+    const settings = await getSettings()
     const table = new Table({
       head: ['instance', 'login'],
       colWidths: [30, 30]
@@ -102,26 +96,27 @@ program
     })
 
     console.log(table.toString())
-      })
+
+    process.exit(0)
   })
 
 program
   .command('set-default <url>')
   .description('set an existing entry as default')
-  .action((url) => {
-    getSettings()
-      .then(settings => {
+  .action(async url => {
+    const settings = await getSettings()
     const instanceExists = settings.remotes.indexOf(url) !== -1
 
     if (instanceExists) {
       settings.default = settings.remotes.indexOf(url)
-          writeSettings(settings)
+      await writeSettings(settings)
+
+      process.exit(0)
     } else {
       console.log('<url> is not a registered instance.')
       process.exit(-1)
     }
   })
-  })
 
 program.on('--help', function () {
   console.log('  Examples:')

server/tools/peertube.ts

@@ -58,7 +58,7 @@ if (!process.argv.slice(2).length) {
             ,"\\/
       _,.__/"\\/_                     (the CLI for red chocobos)
      / \\) "./,  ".
-  --/---"---" "-) )---- by Chocobozzz et al.`)
+  --/---"---" "-) )---- by Chocobozzz et al.\n`)
 }
 
 getSettings()