Move ExpiryYear fieldnames to CC constants

This commit is contained in:
Daniel James Smith 2022-01-02 14:12:56 +01:00
parent 8992f348d2
commit bb294ac792
No known key found for this signature in database
GPG Key ID: 03E4BD365FF06726
2 changed files with 47 additions and 8 deletions

View File

@ -407,14 +407,7 @@ export default class AutofillService implements AutofillServiceInterface {
fillFields.expMonth = f;
break;
} else if (!fillFields.expYear && this.isFieldMatch(f[attr],
['exp-year', 'cc-exp-year', 'cc-year', 'card-year', 'cc-yr', 'card-yr', 'exp-yr',
'card-exp-yr', 'cc-exp-yr', 'card-expiration-year', 'expiration-year',
'cc-yy', 'cc-y', 'card-yy', 'card-y', 'card-exp-yy', 'cc-exp-yy', 'exp-yy', 'exp-y',
'cc-yyyy', 'card-yyyy', 'card-exp-yyyy', 'cc-exp-yyyy', 'expire-year', 'expire-yr',
'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', 'date-y'])) {
CreditCardAutoFillConstants.ExpiryYearFieldNames)) {
fillFields.expYear = f;
break;
} else if (!fillFields.code && this.isFieldMatch(f[attr],

View File

@ -92,6 +92,52 @@ export class CreditCardAutoFillConstants {
"date-m",
];
static readonly ExpiryYearFieldNames: string[] = [
"exp-year",
"cc-exp-year",
"cc-year",
"card-year",
"cc-yr",
"card-yr",
"exp-yr",
"card-exp-yr",
"cc-exp-yr",
"card-expiration-year",
"expiration-year",
"cc-yy",
"cc-y",
"card-yy",
"card-y",
"card-exp-yy",
"cc-exp-yy",
"exp-yy",
"exp-y",
"cc-yyyy",
"card-yyyy",
"card-exp-yyyy",
"cc-exp-yyyy",
"expire-year",
"expire-yr",
"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",
"date-y",
];
// Each index represents a language. These three arrays should all be the same length.
// 0: English, 1: Danish, 2: German/Dutch, 3: French/Spanish/Italian, 4: Russian, 5: Portuguese
static readonly MonthAbbr = ["mm", "mm", "mm", "mm", "mm", "mm"];