diff --git a/apps/cli/src/tools/import.command.ts b/apps/cli/src/tools/import.command.ts index c013d3c6b6..e3f24b960f 100644 --- a/apps/cli/src/tools/import.command.ts +++ b/apps/cli/src/tools/import.command.ts @@ -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"); diff --git a/apps/web/src/app/tools/import-export/import.component.ts b/apps/web/src/app/tools/import-export/import.component.ts index fb7d1d5501..de2de35777 100644 --- a/apps/web/src/app/tools/import-export/import.component.ts +++ b/apps/web/src/app/tools/import-export/import.component.ts @@ -309,7 +309,7 @@ export class ImportComponent implements OnInit, OnDestroy { } private getFileContents(file: File): Promise { - if (this.format === "1password1pux") { + if (this.format === "1password1pux" && file.name.endsWith(".1pux")) { return this.extractZipContent(file, "export.data"); } if ( diff --git a/libs/importer/src/models/import-options.ts b/libs/importer/src/models/import-options.ts index 2afe801d20..03c4e72e04 100644 --- a/libs/importer/src/models/import-options.ts +++ b/libs/importer/src/models/import-options.ts @@ -12,7 +12,7 @@ export const featuredImportOptions = [ { id: "keepass2xml", name: "KeePass 2 (xml)" }, { id: "lastpasscsv", name: "LastPass (csv)" }, { id: "safaricsv", name: "Safari and macOS (csv)" }, - { id: "1password1pux", name: "1Password (1pux)" }, + { id: "1password1pux", name: "1Password (1pux/json)" }, ] as const; export const regularImportOptions = [