bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-15 16:05:03 +00:00
Code Issues Releases Wiki Activity

rename flag to emails (#18955)

Browse Source
This commit is contained in:
John Harrington
2026-02-13 10:23:25 -07:00
committed by GitHub
parent ab702e3a1a
commit ab0739b693
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/cli/src/tools/send/commands/create.command.spec.ts
View File

@@ -62,7 +62,7 @@ describe("SendCreateCommand", () => {
};
const cmdOptions = {
email: ["test@example.com"],
emails: ["test@example.com"],
};
sendService.encrypt.mockResolvedValue([
@@ -155,7 +155,7 @@ describe("SendCreateCommand", () => {
};
const cmdOptions = {
email: ["test@example.com"],
emails: ["test@example.com"],
password: "testPassword123",
};
@@ -246,7 +246,7 @@ describe("SendCreateCommand", () => {
};
const cmdOptions = {
email: ["cli@example.com"],
emails: ["cli@example.com"],
};
const response = await command.run(requestJson, cmdOptions);
@@ -282,7 +282,7 @@ describe("SendCreateCommand", () => {
};
const cmdOptions = {
email: ["cli@example.com"],
emails: ["cli@example.com"],
};
sendService.encrypt.mockResolvedValue([

2
apps/cli/src/tools/send/commands/create.command.ts
View File

@@ -173,7 +173,7 @@ class Options {
this.file = passedOptions?.file;
this.text = passedOptions?.text;
this.password = passedOptions?.password;
this.emails = passedOptions?.email;
this.emails = passedOptions?.emails;
this.hidden = CliUtils.convertBooleanOption(passedOptions?.hidden);
this.maxAccessCount =
passedOptions?.maxAccessCount != null ? parseInt(passedOptions.maxAccessCount, null) : null;

8
apps/cli/src/tools/send/commands/edit.command.spec.ts
View File

@@ -81,7 +81,7 @@ describe("SendEditCommand", () => {
const requestJson = encodeRequest(requestData);
const cmdOptions = {
email: ["test@example.com"],
emails: ["test@example.com"],
};
sendService.encrypt.mockResolvedValue([
@@ -155,7 +155,7 @@ describe("SendEditCommand", () => {
const requestJson = encodeRequest(requestData);
const cmdOptions = {
email: ["test@example.com"],
emails: ["test@example.com"],
password: "testPassword123",
};
@@ -239,7 +239,7 @@ describe("SendEditCommand", () => {
const requestJson = encodeRequest(requestData);
const cmdOptions = {
email: ["cli@example.com"],
emails: ["cli@example.com"],
};
const response = await command.run(requestJson, cmdOptions);
@@ -277,7 +277,7 @@ describe("SendEditCommand", () => {
const requestJson = encodeRequest(requestData);
const cmdOptions = {
email: ["cli@example.com"],
emails: ["cli@example.com"],
};
sendService.encrypt.mockResolvedValue([

2
apps/cli/src/tools/send/commands/edit.command.ts
View File

@@ -124,6 +124,6 @@ class Options {
constructor(passedOptions: Record<string, any>) {
this.itemId = passedOptions?.itemId || passedOptions?.itemid;
this.password = passedOptions.password;
this.emails = passedOptions.email;
this.emails = passedOptions.emails;
}
}

32
apps/cli/src/tools/send/send.program.ts
View File

@@ -57,11 +57,11 @@ export class SendProgram extends BaseProgram {
new Option(
"--password <password>",
"optional password to access this Send. Can also be specified in JSON.",
).conflicts("email"),
).conflicts("emails"),
)
.addOption(
new Option(
"--email <email>",
"--emails <emails>",
"optional emails to access this Send. Can also be specified in JSON.",
).argParser(parseEmail),
)
@@ -85,9 +85,11 @@ export class SendProgram extends BaseProgram {
.addCommand(this.removePasswordCommand())
.addCommand(this.deleteCommand())
.action(async (data: string, options: OptionValues) => {
if (options.email) {
if (options.emails) {
if (!emailAuthEnabled) {
this.processResponse(Response.error("The --email feature is not currently available."));
this.processResponse(
Response.error("The --emails feature is not currently available."),
);
return;
}
}
@@ -225,11 +227,13 @@ export class SendProgram extends BaseProgram {
})
.action(async (encodedJson: string, options: OptionValues, args: { parent: Command }) => {
// subcommands inherit flags from their parent; they cannot override them
const { fullObject = false, email = undefined, password = undefined } = args.parent.opts();
const { fullObject = false, emails = undefined, password = undefined } = args.parent.opts();
if (email) {
if (emails) {
if (!emailAuthEnabled) {
this.processResponse(Response.error("The --email feature is not currently available."));
this.processResponse(
Response.error("The --emails feature is not currently available."),
);
return;
}
}
@@ -237,7 +241,7 @@ export class SendProgram extends BaseProgram {
const mergedOptions = {
...options,
fullObject: fullObject,
email,
emails,
password,
};
@@ -262,10 +266,12 @@ export class SendProgram extends BaseProgram {
})
.action(async (encodedJson: string, options: OptionValues, args: { parent: Command }) => {
await this.exitIfLocked();
const { email = undefined, password = undefined } = args.parent.opts();
if (email) {
const { emails = undefined, password = undefined } = args.parent.opts();
if (emails) {
if (!emailAuthEnabled) {
this.processResponse(Response.error("The --email feature is not currently available."));
this.processResponse(
Response.error("The --emails feature is not currently available."),
);
return;
}
}
@@ -288,7 +294,7 @@ export class SendProgram extends BaseProgram {
const mergedOptions = {
...options,
email,
emails,
password,
};
@@ -353,7 +359,7 @@ export class SendProgram extends BaseProgram {
file: sendFile,
text: sendText,
type: type,
emails: options.email ?? undefined,
emails: options.emails ?? undefined,
});
return Buffer.from(JSON.stringify(template), "utf8").toString("base64");