From: INOPIAE Date: Fri, 19 Aug 2016 13:22:27 +0000 (+0200) Subject: add: implement opt-in for notification of RA Agent X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=f315d0bca61b165008c9af84ddba648fae2361e9 add: implement opt-in for notification of RA Agent Sets the opt-in value for an RA Agent to receive a notification for every Verification he enters and sends notification if value is given. fixes issue #95 Change-Id: I4a544712831aa45b9b5ec252c79834c1f10fb179 --- diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java index b5684edd..c22fc49a 100644 --- a/src/org/cacert/gigi/database/DatabaseConnection.java +++ b/src/org/cacert/gigi/database/DatabaseConnection.java @@ -122,7 +122,7 @@ public class DatabaseConnection { } - public static final int CURRENT_SCHEMA_VERSION = 23; + public static final int CURRENT_SCHEMA_VERSION = 24; public static final int CONNECTION_TIMEOUT = 24 * 60 * 60; diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql index 947b09ed..7fbded1b 100644 --- a/src/org/cacert/gigi/database/tableStructure.sql +++ b/src/org/cacert/gigi/database/tableStructure.sql @@ -327,7 +327,7 @@ CREATE TABLE IF NOT EXISTS "arbitrations" ( DROP TABLE IF EXISTS "user_groups"; DROP TYPE IF EXISTS "userGroup"; -CREATE TYPE "userGroup" AS enum('supporter','arbitrator','blockedassuree','blockedassurer','blockedlogin','ttp-assurer','ttp-applicant', 'codesigning', 'orgassurer', 'blockedcert', 'nucleus-assurer', 'locate-agent'); +CREATE TYPE "userGroup" AS enum('supporter','arbitrator','blockedassuree','blockedassurer','blockedlogin','ttp-assurer','ttp-applicant', 'codesigning', 'orgassurer', 'blockedcert', 'nucleus-assurer', 'locate-agent', 'verify-notification'); CREATE TABLE IF NOT EXISTS "user_groups" ( "id" serial NOT NULL, @@ -374,7 +374,7 @@ CREATE TABLE "schemeVersion" ( "version" smallint NOT NULL, PRIMARY KEY ("version") ); -INSERT INTO "schemeVersion" (version) VALUES(23); +INSERT INTO "schemeVersion" (version) VALUES(24); DROP TABLE IF EXISTS `passwordResetTickets`; CREATE TABLE `passwordResetTickets` ( diff --git a/src/org/cacert/gigi/database/upgrade/from_23.sql b/src/org/cacert/gigi/database/upgrade/from_23.sql new file mode 100644 index 00000000..1f41b048 --- /dev/null +++ b/src/org/cacert/gigi/database/upgrade/from_23.sql @@ -0,0 +1 @@ +ALTER TYPE "userGroup" ADD VALUE 'verify-notification'; diff --git a/src/org/cacert/gigi/dbObjects/Group.java b/src/org/cacert/gigi/dbObjects/Group.java index d5dae430..91becaf8 100644 --- a/src/org/cacert/gigi/dbObjects/Group.java +++ b/src/org/cacert/gigi/dbObjects/Group.java @@ -18,7 +18,8 @@ public enum Group implements DBEnum { CODESIGNING("codesigning", "may issue codesigning certificates", true, false, false), // ORGASSURER("orgassurer", "may verify organisations", true, false, true), // NUCLEUS_ASSURER("nucleus-assurer", "may enter nucleus verifications", true, false, true), // - LOCATE_AGENT("locate-agent", "wants access to the locate agent system", false, true, false); + LOCATE_AGENT("locate-agent", "wants access to the locate agent system", false, true, false), // + VERIFY_NOTIFICATION("verify-notification", "wants to receive an email notification for any Verification they enter", false, true, false); private final String dbName; diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java index e853bd62..33bf674e 100644 --- a/src/org/cacert/gigi/util/Notary.java +++ b/src/org/cacert/gigi/util/Notary.java @@ -59,6 +59,8 @@ public class Notary { public static final Group ASSUREE_BLOCKED = Group.BLOCKEDASSUREE; + public static final Group VERIFY_NOTIFICATION = Group.VERIFY_NOTIFICATION; + /** * This method assures another user. * @@ -259,10 +261,15 @@ public class Notary { 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 mailVars = new HashMap<>(); mailVars.put("agent", assurer.getPreferredName().toString()); @@ -299,4 +306,27 @@ public class Notary { e.printStackTrace(); } } + + private static void sendVerificationNotificationAgent(User agent, User applicant, Name[] toVerify, final int awarded, String location, String date, Country country) { + HashMap 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(toVerify) { + + @Override + public void apply(Name t, Language l, Map vars) { + vars.put("name", t.toString()); + } + + }); + + try { + verificationAgentEntered.sendMail(Language.getInstance(applicant.getPreferredLocale()), mailVars, agent.getEmail()); + } catch (IOException e) { + e.printStackTrace(); + } + } } diff --git a/src/org/cacert/gigi/util/VerificationAgentEntered.templ b/src/org/cacert/gigi/util/VerificationAgentEntered.templ new file mode 100644 index 00000000..b66e38c8 --- /dev/null +++ b/src/org/cacert/gigi/util/VerificationAgentEntered.templ @@ -0,0 +1,12 @@ +Subject: + +, + + + + +\ + +\ + +