X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-auth.ts;h=051156d6682396352953e46c0dca577b3ca97321;hb=424aeb12bd16f5d6763dfa2860d113cc93876405;hp=74bce73142488d30d29a8a1a63d52a68ba0f0828;hpb=faa9d434b4d681837ff2a87603337c2623419669;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-auth.ts b/server/tools/peertube-auth.ts
index 74bce7314..051156d66 100644
--- a/server/tools/peertube-auth.ts
+++ b/server/tools/peertube-auth.ts
@@ -1,14 +1,9 @@
-// eslint-disable @typescript-eslint/no-unnecessary-type-assertion
-
-import { registerTSPaths } from '../helpers/register-ts-paths'
-registerTSPaths()
-
-import * as program from 'commander'
-import * as prompt from 'prompt'
-import { getNetrc, getSettings, writeSettings } from './cli'
+import CliTable3 from 'cli-table3'
+import { OptionValues, program } from 'commander'
 import { isUserUsernameValid } from '../helpers/custom-validators/users'
-import { getAccessToken } from '../../shared/extra-utils'
-import * as CliTable3 from 'cli-table3'
+import { assignToken, buildServer, getNetrc, getSettings, writeSettings } from './cli'
+
+import prompt = require('prompt')
 
 async function delInstance (url: string) {
   const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
@@ -46,6 +41,15 @@ function isURLaPeerTubeInstance (url: string) {
   return url.startsWith('http://') || url.startsWith('https://')
 }
 
+function stripExtraneousFromPeerTubeUrl (url: string) {
+  // Get everything before the 3rd /.
+  const urlLength = url.includes('/', 8)
+    ? url.indexOf('/', 8)
+    : url.length
+
+  return url.substring(0, urlLength)
+}
+
 program
   .name('auth')
   .usage('[command] [options]')
@@ -57,7 +61,8 @@ program
   .option('-U, --username <username>', 'Username')
   .option('-p, --password <token>', 'Password')
   .option('--default', 'add the entry as the new default')
-  .action(options => {
+  .action((options: OptionValues) => {
+    /* eslint-disable no-import-assign */
     prompt.override = options
     prompt.start()
     prompt.get({
@@ -80,15 +85,21 @@ program
         }
       }
     }, async (_, result) => {
+
       // Check credentials
       try {
-        await getAccessToken(result.url, result.username, result.password)
+        // Strip out everything after the domain:port.
+        // See https://github.com/Chocobozzz/PeerTube/issues/3520
+        result.url = stripExtraneousFromPeerTubeUrl(result.url)
+
+        const server = buildServer(result.url)
+        await assignToken(server, result.username, result.password)
       } catch (err) {
         console.error(err.message)
         process.exit(-1)
       }
 
-      await setInstance(result.url, result.username, result.password, program['default'])
+      await setInstance(result.url, result.username, result.password, options.default)
 
       process.exit(0)
     })
@@ -146,15 +157,12 @@ program
     }
   })
 
-program.on('--help', function () {
-  console.log('  Examples:')
-  console.log()
-  console.log('    $ peertube add -u https://peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"')
-  console.log('    $ peertube add -u https://peertube.cpy.re -U root')
-  console.log('    $ peertube list')
-  console.log('    $ peertube del https://peertube.cpy.re')
-  console.log()
-})
+program.addHelpText('after', '\n\n  Examples:\n\n' +
+  '    $ peertube auth add -u https://peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"\n' +
+  '    $ peertube auth add -u https://peertube.cpy.re -U root\n' +
+  '    $ peertube auth list\n' +
+  '    $ peertube auth del https://peertube.cpy.re\n'
+)
 
 if (!process.argv.slice(2).length) {
   program.outputHelp()