From ed25316489292232b6711078d4c463cf57bf0a4a Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 3 Jan 2022 00:35:35 +0100
Subject: [PATCH] security/acme-client: show CA in accounts list

---
 security/acme-client/pkg-descr                              | 6 ++++++
 .../OPNsense/AcmeClient/Api/AccountsController.php          | 2 +-
 .../mvc/app/views/OPNsense/AcmeClient/accounts.volt         | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index d679217f4..d7c904fdb 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -16,6 +16,12 @@ a new version of acme.sh, which has not been released yet.
 Added:
 * add support for cPanel HTTP API (#2731)
 
+Fixed:
+* fix calculation of renewal date (#2721)
+
+Changed:
+* show CA in accounts list
+
 3.7
 
 Fixed:
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php
index ef6dfbf2d..922850399 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php
@@ -74,7 +74,7 @@ class AccountsController extends ApiMutableModelControllerBase
 
     public function searchAction()
     {
-        return $this->searchBase('accounts.account', array('enabled', 'name', 'email', 'statusCode', 'statusLastUpdate'), 'name');
+        return $this->searchBase('accounts.account', array('enabled', 'name', 'email', 'ca', 'statusCode', 'statusLastUpdate'), 'name');
     }
 
     /**
diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt
index d9e417ebd..ec20a20e8 100644
--- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt
+++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt
@@ -359,6 +359,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 <th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
                 <th data-column-id="name" data-type="string">{{ lang._('Name') }}</th>
                 <th data-column-id="email" data-type="string">{{ lang._('E-Mail') }}</th>
+                <th data-column-id="ca" data-type="string">{{ lang._('CA') }}</th>
                 <th data-column-id="statusCode" data-type="string" data-formatter="accountstatus">{{ lang._('Status') }}</th>
                 <th data-column-id="statusLastUpdate" data-type="string" data-formatter="acmestatusdate">{{ lang._('Registration Date') }}</th>
                 <th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>