From 53b20d2a17495e20d247efb4cd9b021ea7fdc685 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sat, 31 Jul 2021 14:57:39 +0200
Subject: [PATCH] security/acme-client: remove obsolete account parameters

---
 security/acme-client/pkg-descr                        |  3 +++
 .../OPNsense/AcmeClient/forms/dialogAccount.xml       |  7 -------
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml | 11 -----------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index 101894d32..0e3f1c9a2 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -18,6 +18,9 @@ Changed:
 * rename "Let's Encrypt Environment" to "ACME CA" (#2361)
 * preserve old LE accounts/certs by adding a compatibility layer (#2361)
 
+Removed:
+* remove obsolete account parameters: certificateAuthority, lastUpdate
+
 2.6
 
 Added:
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAccount.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAccount.xml
index 2800717bd..b8a2e2ebb 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAccount.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAccount.xml
@@ -23,11 +23,4 @@
         <type>text</type>
         <help>Optional e-mail address for this account.</help>
     </field>
-    <field>
-        <id>account.certificateAuthority</id>
-        <label>Certificate Authority</label>
-        <type>dropdown</type>
-        <help><![CDATA[Select the certificate authority for this account.]]></help>
-        <advanced>true</advanced>
-    </field>
 </form>
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
index 5f0c4fd6c..99247de8f 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
@@ -144,21 +144,10 @@
                 <email type="EmailField">
                     <Required>N</Required>
                 </email>
-                <certificateAuthority type="OptionField">
-                    <Required>Y</Required>
-                    <default>letsencrypt</default>
-                    <OptionValues>
-                        <letsencrypt>Let's Encrypt CA</letsencrypt>
-                    </OptionValues>
-                </certificateAuthority>
                 <!-- hidden field; the private key for this account -->
                 <key type="TextField">
                     <Required>N</Required>
                 </key>
-                <!-- TODO: old value that was migrated to statusLastUpdate, should be removed -->
-                <lastUpdate type="IntegerField">
-                    <Required>N</Required>
-                </lastUpdate>
                 <!-- hidden field; status of last operation -->
                 <statusCode type="IntegerField">
                     <Required>N</Required>