Better auth args handling for peertube cli

pull/4736/head
Chocobozzz 2022-01-18 09:13:36 +01:00
parent 5bca1d0620
commit 4dfd57ae6f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 14 additions and 7 deletions

View File

@ -73,16 +73,23 @@ 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.')
const manualOptionMode = options.url || options.username || options.password
return process.exit(-1)
// Check parameters validity
if (manualOptionMode || settings.remotes.length === 0 || Object.keys(netrc.machines).length === 0) {
let exit = false
for (const key of [ 'url', 'username', 'password' ]) {
if (!options[key]) {
console.error(`--${key} field is required`)
exit = true
}
}
if (exit) process.exit(-1)
}
if (!manualOptionMode) {
let url: string = options.url
let username: string = options.username
let password: string = options.password