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

Fix/bitwarden serve (#454)

Browse Source 
* Handle null passedOptions

* Require authentication to use `bs serve`
This commit is contained in:
Matt Gibson 2022-01-26 11:28:56 -05:00 committed by GitHub
parent 21e8db9636
commit 1b409653a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/confirm.command.ts
View File

@ -60,6 +60,6 @@ class Options {
organizationId: string;
constructor(passedOptions: Record<string, any>) {
this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
}
}

6
src/commands/create.command.ts
View File

@ -205,8 +205,8 @@ class Options {
file: string;
constructor(passedOptions: Record<string, any>) {
this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
this.itemId = passedOptions.itemid || passedOptions.itemId;
this.file = passedOptions.file;
this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
this.itemId = passedOptions?.itemid || passedOptions?.itemId;
this.file = passedOptions?.file;
}
}

6
src/commands/delete.command.ts
View File

@ -127,8 +127,8 @@ class Options {
permanent: boolean;
constructor(passedOptions: Record<string, any>) {
this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
this.itemId = passedOptions.itemid || passedOptions.itemId;
this.permanent = CliUtils.convertBooleanOption(passedOptions.permanent);
this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
this.itemId = passedOptions?.itemid || passedOptions?.itemId;
this.permanent = CliUtils.convertBooleanOption(passedOptions?.permanent);
}
}

2
src/commands/edit.command.ts
View File

@ -189,6 +189,6 @@ class Options {
organizationId: string;
constructor(passedOptions: Record<string, any>) {
this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
}
}

20
src/commands/generate.command.ts
View File

@ -43,16 +43,16 @@ class Options {
includeNumber: boolean;
constructor(passedOptions: Record<string, any>) {
this.uppercase = CliUtils.convertBooleanOption(passedOptions.uppercase);
this.lowercase = CliUtils.convertBooleanOption(passedOptions.lowercase);
this.number = CliUtils.convertBooleanOption(passedOptions.number);
this.special = CliUtils.convertBooleanOption(passedOptions.special);
this.capitalize = CliUtils.convertBooleanOption(passedOptions.capitalize);
this.includeNumber = CliUtils.convertBooleanOption(passedOptions.includeNumber);
this.length = passedOptions.length != null ? parseInt(passedOptions.length, null) : 14;
this.type = passedOptions.passphrase ? "passphrase" : "password";
this.separator = passedOptions.separator == null ? "-" : passedOptions.separator + "";
this.words = passedOptions.words != null ? parseInt(passedOptions.words, null) : 3;
this.uppercase = CliUtils.convertBooleanOption(passedOptions?.uppercase);
this.lowercase = CliUtils.convertBooleanOption(passedOptions?.lowercase);
this.number = CliUtils.convertBooleanOption(passedOptions?.number);
this.special = CliUtils.convertBooleanOption(passedOptions?.special);
this.capitalize = CliUtils.convertBooleanOption(passedOptions?.capitalize);
this.includeNumber = CliUtils.convertBooleanOption(passedOptions?.includeNumber);
this.length = passedOptions?.length != null ? parseInt(passedOptions?.length, null) : 14;
this.type = passedOptions?.passphrase ? "passphrase" : "password";
this.separator = passedOptions?.separator == null ? "-" : passedOptions.separator + "";
this.words = passedOptions?.words != null ? parseInt(passedOptions.words, null) : 3;
if (!this.uppercase && !this.lowercase && !this.special && !this.number) {
this.lowercase = true;

6
src/commands/get.command.ts
View File

@ -542,8 +542,8 @@ class Options {
output: string;
constructor(passedOptions: Record<string, any>) {
this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
this.itemId = passedOptions.itemid || passedOptions.itemId;
this.output = passedOptions.output;
this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
this.itemId = passedOptions?.itemid || passedOptions?.itemId;
this.output = passedOptions?.output;
}
}

12
src/commands/list.command.ts
View File

@ -249,11 +249,11 @@ class Options {
trash: boolean;
constructor(passedOptions: Record<string, any>) {
this.organizationId = passedOptions.organizationid || passedOptions.organizationId;
this.collectionId = passedOptions.collectionid || passedOptions.collectionId;
this.folderId = passedOptions.folderid || passedOptions.folderId;
this.search = passedOptions.search;
this.url = passedOptions.url;
this.trash = CliUtils.convertBooleanOption(passedOptions.trash);
this.organizationId = passedOptions?.organizationid || passedOptions?.organizationId;
this.collectionId = passedOptions?.collectionid || passedOptions?.collectionId;
this.folderId = passedOptions?.folderid || passedOptions?.folderId;
this.search = passedOptions?.search;
this.url = passedOptions?.url;
this.trash = CliUtils.convertBooleanOption(passedOptions?.trash);
}
}

10
src/commands/send/create.command.ts
View File

@ -141,11 +141,11 @@ class Options {
hidden: boolean;
constructor(passedOptions: Record<string, any>) {
this.file = passedOptions.file;
this.text = passedOptions.text;
this.password = passedOptions.password;
this.hidden = CliUtils.convertBooleanOption(passedOptions.hidden);
this.file = passedOptions?.file;
this.text = passedOptions?.text;
this.password = passedOptions?.password;
this.hidden = CliUtils.convertBooleanOption(passedOptions?.hidden);
this.maxAccessCount =
passedOptions.maxAccessCount != null ? parseInt(passedOptions.maxAccessCount, null) : null;
passedOptions?.maxAccessCount != null ? parseInt(passedOptions.maxAccessCount, null) : null;
}
}

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

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

2
src/commands/send/list.command.ts
View File

@ -32,6 +32,6 @@ class Options {
search: string;
constructor(passedOptions: Record<string, any>) {
this.search = passedOptions.search;
this.search = passedOptions?.search;
}
}

4
src/commands/sync.command.ts
View File

@ -36,7 +36,7 @@ class Options {
force: boolean;
constructor(passedOptions: Record<string, any>) {
this.last = CliUtils.convertBooleanOption(passedOptions.last);
this.force = CliUtils.convertBooleanOption(passedOptions.force);
this.last = CliUtils.convertBooleanOption(passedOptions?.last);
this.force = CliUtils.convertBooleanOption(passedOptions?.force);
}
}

4
src/commands/unlock.command.ts
View File

@ -152,7 +152,7 @@ class Options {
passwordFile: string;
constructor(passedOptions: Record<string, any>) {
this.passwordEnv = passedOptions.passwordenv || passedOptions.passwordEnv;
this.passwordFile = passedOptions.passwordfile || passedOptions.passwordFile;
this.passwordEnv = passedOptions?.passwordenv || passedOptions?.passwordEnv;
this.passwordFile = passedOptions?.passwordfile || passedOptions?.passwordFile;
}
}

1
src/program.ts
View File

@ -480,6 +480,7 @@ export class Program extends BaseProgram {
writeLn("", true);
})
.action(async (cmd) => {
await this.exitIfNotAuthed();
const command = new ServeCommand(this.main);
await command.run(cmd);
});