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

[PM-20333] Remove "export-attachments" feature flag (#14310)

Browse Source 
* Remove usage of export-attachments feature flag

* Remove export-attachments feature flag definition

* Update export.command documentation

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
Daniel James Smith
2025-04-17 14:58:16 +02:00
committed by GitHub
parent c4c9db5121
commit 170f97da8e
4 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/cli/src/tools/export.command.ts
View File

@@ -10,8 +10,6 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { EventType } from "@bitwarden/common/enums";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import {
ExportFormat,
@@ -30,7 +28,6 @@ export class ExportCommand {
private policyService: PolicyService,
private eventCollectionService: EventCollectionService,
private accountService: AccountService,
private configService: ConfigService,
) {}
async run(options: OptionValues): Promise<Response> {
@@ -55,13 +52,6 @@ export class ExportCommand {
const format =
password && options.format == "json" ? "encrypted_json" : (options.format ?? "csv");
if (
format == "zip" &&
!(await this.configService.getFeatureFlag(FeatureFlag.ExportAttachments))
) {
return Response.badRequest("Exporting attachments is not supported in this environment.");
}
if (!this.isSupportedExportFormat(format)) {
return Response.badRequest(
`'${format}' is not a supported export format. Supported formats: ${EXPORT_FORMATS.join(

5
apps/cli/src/vault.program.ts
View File

@@ -464,7 +464,7 @@ export class VaultProgram extends BaseProgram {
private exportCommand(): Command {
return new Command("export")
.description("Export vault data to a CSV or JSON file.")
.description("Export vault data to a CSV, JSON or ZIP file.")
.option("--output <output>", "Output directory or filename.")
.option("--format <format>", "Export file format.")
.option(
@@ -476,7 +476,7 @@ export class VaultProgram extends BaseProgram {
writeLn("\n Notes:");
writeLn("");
writeLn(
" Valid formats are `csv`, `json`, and `encrypted_json`. Default format is `csv`.",
" Valid formats are `csv`, `json`, `encrypted_json` and zip. Default format is `csv`.",
);
writeLn("");
writeLn(
@@ -504,7 +504,6 @@ export class VaultProgram extends BaseProgram {
this.serviceContainer.policyService,
this.serviceContainer.eventCollectionService,
this.serviceContainer.accountService,
this.serviceContainer.configService,
);
const response = await command.run(options);
this.processResponse(response);