Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-30 08:10:34 +01:00
Code Issues Projects Releases Wiki Activity

Use Get command for final return value of edit (#290)

Browse Source
This commit is contained in:
Matt Gibson 2021-04-20 14:55:04 -05:00 committed by GitHub
parent 6d46dc4b87
commit 754dfe9d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands/send/edit.command.ts
View File

@ -1,5 +1,6 @@
import * as program from 'commander';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
import { SendService } from 'jslib/abstractions/send.service';
import { UserService } from 'jslib/abstractions/user.service';
@ -9,9 +10,11 @@ import { SendType } from 'jslib/enums/sendType';
import { SendResponse } from '../../models/response/sendResponse';
import { CliUtils } from '../../utils';
import { SendGetCommand } from './get.command';
export class SendEditCommand {
constructor(private sendService: SendService, private userService: UserService) { }
constructor(private sendService: SendService, private userService: UserService,
private getCommand: SendGetCommand) { }
async run(encodedJson: string, options: program.OptionValues): Promise<Response> {
if (encodedJson == null || encodedJson === '') {
@ -64,12 +67,10 @@ export class SendEditCommand {
encSend.expirationDate = sendView.expirationDate;
await this.sendService.saveWithServer([encSend, encFileData]);
const updatedSend = await this.sendService.get(send.id);
const decSend = await updatedSend.decrypt();
const res = new SendResponse(decSend);
return Response.success(res);
} catch (e) {
return Response.error(e);
}
return await this.getCommand.run(send.id, {});
}
}

4
src/send.program.ts
View File

@ -198,7 +198,9 @@ export class SendProgram extends Program {
})
.action(async (encodedJson: string, options: program.OptionValues) => {
await this.exitIfLocked();
const cmd = new SendEditCommand(this.main.sendService, this.main.userService);
const getCmd = new SendGetCommand(this.main.sendService, this.main.environmentService,
this.main.searchService, this.main.cryptoService);
const cmd = new SendEditCommand(this.main.sendService, this.main.userService, getCmd);
const response = await cmd.run(encodedJson, options);
this.processResponse(response);
});