upd: make verification processes more consistent on failure

[gigi.git] / src / org / cacert / gigi / pages / Verify.java

diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/org/cacert/gigi/pages/Verify.java
index cdcf490fa01cb58d29d497b0e1c15055d65c310c..2b4cd82605cfe2ffc62fa76b2cde50e489717ad0 100644 (file)
--- a/src/org/cacert/gigi/pages/Verify.java
+++ b/src/org/cacert/gigi/pages/Verify.java
@@ -2,6 +2,7 @@ package org.cacert.gigi.pages;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -14,9 +15,15 @@ import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Verifyable;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.Scope;
+import org.cacert.gigi.output.template.SprintfCommand;
 
 public class Verify extends Page {
 
+    private static final SprintfCommand emailAddressVerified = new SprintfCommand("Email address {0} verified", Arrays.asList("${subject}"));
+
+    private static final SprintfCommand domainVerified = new SprintfCommand("Domain {0} verified", Arrays.asList("${subject}"));
+
     private class VerificationForm extends Form {
 
         private String hash;
@@ -27,40 +34,47 @@ public class Verify extends Page {
 
         private Verifyable target;
 
+        String subject;
+
         public VerificationForm(HttpServletRequest hsr) {
             super(hsr, PATH);
             hash = hsr.getParameter("hash");
             type = hsr.getParameter("type");
             id = hsr.getParameter("id");
             if ("email".equals(type)) {
-                target = EmailAddress.getById(Integer.parseInt(id));
-            } else if ("domain".equals("type")) {
-                target = Domain.getById(Integer.parseInt(id));
+                EmailAddress addr = EmailAddress.getById(Integer.parseInt(id));
+                subject = addr.getAddress();
+                target = addr;
+            } else if ("domain".equals(type)) {
+                Domain domain = Domain.getById(Integer.parseInt(id));
+                subject = domain.getSuffix();
+                target = domain;
+            } else {
+                throw new IllegalArgumentException();
             }
         }
 
         @Override
-        public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+        public SubmissionResult submit(HttpServletRequest req) throws GigiApiException {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("subject", subject);
             if ("email".equals(type)) {
                 try {
                     target.verify(hash);
-                    out.println("Email verification completed.");
                 } catch (IllegalArgumentException e) {
-                    out.println(translate(req, "The email address is invalid."));
-                } catch (GigiApiException e) {
-                    e.format(out, getLanguage(req));
+                    throw new PermamentFormException(new GigiApiException("Given token could not be found to complete the verification process (Email Ping)."));
                 }
+                return new SuccessMessageResult(new Scope(emailAddressVerified, data));
             } else if ("domain".equals(type)) {
                 try {
                     target.verify(hash);
-                    out.println("Domain verification completed.");
                 } catch (IllegalArgumentException e) {
-                    out.println(translate(req, "The domain is invalid."));
-                } catch (GigiApiException e) {
-                    e.format(out, getLanguage(req));
+                    throw new PermamentFormException(new GigiApiException("Given token could not be found to complete the verification process (Domain Ping)."));
                 }
+                return new SuccessMessageResult(new Scope(domainVerified, data));
+            } else {
+                throw new GigiApiException("Invalid object type.");
             }
-            return true;
         }
 
         @Override
@@ -68,11 +82,8 @@ public class Verify extends Page {
             vars.put("hash", hash);
             vars.put("id", id);
             vars.put("type", type);
-            if (target instanceof EmailAddress) {
-                vars.put("subject", ((EmailAddress) target).getAddress());
-            } else if (target instanceof Domain) {
-                vars.put("subject", ((Domain) target).getSuffix());
-            }
+
+            vars.put("subject", subject);
             getDefaultTemplate().output(out, l, vars);
         }
     }
@@ -88,13 +99,15 @@ public class Verify extends Page {
         return false;
     }
 
+    @Override
+    public boolean beforePost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        return Form.getForm(req, VerificationForm.class).submitExceptionProtected(req, resp);
+    }
+
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        try {
-            if (Form.getForm(req, VerificationForm.class).submit(resp.getWriter(), req)) {
-            }
-        } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
+        if (Form.printFormErrors(req, resp.getWriter())) {
+            Form.getForm(req, VerificationForm.class).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
         }
     }
 
@@ -104,7 +117,6 @@ public class Verify extends Page {
             new VerificationForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
         } catch (IllegalArgumentException e) {
             resp.getWriter().println(translate(req, "The object to verify is invalid."));
-
         }
     }