async function setInstance (url: string, username: string, password: string, isDefault: boolean) {
const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
- if (settings.remotes.indexOf(url) === -1) {
+ if (settings.remotes.includes(url) === false) {
settings.remotes.push(url)
}
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.substr(0, urlLength)
+}
+
program
.name('auth')
.usage('[command] [options]')
.option('-U, --username <username>', 'Username')
.option('-p, --password <token>', 'Password')
.option('--default', 'add the entry as the new default')
- .action(options => {
+ .action((options: program.OptionValues) => {
+ /* eslint-disable no-import-assign */
prompt.override = options
prompt.start()
prompt.get({
}
}
}, async (_, result) => {
+
// Check credentials
try {
+ // Strip out everything after the domain:port.
+ // @see https://github.com/Chocobozzz/PeerTube/issues/3520
+ result.url = stripExtraneousFromPeerTubeUrl(result.url)
+
await getAccessToken(result.url, 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)
})
.description('set an existing entry as default')
.action(async url => {
const settings = await getSettings()
- const instanceExists = settings.remotes.indexOf(url) !== -1
+ const instanceExists = settings.remotes.includes(url)
if (instanceExists) {
settings.default = settings.remotes.indexOf(url)
}
})
-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()