#504 mailgun: add eu region toggle/switch to v3 api

alfio-event · Sep 13, 2018 · e9090aa · e9090aa
1 parent 108f448
commit e9090aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/alfio/manager/system/MailgunMailer.java b/src/main/java/alfio/manager/system/MailgunMailer.java
@@ -94,14 +94,16 @@ public void send(Event event, String to, List<String> cc, String subject, String
 
         String apiKey = configurationManager.getRequiredValue(Configuration.from(event.getOrganizationId(), event.getId(), MAILGUN_KEY));
         String domain = configurationManager.getRequiredValue(Configuration.from(event.getOrganizationId(), event.getId(), MAILGUN_DOMAIN));
+        boolean useEU = configurationManager.getBooleanConfigValue(Configuration.from(event.getOrganizationId(), event.getId(), MAILGUN_EU), false);
 
+        String baseUrl = useEU ? "https://api.eu.mailgun.net/v3/" : "https://api.mailgun.net/v3/";
         try {
 
             RequestBody formBody = prepareBody(event, to, cc, subject, text, html,
                     attachment);
 
             Request request = new Request.Builder()
-                    .url("https://api.mailgun.net/v2/" + domain + "/messages")
+                    .url(baseUrl + domain + "/messages")
                     .header("Authorization", Credentials.basic("api", apiKey))
                     .post(formBody).build();
 

diff --git a/src/main/java/alfio/model/system/ConfigurationKeys.java b/src/main/java/alfio/model/system/ConfigurationKeys.java
@@ -102,6 +102,7 @@ public enum ConfigurationKeys {
     MAILGUN_KEY("Mailgun key", false, SettingCategory.MAIL, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true),
     MAILGUN_DOMAIN("Mailgun domain", false, SettingCategory.MAIL, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true),
     MAILGUN_FROM("Mailgun E-Mail sender", false, SettingCategory.MAIL, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true),
+    MAILGUN_EU("Use Mailgun EU region", false, SettingCategory.MAIL, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM), true),
     //
     // mailjet
     MAILJET_APIKEY_PUBLIC("Mailjet public api key", false, SettingCategory.MAIL, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true),