bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

[PM-2256] Fix importer parsing credit card expiry year (#5444)

Browse Source 
* Fix importer parsing credit card expiry year

When importing a credit card from Enpass it was found that with a 4
digit expiry year was prefixed with '20', stored at 11/202025 instead of
11/2025.

Fixed typo that checked length of month instead of year which
incorrectly added prefix.

* Refactor setCardExpiration to use RegExp
This commit is contained in:
Calum Lind
2023-05-31 09:08:39 +01:00
committed by GitHub
parent 2d9fdd68da
commit 3f35b78b40
4 changed files with 128 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libs/importer/src/importers/base-importer.ts
View File

@@ -305,29 +305,26 @@ export abstract class BaseImporter {
}
protected setCardExpiration(cipher: CipherView, expiration: string): boolean {
if (!this.isNullOrWhitespace(expiration)) {
expiration = expiration.replace(/\s/g, "");
const parts = expiration.split("/");
if (parts.length === 2) {
let month: string = null;
let year: string = null;
if (parts[0].length === 1 || parts[0].length === 2) {
month = parts[0];
if (month.length === 2 && month[0] === "0") {
month = month.substr(1, 1);
}
}
if (parts[1].length === 2 || parts[1].length === 4) {
year = month.length === 2 ? "20" + parts[1] : parts[1];
}
if (month != null && year != null) {
cipher.card.expMonth = month;
cipher.card.expYear = year;
return true;
}
}
if (this.isNullOrWhitespace(expiration)) {
return false;
}
return false;
expiration = expiration.replace(/\s/g, "");
const monthRegex = "0?(?<month>[1-9]|1[0-2])";
const yearRegex = "(?<year>(?:[1-2][0-9])?[0-9]{2})";
const expiryRegex = new RegExp(`^${monthRegex}/${yearRegex}$`);
const expiryMatch = expiration.match(expiryRegex);
if (!expiryMatch) {
return false;
}
cipher.card.expMonth = expiryMatch.groups.month;
const year: string = expiryMatch.groups.year;
cipher.card.expYear = year.length === 2 ? "20" + year : year;
return true;
}
protected moveFoldersToCollections(result: ImportResult) {