tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not enforce Twilio config by default

Browse Source
This commit is contained in:
Maxime Dor
2017-09-25 18:04:21 +02:00
parent d221b2c5de
commit 13e248c71e
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/io/kamax/mxisd/config/threepid/connector/PhoneTwilioConfig.java
View File

@@ -20,8 +20,6 @@
package io.kamax.mxisd.config.threepid.connector; package io.kamax.mxisd.config.threepid.connector;
import io.kamax.mxisd.exception.ConfigurationException;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -68,19 +66,6 @@ public class PhoneTwilioConfig {
@PostConstruct @PostConstruct
public void build() { public void build() {
log.info("--- Phone SMS Twilio connector config ---"); log.info("--- Phone SMS Twilio connector config ---");
if (StringUtils.isBlank(getAccountSid())) {
throw new ConfigurationException(NAMESPACE + ".accountSid");
}
if (StringUtils.isBlank(getAuthToken())) {
throw new ConfigurationException(NAMESPACE + ".authToken");
}
if (StringUtils.isBlank(getNumber())) {
throw new ConfigurationException(NAMESPACE + ".number");
}
log.info("Account SID: {}", getAccountSid()); log.info("Account SID: {}", getAccountSid());
log.info("Sender number: {}", getNumber()); log.info("Sender number: {}", getNumber());
} }

6
src/main/java/io/kamax/mxisd/threepid/connector/phone/PhoneSmsTwilioConnector.java
View File

@@ -24,6 +24,8 @@ import com.twilio.Twilio;
import com.twilio.rest.api.v2010.account.Message; import com.twilio.rest.api.v2010.account.Message;
import com.twilio.type.PhoneNumber; import com.twilio.type.PhoneNumber;
import io.kamax.mxisd.config.threepid.connector.PhoneTwilioConfig; import io.kamax.mxisd.config.threepid.connector.PhoneTwilioConfig;
import io.kamax.mxisd.exception.BadRequestException;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +53,10 @@ public class PhoneSmsTwilioConnector implements IPhoneConnector {
@Override @Override
public void send(String recipient, String content) { public void send(String recipient, String content) {
if (StringUtils.isBlank(cfg.getAccountSid()) || StringUtils.isBlank(cfg.getAuthToken()) || StringUtils.isBlank(cfg.getNumber())) {
throw new BadRequestException("Phone numbers cannot be validated at this time. Contact your administrator.");
}
recipient = "+" + recipient; recipient = "+" + recipient;
log.info("Sending SMS notification from {} to {} with {} characters", cfg.getNumber(), recipient, content.length()); log.info("Sending SMS notification from {} to {} with {} characters", cfg.getNumber(), recipient, content.length());
Message.creator(new PhoneNumber("+" + recipient), new PhoneNumber(cfg.getNumber()), content).create(); Message.creator(new PhoneNumber("+" + recipient), new PhoneNumber(cfg.getNumber()), content).create();