Skip to content

Commit 39a56e2

Browse files
Issue 53534: Support Microsoft's Graph Protocol API for authentication via OAuth2 token (#2881)
Start Dumbster when SMTP is the active transport.
1 parent 47bc31e commit 39a56e2

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

modules/dumbster/src/org/labkey/dumbster/DumbsterModule.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import org.labkey.api.module.CodeOnlyModule;
2121
import org.labkey.api.module.ModuleContext;
2222
import org.labkey.api.settings.AppProps;
23+
import org.labkey.api.util.MailHelper;
24+
import org.labkey.api.util.SmtpTransportProvider;
2325
import org.labkey.api.view.BaseWebPartFactory;
2426
import org.labkey.api.view.Portal;
2527
import org.labkey.api.view.ViewContext;
@@ -65,7 +67,7 @@ public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Po
6567
@Override
6668
public void doStartup(ModuleContext moduleContext)
6769
{
68-
if (AppProps.getInstance().isMailRecorderEnabled())
70+
if (MailHelper.getActiveProvider() instanceof SmtpTransportProvider && AppProps.getInstance().isMailRecorderEnabled())
6971
DumbsterManager.get().start();
7072
}
7173
}

modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.labkey.api.util.ContextListener;
2424
import org.labkey.api.util.MailHelper;
2525
import org.labkey.api.util.ShutdownListener;
26+
import org.labkey.api.util.SmtpTransportProvider;
2627
import org.labkey.api.util.StringUtilsLabKey;
2728

2829
import jakarta.mail.MessagingException;
@@ -60,6 +61,12 @@ public static void setInstance(DumbsterManager instance)
6061

6162
public boolean start()
6263
{
64+
if (!(MailHelper.getActiveProvider() instanceof SmtpTransportProvider))
65+
{
66+
_log.error("Mail recorder cannot be started: active mail provider is not SmtpTransportProvider");
67+
return false;
68+
}
69+
6370
if (_server != null && !_server.isStopped())
6471
{
6572
// We're already running, no need to spin up another, but reset the list of messages
@@ -96,7 +103,7 @@ public boolean start()
96103
Session session = Session.getInstance(props);
97104

98105
_log.info("Switching MailHelper to use port " + port);
99-
MailHelper.setSession(session);
106+
MailHelper.setSmtpSession(session);
100107

101108
_log.info("Connecting mail recorder to port " + port);
102109
_server = SimpleSmtpServer.start(port);
@@ -117,7 +124,7 @@ public void stop()
117124
if (_server != null)
118125
{
119126
_log.info("Reverting MailHelper to " + AppProps.getInstance().getWebappConfigurationFilename() + " configuration");
120-
MailHelper.setSession(null);
127+
MailHelper.setSmtpSession(null);
121128

122129
_server.stop();
123130
ContextListener.removeShutdownListener(this);

0 commit comments

Comments
 (0)