From e0acf34fa5be04100d92d4c2a2c1cb393f53d016 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 28 Dec 2019 20:45:04 -0500 Subject: [PATCH] fix default template paths for email/sms --- .../main/java/bubble/cloud/auth/AuthenticationDriver.java | 2 +- .../main/java/bubble/cloud/email/EmailDriverConfig.java | 3 ++- .../src/main/java/bubble/cloud/sms/SmsConfig.java | 6 +++++- .../src/test/resources/models/system/cloudService.json | 7 ++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bubble-server/src/main/java/bubble/cloud/auth/AuthenticationDriver.java b/bubble-server/src/main/java/bubble/cloud/auth/AuthenticationDriver.java index 4a02a30a..9c0006e1 100644 --- a/bubble-server/src/main/java/bubble/cloud/auth/AuthenticationDriver.java +++ b/bubble-server/src/main/java/bubble/cloud/auth/AuthenticationDriver.java @@ -123,7 +123,7 @@ public interface AuthenticationDriver extends CloudServiceDriver { static String localePath(final String locale, String templatePath, Handlebars hbs) { final String key = locale+":"+templatePath; return _localePaths.computeIfAbsent(key, - k -> HandlebarsUtil.apply(hbs, templatePath, new SingletonMap<>(CTX_LOCALE, locale))); + k -> HandlebarsUtil.apply(hbs, templatePath, new SingletonMap<>(CTX_LOCALE, locale), '[', ']')); } } diff --git a/bubble-server/src/main/java/bubble/cloud/email/EmailDriverConfig.java b/bubble-server/src/main/java/bubble/cloud/email/EmailDriverConfig.java index 796db512..dfddd727 100644 --- a/bubble-server/src/main/java/bubble/cloud/email/EmailDriverConfig.java +++ b/bubble-server/src/main/java/bubble/cloud/email/EmailDriverConfig.java @@ -6,12 +6,13 @@ import lombok.Setter; import lombok.experimental.Accessors; import org.cobbzilla.mail.sender.SmtpMailConfig; +import static bubble.ApiConstants.MESSAGE_RESOURCE_BASE; import static org.cobbzilla.util.reflect.ReflectionUtil.copy; @NoArgsConstructor @Accessors(chain=true) public class EmailDriverConfig extends SmtpMailConfig { - public static final String DEFAULT_TEMPLATE_PATH = "message_templates/email"; + public static final String DEFAULT_TEMPLATE_PATH = MESSAGE_RESOURCE_BASE+"[[locale]]/email"; public EmailDriverConfig (SmtpMailConfig other) { copy(this, other); } diff --git a/bubble-server/src/main/java/bubble/cloud/sms/SmsConfig.java b/bubble-server/src/main/java/bubble/cloud/sms/SmsConfig.java index de50a850..7190274f 100644 --- a/bubble-server/src/main/java/bubble/cloud/sms/SmsConfig.java +++ b/bubble-server/src/main/java/bubble/cloud/sms/SmsConfig.java @@ -3,8 +3,12 @@ package bubble.cloud.sms; import lombok.Getter; import lombok.Setter; +import static bubble.ApiConstants.MESSAGE_RESOURCE_BASE; + public class SmsConfig { - @Getter @Setter private String templatePath; + public static final String DEFAULT_TEMPLATE_PATH = MESSAGE_RESOURCE_BASE+"[[locale]]/sms"; + + @Getter @Setter private String templatePath = DEFAULT_TEMPLATE_PATH; } diff --git a/bubble-server/src/test/resources/models/system/cloudService.json b/bubble-server/src/test/resources/models/system/cloudService.json index dcfe7c08..8baad73b 100644 --- a/bubble-server/src/test/resources/models/system/cloudService.json +++ b/bubble-server/src/test/resources/models/system/cloudService.json @@ -51,8 +51,7 @@ "type": "email", "driverClass": "{{BUBBLE_SMTP_DRIVER}}", "driverConfig": { - "tlsEnabled": true, - "templatePath": "message_templates/{{locale}}/email" + "tlsEnabled": true }, "credentials": { "params": [ @@ -70,9 +69,7 @@ "name": "TwilioSms", "type": "sms", "driverClass": "{{BUBBLE_SMS_DRIVER}}", - "driverConfig": { - "templatePath": "message_templates/{{locale}}/sms" - }, + "driverConfig": {}, "credentials": { "params": [ {"name": "accountSID", "value": "{{TWILIO_ACCOUNT_SID}}"},