slightly less fuzzy logic

bitwarden · Feb 10, 2025 · 7e37da8 · 7e37da8
1 parent 142c24b
commit 7e37da8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/libs/importer/src/importers/msecure-csv-importer.spec.ts b/libs/importer/src/importers/msecure-csv-importer.spec.ts
@@ -22,6 +22,7 @@ describe("MSecureCsvImporter.parse", () => {
     expect(cipher.card.expiration).toBe("04 / 2029");
     expect(cipher.card.code).toBe("444");
     expect(cipher.card.cardholderName).toBe("Obi Wan Kenobi");
+    expect(cipher.notes).toBe("Security code 1234");
     expect(cipher.card.brand).toBe("");
   });
 

diff --git a/libs/importer/src/importers/msecure-csv-importer.ts b/libs/importer/src/importers/msecure-csv-importer.ts
@@ -43,26 +43,27 @@ export class MSecureCsvImporter extends BaseImporter implements Importer {
         ).split("/");
         cipher.card.expMonth = month.trim();
         cipher.card.expYear = year.trim();
-        const securityCodeRegex = RegExp("^Security Code\\|.*\\|");
+        const securityCodeRegex = RegExp("^Security Code\\|\\d*\\|");
         const securityCodeEntry = value.find((entry: string) => securityCodeRegex.test(entry));
         cipher.card.code = this.getValueOrDefault(
           this.splitValueRetainingLastPart(securityCodeEntry),
         );
 
-        const cardNameRegex = RegExp("^Name on Card\\|.*\\|");
+        const cardNameRegex = RegExp("^Name on Card\\|\\d*\\|");
         const nameOnCardEntry = value.find((entry: string) => entry.match(cardNameRegex));
         cipher.card.cardholderName = this.getValueOrDefault(
           this.splitValueRetainingLastPart(nameOnCardEntry),
         );
 
         cipher.card.brand = this.getValueOrDefault(this.splitValueRetainingLastPart(value[9]), "");
 
+        const noteRegex = RegExp("\\|\\d*\\|");
         const rawNotes = value
           .slice(2)
-          .filter((entry: string) => !this.isNullOrWhitespace(entry) && !entry.includes("|"));
+          .filter((entry: string) => !this.isNullOrWhitespace(entry) && !noteRegex.test(entry));
         const noteIndexes = [8, 10, 11];
         const indexedNotes = noteIndexes
-          .filter((idx) => value[idx] && value[idx].includes("|"))
+          .filter((idx) => value[idx] && noteRegex.test(value[idx]))
           .map((idx) => value[idx])
           .map((val) => {
             const key = val.split("|")[0];