From 4e274c2f4414eb6f96385b133476431af9699cb1 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Sun, 2 Jan 2022 15:44:57 +0100
Subject: [PATCH] Move card expiry fieldnames to CC constants

---
 src/services/autofill.service.ts  |  5 +----
 src/services/autofillConstants.ts | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index a49a06f137..b893e3ceec 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -393,10 +393,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.number = f;
                     break;
                 } else if (!fillFields.exp && this.isFieldMatch(f[attr],
-                    ['cc-exp', 'card-exp', 'cc-expiration', 'card-expiration', 'cc-ex', 'card-ex',
-                        'card-expire', 'card-expiry', 'validite', 'expiration', 'expiry', 'mm-yy',
-                        'mm-yyyy', 'yy-mm', 'yyyy-mm', 'expiration-date', 'payment-card-expiration',
-                        'payment-cc-date'],
+                    CreditCardAutoFillConstants.CardExpiryFieldNames,
                     ['mm-yy', 'mm-yyyy', 'yy-mm', 'yyyy-mm', 'expiration-date',
                         'payment-card-expiration'])) {
                     fillFields.exp = f;
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 7940f2e080..6e1f87b4b7 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -76,6 +76,27 @@ export class CreditCardAutoFillConstants {
     "cb-num",
   ];
 
+  static readonly CardExpiryFieldNames: string[] = [
+    "cc-exp",
+    "card-exp",
+    "cc-expiration",
+    "card-expiration",
+    "cc-ex",
+    "card-ex",
+    "card-expire",
+    "card-expiry",
+    "validite",
+    "expiration",
+    "expiry",
+    "mm-yy",
+    "mm-yyyy",
+    "yy-mm",
+    "yyyy-mm",
+    "expiration-date",
+    "payment-card-expiration",
+    "payment-cc-date",
+  ];
+
   static readonly ExpiryMonthFieldNames: string[] = [
     "exp-month",
     "cc-exp-month",