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

Use same export filename format as other clients (#312)

Browse Source
This commit is contained in:
Thomas Rittson 2021-05-28 06:47:39 +10:00 committed by GitHub
parent 942eb5cfa5
commit a5a3baea9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/commands/export.command.ts
View File

@ -5,7 +5,6 @@ import { CryptoService } from 'jslib/abstractions/crypto.service';
import { ExportService } from 'jslib/abstractions/export.service'; import { ExportService } from 'jslib/abstractions/export.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';
@ -54,10 +53,22 @@ export class ExportCommand {
async saveFile(exportContent: string, options: program.OptionValues, format: string): Promise<Response> { async saveFile(exportContent: string, options: program.OptionValues, format: string): Promise<Response> {
try { try {
const fileName = this.exportService.getFileName(options.organizationid != null ? 'org' : null, format); const fileName = this.getFileName(format, options.organizationid != null ? 'org' : null);
return await CliUtils.saveResultToFile(exportContent, options.output, fileName); return await CliUtils.saveResultToFile(exportContent, options.output, fileName);
} catch (e) { } catch (e) {
return Response.error(e.toString()); return Response.error(e.toString());
} }
} }
private getFileName(format: string, prefix?: string) {
if (format === 'encrypted_json') {
if (prefix == null) {
prefix = 'encrypted';
} else {
prefix = 'encrypted_' + prefix;
}
format = 'json';
}
return this.exportService.getFileName(prefix, format);
}
} }