From d5b3e5314033ee9fede6795d3fc10ddd899c4705 Mon Sep 17 00:00:00 2001
From: Will Rouesnel <wrouesnel@wrouesnel.com>
Date: Thu, 25 May 2023 00:37:27 +1000
Subject: [PATCH] Add frontend support for the new clientca type

The frontend is modified to filter certificates from selector lists
so only non-clientca certificate types can be set as server certificates.
---
 frontend/js/app/api.js                    | 31 +++++++++++++++++++++++
 frontend/js/app/nginx/dead/form.js        |  2 +-
 frontend/js/app/nginx/proxy/form.js       |  2 +-
 frontend/js/app/nginx/redirection/form.js |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/frontend/js/app/api.js b/frontend/js/app/api.js
index 6e33a6dc..10fe7213 100644
--- a/frontend/js/app/api.js
+++ b/frontend/js/app/api.js
@@ -632,6 +632,37 @@ module.exports = {
                 return getAllObjects('nginx/certificates', expand, query);
             },
 
+            /**
+             * Retrieve all certificates which have a type suitable for use as
+             * server certificates. This filters by provider for returned rows.
+             *
+             * @param   {Array}    [expand]
+             * @param   {String}   [query]
+             * @returns {Promise}
+             */
+            getAllServerCertificates: function (expand, query) {
+                return getAllObjects('nginx/certificates', expand, query)
+                  .then(rows => {
+                      return rows.filter( row => row.provider !== 'clientca' );
+                  })
+            },
+
+            /**
+             * Retrieve all certificates which have a type suitable for use as
+             * client authentication certificates. This filters by provider for
+             * returned rows.
+             *
+             * @param   {Array}    [expand]
+             * @param   {String}   [query]
+             * @returns {Promise}
+             */
+            getAllClientCertificates: function (expand, query) {
+                return getAllObjects('nginx/certificates', expand, query)
+                  .then(rows => {
+                      return rows.filter( row => row.provider === 'clientca' );
+                  })
+            },
+
             /**
              * @param {Object}  data
              */
diff --git a/frontend/js/app/nginx/dead/form.js b/frontend/js/app/nginx/dead/form.js
index 8f6774f6..52f54c10 100644
--- a/frontend/js/app/nginx/dead/form.js
+++ b/frontend/js/app/nginx/dead/form.js
@@ -263,7 +263,7 @@ module.exports = Mn.View.extend({
                 }
             },
             load:             function (query, callback) {
-                App.Api.Nginx.Certificates.getAll()
+                App.Api.Nginx.Certificates.getAllServerCertificates()
                     .then(rows => {
                         callback(rows);
                     })
diff --git a/frontend/js/app/nginx/proxy/form.js b/frontend/js/app/nginx/proxy/form.js
index 1dfb5c18..eb786251 100644
--- a/frontend/js/app/nginx/proxy/form.js
+++ b/frontend/js/app/nginx/proxy/form.js
@@ -331,7 +331,7 @@ module.exports = Mn.View.extend({
                 }
             },
             load:             function (query, callback) {
-                App.Api.Nginx.Certificates.getAll()
+                App.Api.Nginx.Certificates.getAllServerCertificates()
                     .then(rows => {
                         callback(rows);
                     })
diff --git a/frontend/js/app/nginx/redirection/form.js b/frontend/js/app/nginx/redirection/form.js
index 1f81feeb..4e292e53 100644
--- a/frontend/js/app/nginx/redirection/form.js
+++ b/frontend/js/app/nginx/redirection/form.js
@@ -265,7 +265,7 @@ module.exports = Mn.View.extend({
                 }
             },
             load:             function (query, callback) {
-                App.Api.Nginx.Certificates.getAll()
+                App.Api.Nginx.Certificates.getAllServerCertificates()
                     .then(rows => {
                         callback(rows);
                     })