UPD: cleanup notary-assurance API

[gigi.git] / src / org / cacert / gigi / pages / wot / AssuranceForm.java

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 3368414af45443bbe88519beecc833b05fdc9bbe..bb378dfb8e3b41bc70e180ea94fac404ffab733e 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -2,21 +2,19 @@ package org.cacert.gigi.pages.wot;
 
 import java.io.PrintWriter;
 import java.sql.SQLException;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.Notary;
-import org.cacert.gigi.util.Notary.AssuranceResult;
 
 public class AssuranceForm extends Form {
 
@@ -58,40 +56,28 @@ public class AssuranceForm extends Form {
             outputError(out, req, "You failed to check all boxes to validate" + " your adherence to the rules and policies of CAcert");
 
         }
-        if (req.getParameter("date") == null || req.getParameter("date").equals("")) {
-            outputError(out, req, "You must enter the date when you met the assuree.");
-        } else {
-            try {
-                Date d = sdf.parse(req.getParameter("date"));
-                if (d.getTime() > System.currentTimeMillis()) {
-                    outputError(out, req, "You must not enter a date in the future.");
-                }
-            } catch (ParseException e) {
-                outputError(out, req, "You must enter the date in this format: YYYY-MM-DD.");
-            }
-        }
-        // check location, min 3 characters
-        if (req.getParameter("location") == null || req.getParameter("location").equals("")) {
-            outputError(out, req, "You failed to enter a location of your meeting.");
-        } else if (req.getParameter("location").length() <= 2) {
-            outputError(out, req, "You must enter a location with at least 3 characters eg town and country.");
-        }
-        // TODO checkPoints
+        int pointsI = 0;
         String points = req.getParameter("points");
         if (points == null || "".equals(points)) {
             outputError(out, req, "For an assurance, you need to enter points.");
+        } else {
+            try {
+                pointsI = Integer.parseInt(points);
+            } catch (NumberFormatException e) {
+                outputError(out, req, "The points entered were not a number.");
+            }
         }
+
         if (isFailed(out)) {
             return false;
         }
         try {
-            AssuranceResult success = Notary.assure(Page.getUser(req), assuree, Integer.parseInt(req.getParameter("points")), req.getParameter("location"), req.getParameter("date"));
-            if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
-                outputError(out, req, success.getMessage());
-            }
-            return success == AssuranceResult.ASSURANCE_SUCCEDED;
+            Notary.assure(Page.getUser(req), assuree, pointsI, req.getParameter("location"), req.getParameter("date"));
+            return true;
         } catch (SQLException e) {
             e.printStackTrace();
+        } catch (GigiApiException e) {
+            e.format(out, Page.getLanguage(req));
         }
 
         return false;