From 741d3f8de157418f4e92fbc2f3b59036caddb1ed Mon Sep 17 00:00:00 2001
From: Toby Chui <tobychui@users.noreply.github.com>
Date: Fri, 23 Jun 2023 23:22:19 +0800
Subject: [PATCH] Minor fix to renew now function

---
 src/mod/acme/autorenew.go | 14 ++++++++++++++
 src/web/snippet/acme.html |  8 +++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/mod/acme/autorenew.go b/src/mod/acme/autorenew.go
index a7460a7..b546944 100644
--- a/src/mod/acme/autorenew.go
+++ b/src/mod/acme/autorenew.go
@@ -185,7 +185,21 @@ func (a *AutoRenewer) HandleLoadAutoRenewDomains(w http.ResponseWriter, r *http.
 }
 
 func (a *AutoRenewer) HandleRenewNow(w http.ResponseWriter, r *http.Request) {
+	renewedDomains, err := a.CheckAndRenewCertificates()
+	if err != nil {
+		utils.SendErrorResponse(w, err.Error())
+		return
+	}
 
+	message := "Domains renewed"
+	if len(renewedDomains) == 0 {
+		message = ("All certificates are up-to-date!")
+	} else {
+		message = ("The following domains have been renewed: " + strings.Join(renewedDomains, ","))
+	}
+
+	js, _ := json.Marshal(message)
+	utils.SendJSONResponse(w, string(js))
 }
 
 func (a *AutoRenewer) HandleAutoRenewEnable(w http.ResponseWriter, r *http.Request) {
diff --git a/src/web/snippet/acme.html b/src/web/snippet/acme.html
index 6cb75c4..5c801f2 100644
--- a/src/web/snippet/acme.html
+++ b/src/web/snippet/acme.html
@@ -393,10 +393,12 @@
 
     //Handle the renew now btn click
     function renewNow(){
-      alert("wip");
-      return
       $.get("/api/acme/autoRenew/renewNow", function(data){
-        alert(data);
+        if (data.error != undefined){
+          parent.msgbox(data.error, false, 6000);
+        }else{
+          parent.msgbox(data)
+        }
       })
     }