bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 02:33:46 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/flexible-collections

Browse Source
This commit is contained in:
Vincent Salucci
2023-09-19 15:41:56 -05:00
parent ef2b8506c2 621ffa01aa
commit d46cec81d8
18 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cli/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@bitwarden/cli",
"description": "A secure and free password manager for all of your devices.",
"version": "2023.8.2",
"version": "2023.9.0",
"keywords": [
"bitwarden",
"password",

2
apps/cli/src/tools/import.command.ts
View File

@@ -66,7 +66,7 @@ export class ImportCommand {
try {
let contents;
if (format === "1password1pux") {
if (format === "1password1pux" && filepath.endsWith(".1pux")) {
contents = await CliUtils.extractZipContent(filepath, "export.data");
} else if (format === "protonpass" && filepath.endsWith(".zip")) {
contents = await CliUtils.extractZipContent(filepath, "Proton Pass/data.json");