1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-24 12:06:15 +01:00

only block interaction if env var set

resolves #118
This commit is contained in:
Kyle Spearrin 2020-03-12 15:37:44 -04:00
parent 3f1d3c7680
commit f5426469bb
4 changed files with 4 additions and 4 deletions

2
jslib

@ -1 +1 @@
Subproject commit 44b86f5dd028271059b70a00d7878fbb1a06023f Subproject commit b816ddddff96b53a77620b8b31d6ca699f0a8195

View File

@ -15,7 +15,7 @@ export class ExportCommand {
constructor(private cryptoService: CryptoService, private exportService: ExportService) { } constructor(private cryptoService: CryptoService, private exportService: ExportService) { }
async run(password: string, cmd: program.Command): Promise<Response> { async run(password: string, cmd: program.Command): Promise<Response> {
const canInteract = process.stdout.isTTY && process.env.BW_NOINTERACTION !== 'true'; const canInteract = process.env.BW_NOINTERACTION !== 'true';
if ((password == null || password === '') && canInteract) { 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',

View File

@ -15,7 +15,7 @@ export class UnlockCommand {
private cryptoFunctionService: CryptoFunctionService) { } private cryptoFunctionService: CryptoFunctionService) { }
async run(password: string, cmd: program.Command) { async run(password: string, cmd: program.Command) {
const canInteract = process.stdout.isTTY && process.env.BW_NOINTERACTION !== 'true'; const canInteract = process.env.BW_NOINTERACTION !== 'true';
if ((password == null || password === '') && canInteract) { 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',

View File

@ -645,7 +645,7 @@ export class Program extends BaseProgram {
await this.exitIfNotAuthed(); await this.exitIfNotAuthed();
const hasKey = await this.main.cryptoService.hasKey(); const hasKey = await this.main.cryptoService.hasKey();
if (!hasKey) { if (!hasKey) {
const canInteract = process.stdout.isTTY && process.env.BW_NOINTERACTION !== 'true'; const canInteract = process.env.BW_NOINTERACTION !== 'true';
if (canInteract) { if (canInteract) {
const command = new UnlockCommand(this.main.cryptoService, this.main.userService, const command = new UnlockCommand(this.main.cryptoService, this.main.userService,
this.main.cryptoFunctionService); this.main.cryptoFunctionService);