bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 06:13:38 +00:00
Code Issues Releases Wiki Activity

standardize import command

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-06 10:38:32 -04:00
parent 2a8a8a8ba7
commit 336e4acdd0
5 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/commands/import.command.ts
View File

@@ -1,33 +1,33 @@
import * as program from 'commander';
import * as inquirer from 'inquirer';
import { CryptoService } from 'jslib/abstractions/crypto.service';
import { ImportOptions, ImportService } from 'jslib/abstractions/import.service';
import { ImportService } from 'jslib/abstractions/import.service';
import { UserService } from 'jslib/abstractions/user.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { CliUtils } from '../utils';
const writeLn = CliUtils.writeLn;
export class ImportCommand {
constructor(private cryptoService: CryptoService, private userService: UserService,
private importService: ImportService) { }
async list() {
const options: ImportOptions = this.importService.getOptions().sort((a, b) => {
if (a.id < b.id) { return -1; }
if (a.id > b.id) { return 1; }
return 0;
});
writeLn('\nSupported input formats:\n');
options.forEach((option) => {
writeLn(' ' + option.id);
});
return Response.success();
async run(format: string, filepath: string, password: string, cmd: program.Command): Promise<Response> {
if (cmd.formats || false) {
return this.list();
} else {
return this.import(format, filepath, password);
}
}
async run(type: string, path: string, password: string, cmd: program.Command): Promise<Response> {
private async import(format: string, filepath: string, password: string) {
if (format == null || format === '') {
return Response.badRequest('`format` was not provided.');
}
if (filepath == null || filepath === '') {
return Response.badRequest('`filepath` was not provided.');
}
if (password == null || password === '') {
const answer: inquirer.Answers = await inquirer.createPromptModule({ output: process.stderr })({
type: 'password',
@@ -45,23 +45,39 @@ export class ImportCommand {
const key = await this.cryptoService.makeKey(password, email);
const keyHash = await this.cryptoService.hashPassword(password, key);
const storedKeyHash = await this.cryptoService.getKeyHash();
const importer = await this.importService.getImporter(type);
if (storedKeyHash == null || keyHash == null || storedKeyHash !== keyHash) {
return Response.badRequest('Invalid master password.');
}
const importer = await this.importService.getImporter(format);
if (importer === null) {
return Response.badRequest('Proper importer type required.');
}
if (storedKeyHash != null && keyHash != null && storedKeyHash === keyHash) {
return CliUtils.readFile(path).then(async (contents) => {
const submitResult = await this.importService.submit(importer, contents);
if (submitResult !== null) {
return Response.success();
} else {
return Response.badRequest(submitResult.message);
}
}).catch((err) => {
return Response.badRequest(err);
});
} else {
return Response.badRequest('Invalid master password.');
try {
const contents = await CliUtils.readFile(filepath);
if (contents === null || contents === '') {
return Response.badRequest('Import file was empty.');
}
const submitResult = await this.importService.import(importer, contents);
if (submitResult !== null) {
const res = new MessageResponse('Imported ' + filepath, null);
return Response.success(res);
} else {
return Response.badRequest(submitResult.message);
}
} catch (err) {
return Response.badRequest(err);
}
}
private async list() {
const options = this.importService.importOptions.sort((a, b) => {
return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
}).map((option) => option.id).join('\n');
const res = new MessageResponse('Supported input formats:', options);
res.raw = options;
return Response.success(res);
}
}