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

better determine format for exp moth and year on autofill

Browse Source
This commit is contained in:
Kyle Spearrin 2019-01-14 13:37:00 -05:00
parent 5f35cc1887
commit 74e4368743
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/services/autofill.service.ts
View File

@ -446,7 +446,7 @@ export default class AutofillService implements AutofillServiceInterface {
'card-expire-mo', 'card-expiry-month', 'card-expiry-mo', 'mois-validite',
'mois-expiration', 'm-validite', 'm-expiration', 'expiry-date-field-month',
'expiration-date-month', 'expiration-date-mm', 'exp-mon', 'validity-mo',
'exp-date-mo', 'cb-date-mois'])) {
'exp-date-mo', 'cb-date-mois', 'date-m'])) {
fillFields.expMonth = f;
break;
} else if (!fillFields.expYear && this.isFieldMatch(f[attr],
@ -457,7 +457,7 @@ export default class AutofillService implements AutofillServiceInterface {
'expiry-year', 'expiry-yr', 'card-expire-year', 'card-expire-yr', 'card-expiry-year',
'card-expiry-yr', 'an-validite', 'an-expiration', 'annee-validite',
'annee-expiration', 'expiry-date-field-year', 'expiration-date-year', 'cb-date-ann',
'expiration-date-yy', 'expiration-date-yyyy', 'validity-year', 'exp-date-year'])) {
'expiration-date-yy', 'expiration-date-yyyy', 'validity-year', 'exp-date-year', 'date-y'])) {
fillFields.expYear = f;
break;
} else if (!fillFields.code && this.isFieldMatch(f[attr],
@ -477,12 +477,11 @@ export default class AutofillService implements AutofillServiceInterface {
const card = options.cipher.card;
this.makeScriptAction(fillScript, card, fillFields, filledFields, 'cardholderName');
this.makeScriptAction(fillScript, card, fillFields, filledFields, 'number');
this.makeScriptAction(fillScript, card, fillFields, filledFields, 'expYear');
this.makeScriptAction(fillScript, card, fillFields, filledFields, 'code');
this.makeScriptAction(fillScript, card, fillFields, filledFields, 'brand');
if (fillFields.expMonth && this.hasValue(card.expMonth)) {
let expMonth = card.expMonth;
let expMonth: string = card.expMonth;
if (fillFields.expMonth.selectInfo && fillFields.expMonth.selectInfo.options) {
let index: number = null;
@ -498,6 +497,8 @@ export default class AutofillService implements AutofillServiceInterface {
expMonth = option[1];
}
}
} else if (this.fieldAttrsContain(fillFields.expMonth, 'mm') && expMonth.length === 1) {
expMonth = '0' + expMonth;
}
filledFields[fillFields.expMonth.opid] = fillFields.expMonth;
@ -505,6 +506,23 @@ export default class AutofillService implements AutofillServiceInterface {
fillScript.script.push(['fill_by_opid', fillFields.expMonth.opid, expMonth]);
}
if (fillFields.expYear && this.hasValue(card.expYear)) {
let expYear: string = card.expYear;
if (this.fieldAttrsContain(fillFields.expYear, 'yyyy')) {
if (expYear.length === 2) {
expYear = '20' + expYear;
}
} else if (this.fieldAttrsContain(fillFields.expYear, 'yy')) {
if (expYear.length === 4) {
expYear = expYear.substr(2);
}
}
filledFields[fillFields.expYear.opid] = fillFields.expYear;
fillScript.script.push(['click_on_opid', fillFields.expYear.opid]);
fillScript.script.push(['fill_by_opid', fillFields.expYear.opid, expYear]);
}
if (fillFields.exp && this.hasValue(card.expMonth) && this.hasValue(card.expYear)) {
const fullMonth = ('0' + card.expMonth).slice(-2);