import org.cacert.gigi.database.GigiPreparedStatement;
import org.cacert.gigi.database.GigiResultSet;
import org.cacert.gigi.dbObjects.Assurance.AssuranceType;
+import org.cacert.gigi.dbObjects.Country;
import org.cacert.gigi.dbObjects.Group;
import org.cacert.gigi.dbObjects.Name;
import org.cacert.gigi.dbObjects.User;
try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` where `to`=? and `from`=? and `method` = ? ::`notaryType` AND `deleted` IS NULL AND `when` > (now() - interval '1 days' * ?)")) {
ps.setInt(1, target.getId());
ps.setInt(2, assurer.getId());
- ps.setString(3, AssuranceType.FACE_TO_FACE.getDescription());
+ ps.setEnum(3, AssuranceType.FACE_TO_FACE);
ps.setInt(4, LIMIT_DAYS_VERIFICATION);
GigiResultSet rs = ps.executeQuery();
return !rs.next();
}
}
- public static final Group ASSURER_BLOCKED = Group.getByString("blockedassurer");
+ public static final Group ASSURER_BLOCKED = Group.BLOCKEDASSURER;
- public static final Group ASSUREE_BLOCKED = Group.getByString("blockedassuree");
+ public static final Group ASSUREE_BLOCKED = Group.BLOCKEDASSUREE;
+
+ public static final Group VERIFY_NOTIFICATION = Group.VERIFY_NOTIFICATION;
/**
* This method assures another user.
* @throws GigiApiException
* if the assurance fails (for various reasons)
*/
- public synchronized static void assure(User assurer, User assuree, Name assureeName, DayDate dob, int awarded, String location, String date, AssuranceType type) throws GigiApiException {
+ public synchronized static void assure(User assurer, User assuree, Name assureeName, DayDate dob, int awarded, String location, String date, AssuranceType type, Country country) throws GigiApiException {
may(assurer, assuree, AssuranceType.FACE_TO_FACE);
GigiApiException gae = new GigiApiException();
if ( !gae.isEmpty()) {
} else if (location.length() <= 2) {
gae.mergeInto(new GigiApiException("You must enter a location with at least 3 characters eg town and country."));
}
+
+ if (country == null) {
+ gae.mergeInto(new GigiApiException("You failed to enter the country of your meeting."));
+ }
+
synchronized (assuree) {
if (assurer.getId() == assuree.getId()) {
throw new GigiApiException("You cannot verify yourself.");
}
if (type == AssuranceType.FACE_TO_FACE) {
- assureF2F(assurer, assuree, assureeName, awarded, location, date);
+ assureF2F(assurer, assuree, assureeName, awarded, location, date, country);
} else if (type == AssuranceType.NUCLEUS) {
- assureNucleus(assurer, assuree, assureeName, awarded, location, date);
+ assureNucleus(assurer, assuree, assureeName, awarded, location, date, country);
} else if (type == AssuranceType.TTP_ASSISTED) {
- assureTTP(assurer, assuree, assureeName, awarded, location, date);
+ assureTTP(assurer, assuree, assureeName, awarded, location, date, country);
} else {
throw new GigiApiException(SprintfCommand.createSimple("Unknown Verification type: {0}", type.toString()));
}
}
}
- private static void assureF2F(User assurer, User assuree, Name name, int awarded, String location, String date) throws GigiApiException {
+ private static void assureF2F(User assurer, User assuree, Name name, int awarded, String location, String date, Country country) throws GigiApiException {
may(assurer, assuree, AssuranceType.FACE_TO_FACE);
- try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?")) {
ps.setInt(1, assurer.getId());
ps.setInt(2, name.getId());
ps.setInt(3, awarded);
ps.setString(4, location);
ps.setString(5, date);
+ ps.setString(6, country.getCode());
ps.execute();
}
}
- private static void assureTTP(User assurer, User assuree, Name name, int awarded, String location, String date) throws GigiApiException {
+ private static void assureTTP(User assurer, User assuree, Name name, int awarded, String location, String date, Country country) throws GigiApiException {
may(assurer, assuree, AssuranceType.TTP_ASSISTED);
- try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `method`='TTP-Assisted'")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?, `method`='TTP-Assisted'")) {
ps.setInt(1, assurer.getId());
ps.setInt(2, name.getId());
ps.setInt(3, awarded);
ps.setString(4, location);
ps.setString(5, date);
+ ps.setString(6, country.getCode());
ps.execute();
assuree.revokeGroup(assurer, Group.TTP_APPLICANT);
}
throw new GigiApiException("Verification type not possible.");
}
- private static void assureNucleus(User assurer, User assuree, Name name, int awarded, String location, String date) throws GigiApiException {
+ private static void assureNucleus(User assurer, User assuree, Name name, int awarded, String location, String date, Country country) throws GigiApiException {
may(assurer, assuree, AssuranceType.NUCLEUS);
// Do up to 35 points as f2f
int f2fPoints = Math.min(assurer.getMaxAssurePoints(), awarded);
- assureF2F(assurer, assuree, name, f2fPoints, location, date);
+ assureF2F(assurer, assuree, name, f2fPoints, location, date, country);
awarded -= f2fPoints;
if (awarded <= 0) {
// Assure remaining points as "Nucleus Bonus"
// Valid for 4 Weeks = 28 days
- try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `method`='Nucleus Bonus', `expire` = CURRENT_TIMESTAMP + interval '28 days'")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `country`=?, `method`='Nucleus Bonus', `expire` = CURRENT_TIMESTAMP + interval '28 days'")) {
ps.setInt(1, assurer.getId());
ps.setInt(2, name.getId());
ps.setInt(3, awarded);
ps.setString(4, location);
ps.setString(5, date);
+ ps.setString(6, country.getCode());
ps.execute();
}
}
- public synchronized static void assureAll(User assurer, User assuree, DayDate dob, int awarded, String location, String date, AssuranceType type, Name[] toAssure) throws GigiApiException {
+ public synchronized static void assureAll(User assurer, User assuree, DayDate dob, int awarded, String location, String date, AssuranceType type, Name[] toAssure, Country country) throws GigiApiException {
if (toAssure.length == 0) {
throw new GigiApiException("You must confirm at least one name to verify an account.");
}
for (int i = 0; i < toAssure.length; i++) {
hadLessThan50Points[i] = toAssure[i].getAssurancePoints() < 50;
- assure(assurer, assuree, toAssure[i], dob, awarded, location, date, type);
+ assure(assurer, assuree, toAssure[i], dob, awarded, location, date, type, country);
}
sendVerificationNotificationApplicant(assurer, assuree, toAssure, awarded, hadLessThan50Points, hadTotalLessThan100);
+ if (assurer.isInGroup(VERIFY_NOTIFICATION)) {
+ sendVerificationNotificationAgent(assurer, assuree, toAssure, awarded, location, date, country);
+ }
}
private static final MailTemplate verificationEntered = new MailTemplate(Notary.class.getResource("VerificationEntered.templ"));
+ private static final MailTemplate verificationAgentEntered = new MailTemplate(Notary.class.getResource("VerificationAgentEntered.templ"));
+
private static void sendVerificationNotificationApplicant(User assurer, User assuree, Name[] toAssure, final int awarded, final boolean[] hadLessThan50Points, boolean hadTotalLessThan100) {
HashMap<String, Object> mailVars = new HashMap<>();
mailVars.put("agent", assurer.getPreferredName().toString());
e.printStackTrace();
}
}
+
+ private static void sendVerificationNotificationAgent(User agent, User applicant, Name[] toVerify, final int awarded, String location, String date, Country country) {
+ HashMap<String, Object> mailVars = new HashMap<>();
+ mailVars.put("email", applicant.getEmail());
+ mailVars.put("location", location);
+ mailVars.put("date", date);
+ mailVars.put("country", country.getName());
+ mailVars.put("points", Integer.toString(awarded));
+ mailVars.put("names", new ArrayIterable<Name>(toVerify) {
+
+ @Override
+ public void apply(Name t, Language l, Map<String, Object> vars) {
+ vars.put("name", t.toString());
+ }
+
+ });
+
+ try {
+ verificationAgentEntered.sendMail(Language.getInstance(applicant.getPreferredLocale()), mailVars, agent.getEmail());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
projects / gigi.git / blobdiff