Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-24 12:06:15 +01:00
Code Issues Projects Releases Wiki Activity

NOINTERACTION option checks

Browse Source
This commit is contained in:
Kyle Spearrin 2019-10-21 16:04:33 -04:00
parent 8ab36db5c6
commit 57e49207e9
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cli/commands/login.command.ts
View File

@ -22,7 +22,8 @@ export class LoginCommand {
protected i18nService: I18nService) { } protected i18nService: I18nService) { }
async run(email: string, password: string, cmd: program.Command) { async run(email: string, password: string, cmd: program.Command) {
if (email == null || email === '') { const canInteract = process.stdout.isTTY && process.env.BW_NOINTERACTION !== 'true';
if ((email == null || email === '') && canInteract) {
const answer: inquirer.Answers = await inquirer.createPromptModule({ output: process.stderr })({ const answer: inquirer.Answers = await inquirer.createPromptModule({ output: process.stderr })({
type: 'input', type: 'input',
name: 'email', name: 'email',
@ -37,7 +38,7 @@ export class LoginCommand {
return Response.badRequest('Email address is invalid.'); return Response.badRequest('Email address is invalid.');
} }
if (password == null || password === '') { if ((password == null || password === '') && canInteract) {
const answer: inquirer.Answers = await inquirer.createPromptModule({ output: process.stderr })({ const answer: inquirer.Answers = await inquirer.createPromptModule({ output: process.stderr })({
type: 'password', type: 'password',
name: 'password', name: 'password',
@ -88,7 +89,7 @@ export class LoginCommand {
if (selectedProvider == null) { if (selectedProvider == null) {
if (twoFactorProviders.length === 1) { if (twoFactorProviders.length === 1) {
selectedProvider = twoFactorProviders[0]; selectedProvider = twoFactorProviders[0];
} else { } else if (canInteract) {
const options = twoFactorProviders.map((p) => p.name); const options = twoFactorProviders.map((p) => p.name);
options.push(new inquirer.Separator()); options.push(new inquirer.Separator());
options.push('Cancel'); options.push('Cancel');
@ -105,6 +106,9 @@ export class LoginCommand {
} }
selectedProvider = twoFactorProviders[i]; selectedProvider = twoFactorProviders[i];
} }
if (selectedProvider == null) {
return Response.error('Login failed. No provider selected.');
}
} }
if (twoFactorToken == null && response.twoFactorProviders.size > 1 && if (twoFactorToken == null && response.twoFactorProviders.size > 1 &&
@ -115,6 +119,7 @@ export class LoginCommand {
} }
if (twoFactorToken == null) { if (twoFactorToken == null) {
if (canInteract) {
const answer: inquirer.Answers = const answer: inquirer.Answers =
await inquirer.createPromptModule({ output: process.stderr })({ await inquirer.createPromptModule({ output: process.stderr })({
type: 'input', type: 'input',
@ -122,6 +127,7 @@ export class LoginCommand {
message: 'Two-step login code:', message: 'Two-step login code:',
}); });
twoFactorToken = answer.token; twoFactorToken = answer.token;
}
if (twoFactorToken == null || twoFactorToken === '') { if (twoFactorToken == null || twoFactorToken === '') {
return Response.badRequest('Code is required.'); return Response.badRequest('Code is required.');
} }