From bc44326eebf7b8c5b2ebd71dffdf47ba617323e8 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Thu, 1 Oct 2020 01:40:39 +0200 Subject: [PATCH] Allow usage of Sendgrid without Subusers support --- .../main/java/bubble/cloud/email/SendgridSmtpEmailDriver.java | 3 +++ .../src/main/java/bubble/cloud/email/SmtpEmailDriver.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bubble-server/src/main/java/bubble/cloud/email/SendgridSmtpEmailDriver.java b/bubble-server/src/main/java/bubble/cloud/email/SendgridSmtpEmailDriver.java index 508ecd0d..4641d195 100644 --- a/bubble-server/src/main/java/bubble/cloud/email/SendgridSmtpEmailDriver.java +++ b/bubble-server/src/main/java/bubble/cloud/email/SendgridSmtpEmailDriver.java @@ -25,6 +25,9 @@ import static org.cobbzilla.util.json.JsonUtil.json; import static org.cobbzilla.util.security.CryptoUtil.generatePassword; import static org.cobbzilla.util.string.StringUtil.repeat; +/** + * Only to be used with Sendgrid account with Subusers supported! + */ public class SendgridSmtpEmailDriver extends SmtpEmailDriver { public static final String SG_API_BASE = "https://api.sendgrid.com/v3/"; diff --git a/bubble-server/src/main/java/bubble/cloud/email/SmtpEmailDriver.java b/bubble-server/src/main/java/bubble/cloud/email/SmtpEmailDriver.java index 60545cd5..3c3ce366 100644 --- a/bubble-server/src/main/java/bubble/cloud/email/SmtpEmailDriver.java +++ b/bubble-server/src/main/java/bubble/cloud/email/SmtpEmailDriver.java @@ -27,7 +27,6 @@ public class SmtpEmailDriver extends CloudServiceDriverBase i protected static final String SENDGRID_SMTP = "smtp.sendgrid.net"; private static final List SEPARATE_DRIVERS_SMTPS = new ArrayList<>(); - static { SEPARATE_DRIVERS_SMTPS.add(SENDGRID_SMTP); } protected static final String PARAM_USER = "user"; protected static final String PARAM_PASSWORD = "password"; @@ -56,6 +55,7 @@ public class SmtpEmailDriver extends CloudServiceDriverBase i } protected boolean isServiceCompatible(final String serviceHost) { + // Allow even Sendgrid here if Subusers are not supported for specified API key return !SEPARATE_DRIVERS_SMTPS.contains(serviceHost); }