From bb294ac792660c3d53defa2234d8a28bd97a622a Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Sun, 2 Jan 2022 14:12:56 +0100
Subject: [PATCH] Move ExpiryYear fieldnames to CC constants

---
 src/services/autofill.service.ts  |  9 +-----
 src/services/autofillConstants.ts | 46 +++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 134c105635..708b5f71c2 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -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],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 996ab0f654..88a6f2fe04 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -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"];