From: Marcus Mängel <m.maengel@inopiae.de>
Date: Thu, 19 Mar 2020 05:59:59 +0000 (+0000)
Subject: Merge "upd: redesign of find cert result page"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=2549d4ce76e9ada84a550795554d3376d42c634a;hp=7a5f2a2674900b80847ab77bb1ace1b53215f4b9

Merge "upd: redesign of find cert result page"
---

diff --git a/src/club/wpia/gigi/pages/admin/support/FindCertPage.java b/src/club/wpia/gigi/pages/admin/support/FindCertPage.java
index ea5ac1e9..19064a66 100644
--- a/src/club/wpia/gigi/pages/admin/support/FindCertPage.java
+++ b/src/club/wpia/gigi/pages/admin/support/FindCertPage.java
@@ -57,8 +57,8 @@ public class FindCertPage extends Page {
 
                     @Override
                     public void apply(Certificate t, Language l, Map<String, Object> vars) {
-                        vars.put("id", t.getId());
                         vars.put("serial", t.getSerial());
+                        vars.put("draftinfo", t.getStatus() == CertificateStatus.DRAFT ? l.getTranslation("Draft") : "");
 
                         if (t.getStatus() == CertificateStatus.REVOKED) {
                             vars.put("revoked", t.getRevocationDate());
diff --git a/src/club/wpia/gigi/pages/admin/support/FindCertPage.templ b/src/club/wpia/gigi/pages/admin/support/FindCertPage.templ
index 0e0fa25b..1648f0dd 100644
--- a/src/club/wpia/gigi/pages/admin/support/FindCertPage.templ
+++ b/src/club/wpia/gigi/pages/admin/support/FindCertPage.templ
@@ -1,11 +1,10 @@
 <p><?=_Multiple certificates?>: <?=$limit?></p>
 <table class="table">
 <tr>
-<th>Id</th><th><?=_Serial number?></th><th><?=_SAN?></th><th><?=_Revocation Date?></th></tr>
+<th><?=_Serial number?></th><th><?=_SAN?></th><th><?=_Revocation Date?></th></tr>
 <? foreach($certtable) {?>
   <tr>
-    <td><a href="/support/certs/<?=$serial?>"><?=$id?></a></td>
-    <td><a href="/support/certs/<?=$serial?>"><?=$serial?></a></td>
+    <td><a href="/support/certs/<?=$serial?>"><?=$serial?></a> <?=$draftinfo?></td>
     <td>
     <? foreach($san) {?>
        <?=$entry?>
diff --git a/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
index cf9b403b..0d556419 100644
--- a/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
+++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
@@ -1,5 +1,6 @@
 package club.wpia.gigi.pages.admin;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
@@ -89,6 +90,24 @@ public class TestSEAdminPageCertSearch extends SEClientTest {
         assertThat(result, CoreMatchers.containsString("N/A"));
     }
 
+    @Test
+    public void testShowDraft() throws GeneralSecurityException, IOException, GigiApiException, InterruptedException {
+        KeyPair kp = generateKeypair();
+        String key = generatePEMCSR(kp, "CN=" + certMail);
+        Certificate c1 = new Certificate(u, u, Certificate.buildDN("CN", certMail), Digest.SHA512, key, CSRType.CSR, getClientProfile(), new Certificate.SubjectAlternateName(SANType.EMAIL, certMail));
+        URLConnection uc = post(cookie, FindCertPage.PATH, "certType=email&process=Next&cert=" + URLEncoder.encode(certMail, "UTF-8"), 0);
+        String result = IOUtils.readURL(uc);
+        assertThat(result, CoreMatchers.containsString(c.getSerial()));
+        assertThat(result, CoreMatchers.containsString("Draft"));
+
+        await(c1.issue(null, "2y", u));
+        uc = post(cookie, FindCertPage.PATH, "certType=email&process=Next&cert=" + URLEncoder.encode(certMail, "UTF-8"), 0);
+        result = IOUtils.readURL(uc);
+        assertThat(result, CoreMatchers.containsString(c.getSerial()));
+        assertThat(result, CoreMatchers.containsString(c1.getSerial()));
+        assertThat(result, not(CoreMatchers.containsString("Draft")));
+    }
+
     private Certificate createCertificate() throws GeneralSecurityException, IOException, GigiApiException, InterruptedException {
         User u1 = User.getById(id);
         KeyPair kp = generateKeypair();