github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-16 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1462 from menocar/mailgun

Browse source 
Use mailgun for sending emails.
This commit is contained in:
LevelX2 2016-01-13 11:41:30 +01:00
commit e366cc1757
8 changed files with 67 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/config/config.xml
View file

@ -39,6 +39,8 @@
saveGameActivated="false"
authenticationActivated="false"
googleAccount=""
mailgunApiKey=""
mailgunDomain=""
/>
<playerTypes>
<playerType name="Human" jar="mage-player-human.jar" className="mage.player.human.HumanPlayer"/>

15
Mage.Server/pom.xml
View file

@ -184,6 +184,21 @@
<version>1.4.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.19</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.19</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<version>1.19</version>
</dependency>
</dependencies>
<build>

2
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -136,7 +136,7 @@ public class MageServerImpl implements MageServer {
}
String authToken = generateAuthToken();
activeAuthTokens.put(email, authToken);
if (!GmailClient.sendMessage(email, "XMage Password Reset Auth Token",
if (!MailgunClient.sendMessage(email, "XMage Password Reset Auth Token",
"Use this auth token to reset your password: " + authToken + "\n" +
"It's valid until the next server restart.")) {
sendErrorMessageToClient(sessionId, "There was an error inside the server while emailing an auth token");

37
Mage.Server/src/main/java/mage/server/MailgunClient.java Normal file
View file

@ -0,0 +1,37 @@
package mage.server;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
import com.sun.jersey.core.util.MultivaluedMapImpl;
import javax.ws.rs.core.MediaType;
import mage.server.util.ConfigSettings;
import org.apache.log4j.Logger;
public class MailgunClient {
private static final Logger logger = Logger.getLogger(Main.class);
public static boolean sendMessage(String email, String subject, String text) {
if (email.length() == 0) {
logger.info("Email is not sent because the address is empty");
return false;
}
Client client = Client.create();
client.addFilter(new HTTPBasicAuthFilter("api", ConfigSettings.getInstance().getMailgunApiKey()));
String domain = ConfigSettings.getInstance().getMailgunDomain();
WebResource webResource = client.resource("https://api.mailgun.net/v3/" + domain + "/messages");
MultivaluedMapImpl formData = new MultivaluedMapImpl();
formData.add("from", "XMage <postmaster@" + domain + ">");
formData.add("to", email);
formData.add("subject", subject);
formData.add("text", text);
ClientResponse response = webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formData);
boolean succeeded = response.getStatus() == 200;
if (!succeeded) {
logger.error("Error sending message to " + email + ". Status code: " + response.getStatus());
}
return succeeded;
}
}

12
Mage.Server/src/main/java/mage/server/Main.java
View file

@ -102,17 +102,6 @@ public class Main {
}
}
ConfigSettings config = ConfigSettings.getInstance();
if (config.isAuthenticationActivated()) {
logger.info("Initializing GmailClient. This will open up a tab in your browser to ask for an OAuth access token.");
if (GmailClient.initilize()) {
logger.info("GmailClient initilized successfully.");
} else {
logger.fatal("GmailClient initialization failed.");
return;
}
}
logger.info("Loading cards...");
if (fastDbMode) {
CardScanner.scanned = true;
@ -122,6 +111,7 @@ public class Main {
logger.info("Done.");
deleteSavedGames();
ConfigSettings config = ConfigSettings.getInstance();
for (GamePlugin plugin : config.getGameTypes()) {
GameFactory.getInstance().addGameType(plugin.getName(), loadGameType(plugin), loadPlugin(plugin));
}

2
Mage.Server/src/main/java/mage/server/Session.java
View file

@ -99,7 +99,7 @@ public class Session {
return returnMessage;
}
AuthorizedUserRepository.instance.add(userName, password, email);
if (GmailClient.sendMessage(email, "XMage Registration Completed",
if (MailgunClient.sendMessage(email, "XMage Registration Completed",
"You are successfully registered as " + userName + ".")) {
logger.info("Sent a registration confirmation email to " + email + " for " + userName);
} else {

8
Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
View file

@ -139,6 +139,14 @@ public class ConfigSettings {
return config.getServer().getGoogleAccount();
}
public String getMailgunApiKey() {
return config.getServer().getMailgunApiKey();
}
public String getMailgunDomain() {
return config.getServer().getMailgunDomain();
}
public List<Plugin> getPlayerTypes() {
return config.getPlayerTypes().getPlayerType();
}

2
Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
View file

@ -36,6 +36,8 @@
<xs:attribute name="saveGameActivated" type="xs:boolean" use="optional"/>
<xs:attribute name="authenticationActivated" type="xs:boolean" use="optional"/>
<xs:attribute name="googleAccount" type="xs:string" use="optional"/>
<xs:attribute name="mailgunApiKey" type="xs:string" use="optional"/>
<xs:attribute name="mailgunDomain" type="xs:string" use="optional"/>
</xs:complexType>
</xs:element>