Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-14 10:26:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix totp import on Dashlane csv importer (#11747)

Browse Source 
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
Daniel James Smith 2024-11-13 15:11:53 +01:00 committed by GitHub
parent 88cbee9b0a
commit 913f109ffa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/importer/spec/dashlane-csv-importer.spec.ts
View File

@ -2,6 +2,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
import { DashlaneCsvImporter } from "../src/importers";
import { credentialsData_otpUrl } from "./test-data/dashlane-csv/credentials-otpurl.csv";
import { credentialsData } from "./test-data/dashlane-csv/credentials.csv";
import { identityData } from "./test-data/dashlane-csv/id.csv";
import { multiplePersonalInfoData } from "./test-data/dashlane-csv/multiple-personal-info.csv";
@ -30,6 +31,14 @@ describe("Dashlane CSV Importer", () => {
expect(cipher.notes).toEqual("some note for example.com");
});
it("should parse login with totp when given otpUrl instead of otpSecret", async () => {
const result = await importer.parse(credentialsData_otpUrl);
expect(result != null).toBe(true);
const cipher = result.ciphers.shift();
expect(cipher.login.totp).toEqual("anotherTOTPSeed");
});
it("should parse an item and create a folder", async () => {
const result = await importer.parse(credentialsData);

2
libs/importer/spec/test-data/dashlane-csv/credentials-otpurl.csv.ts Normal file
View File

@ -0,0 +1,2 @@
export const credentialsData_otpUrl = `username,username2,username3,title,password,note,url,category,otpUrl
jdoe,,,example.com,somePassword,some note for example.com,https://www.example.com,Entertainment,anotherTOTPSeed`;

2
libs/importer/src/importers/dashlane/dashlane-csv-importer.ts
View File

@ -119,7 +119,7 @@ export class DashlaneCsvImporter extends BaseImporter implements Importer {
cipher.notes = row.note;
cipher.login.username = row.username;
cipher.login.password = row.password;
cipher.login.totp = row.otpSecret;
cipher.login.totp = Object.keys(row).includes("otpUrl") ? row.otpUrl : row.otpSecret;
cipher.login.uris = this.makeUriArray(row.url);
this.importUnmappedFields(cipher, row, _mappedCredentialsColumns);

3
libs/importer/src/importers/dashlane/types/dashlane-csv-types.ts
View File

@ -8,7 +8,8 @@ export class CredentialsRecord {
note: string;
url: string;
category: string;
otpSecret: string;
otpSecret?: string;
otpUrl?: string; // Likely introduced by Dashlane as a replacement for `otpSecret`
}
export class PaymentsRecord {