Skip to content

The Unified and Autonomous Development Platform

feat: MS365 Mail Service - Update refresh token automatically to avoid expiration (OD-2243)

Robin Shen23ebef3d06fe
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index df3ec062ee..f7e87d428f 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -97,6 +97,8 @@ import io.onedev.server.util.jackson.ObjectMapperConfigurator;
import io.onedev.server.util.jackson.ObjectMapperProvider;
import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;
+import io.onedev.server.util.oauth.DefaultOAuthTokenManager;
+import io.onedev.server.util.oauth.OAuthTokenManager;
import io.onedev.server.util.xstream.*;
import io.onedev.server.validation.ValidatorProvider;
import io.onedev.server.web.*;
@@ -296,6 +298,7 @@ public class CoreModule extends AbstractPluginModule {
bind(AccessTokenManager.class).to(DefaultAccessTokenManager.class);
bind(AccessTokenAuthorizationManager.class).to(DefaultAccessTokenAuthorizationManager.class);
bind(ReviewedDiffManager.class).to(DefaultReviewedDiffManager.class);
+ bind(OAuthTokenManager.class).to(DefaultOAuthTokenManager.class);
bind(WebHookManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index 0b27131b78..1129551b72 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -306,7 +306,7 @@ public class DefaultMailManager implements MailManager, Serializable {
var mailService = settingManager.getMailService();
if (mailService != null) {
mailService.sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress,
- senderName, references);
+ senderName, references, false);
} else {
logger.warn("Unable to send mail as mail service is not configured");
}
@@ -711,7 +711,7 @@ public class DefaultMailManager implements MailManager, Serializable {
while (thread != null) {
try {
var mailService = settingManager.getMailService();
- var inboxMonitor = mailService != null? mailService.getInboxMonitor(): null;
+ var inboxMonitor = mailService != null? mailService.getInboxMonitor(false): null;
if (inboxMonitor != null && clusterManager.isLeaderServer()) {
var systemAddress = mailService.getSystemAddress();
while (thread != null) {
@@ -891,7 +891,7 @@ public class DefaultMailManager implements MailManager, Serializable {
private String getFeedbackAddress(String subAddress) {
var mailService = settingManager.getMailService();
- if (mailService != null && mailService.getInboxMonitor() != null)
+ if (mailService != null && mailService.getInboxMonitor(false) != null)
return ParsedEmailAddress.parse(mailService.getSystemAddress()).getSubaddress(subAddress);
else
return null;
diff --git a/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java b/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java
index b96e38b7f0..21d1f872aa 100644
--- a/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java
+++ b/server-core/src/main/java/io/onedev/server/mail/OAuthAccessToken.java
@@ -4,7 +4,8 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.AlertManager;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.OAuthUtils;
+import io.onedev.server.util.oauth.OAuthTokenManager;
+import io.onedev.server.util.oauth.RefreshTokenAccessor;
import org.unbescape.html.HtmlEscape;
public class OAuthAccessToken implements MailCredential {
@@ -17,19 +18,20 @@ public class OAuthAccessToken implements MailCredential {
private final String clientSecret;
- private final String refreshToken;
+ private final RefreshTokenAccessor refreshTokenAccessor;
- public OAuthAccessToken(String tokenEndpoint, String clientId, String clientSecret, String refreshToken) {
+ public OAuthAccessToken(String tokenEndpoint, String clientId, String clientSecret,
+ RefreshTokenAccessor refreshTokenAccessor) {
this.tokenEndpoint = tokenEndpoint;
this.clientId = clientId;
this.clientSecret = clientSecret;
- this.refreshToken = refreshToken;
+ this.refreshTokenAccessor = refreshTokenAccessor;
}
@Override
public String getValue() {
try {
- return OAuthUtils.getAccessToken(tokenEndpoint, clientId, clientSecret, refreshToken);
+ return OneDev.getInstance(OAuthTokenManager.class).getAccessToken(tokenEndpoint, clientId, clientSecret, refreshTokenAccessor);
} catch (ExplicitException e) {
if (SecurityUtils.isAnonymous() || SecurityUtils.isSystem())
OneDev.getInstance(AlertManager.class).alert("Failed to get access token of mail server",
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailService.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailService.java
index b770d071d0..3a051a5ee0 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailService.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailservice/MailService.java
@@ -15,9 +15,9 @@ public interface MailService extends Serializable {
void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
String subject, String htmlBody, String textBody, @Nullable String replyAddress,
- @Nullable String senderName, @Nullable String references);
-
+ @Nullable String senderName, @Nullable String references, boolean testMode);
+
@Nullable
- InboxMonitor getInboxMonitor();
-
+ InboxMonitor getInboxMonitor(boolean testMode);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java b/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java
deleted file mode 100644
index 199c713c26..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/OAuthUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package io.onedev.server.util;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.joda.time.DateTime;
-
-import com.nimbusds.oauth2.sdk.AuthorizationGrant;
-import com.nimbusds.oauth2.sdk.ErrorObject;
-import com.nimbusds.oauth2.sdk.ParseException;
-import com.nimbusds.oauth2.sdk.RefreshTokenGrant;
-import com.nimbusds.oauth2.sdk.TokenErrorResponse;
-import com.nimbusds.oauth2.sdk.TokenRequest;
-import com.nimbusds.oauth2.sdk.TokenResponse;
-import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
-import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
-import com.nimbusds.oauth2.sdk.auth.Secret;
-import com.nimbusds.oauth2.sdk.id.ClientID;
-import com.nimbusds.oauth2.sdk.token.AccessToken;
-
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.commons.utils.StringUtils;
-
-public class OAuthUtils {
-
- private static final Map<String, Pair<AccessToken, Date>> accessTokenCache = new ConcurrentHashMap<>();
-
- public static String getErrorMessage(ErrorObject error) {
- if ("redirect_uri_mismatch".equals(error.getCode())) {
- return "Redirect uri mismatch: make sure the server url specified in system setting is the same as "
- + "root part of the authorization callback url at authorization server side";
- } else {
- List<String> details = new ArrayList<>();
- if (error.getCode() != null)
- details.add("code: " + error.getCode());
- if (error.getDescription() != null)
- details.add("description: " + error.getDescription());
- if (error.getHTTPStatusCode() != 0)
- details.add("http status code: " + error.getHTTPStatusCode());
-
- return StringUtils.join(details, ", ");
- }
- }
-
- public static String getAccessToken(String tokenEndpoint, String clientId, String clientSecret,
- String refreshToken) {
- Pair<AccessToken, Date> cacheEntry = accessTokenCache.get(refreshToken);
- if (cacheEntry == null) {
- cacheEntry = new Pair<>(
- generateAccessToken(tokenEndpoint, clientId, clientSecret, refreshToken),
- new Date());
- accessTokenCache.put(refreshToken, cacheEntry);
- } else {
- long lifetime = cacheEntry.getLeft().getLifetime();
- if (lifetime != 0 && new DateTime(cacheEntry.getRight()).plusSeconds((int)lifetime).isBeforeNow()) {
- cacheEntry = new Pair<>(
- generateAccessToken(tokenEndpoint, clientId, clientSecret, refreshToken),
- new Date());
- accessTokenCache.put(refreshToken, cacheEntry);
- }
- }
- return cacheEntry.getLeft().getValue();
- }
-
- public static AccessToken generateAccessToken(String tokenEndpoint,
- String clientId, String clientSecret, String refreshTokenValue) {
- com.nimbusds.oauth2.sdk.token.RefreshToken refreshToken =
- new com.nimbusds.oauth2.sdk.token.RefreshToken(refreshTokenValue);
- AuthorizationGrant refreshTokenGrant = new RefreshTokenGrant(refreshToken);
-
- ClientAuthentication clientAuth = new ClientSecretBasic(
- new ClientID(clientId), new Secret(clientSecret));
-
- TokenResponse response;
- try {
- TokenRequest request = new TokenRequest(new URI(tokenEndpoint), clientAuth, refreshTokenGrant);
- response = TokenResponse.parse(request.toHTTPRequest().send());
- } catch (ParseException | URISyntaxException | IOException e) {
- throw new RuntimeException(e);
- }
-
- if (response.indicatesSuccess()) {
- return response.toSuccessResponse().getTokens().getAccessToken();
- } else {
- TokenErrorResponse errorResponse = response.toErrorResponse();
- throw new ExplicitException(getErrorMessage(errorResponse.getErrorObject()));
- }
-
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenManager.java b/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenManager.java
new file mode 100644
index 0000000000..0b8cb341b0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/oauth/DefaultOAuthTokenManager.java
@@ -0,0 +1,122 @@
+package io.onedev.server.util.oauth;
+
+import com.nimbusds.oauth2.sdk.*;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.token.AccessToken;
+import com.nimbusds.oauth2.sdk.token.Tokens;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.taskschedule.SchedulableTask;
+import io.onedev.server.taskschedule.TaskScheduler;
+import org.joda.time.DateTime;
+import org.quartz.ScheduleBuilder;
+import org.quartz.SimpleScheduleBuilder;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static io.onedev.server.util.oauth.OAuthUtils.getErrorMessage;
+
+@Singleton
+public class DefaultOAuthTokenManager implements OAuthTokenManager, SchedulableTask {
+
+ private final TaskScheduler taskScheduler;
+
+ private final Map<String, CacheEntry> accessTokenCache = new ConcurrentHashMap<>();
+
+ private volatile String taskId;
+
+ @Inject
+ public DefaultOAuthTokenManager(TaskScheduler taskScheduler) {
+ this.taskScheduler = taskScheduler;
+ }
+
+ @Override
+ public String getAccessToken(String tokenEndpoint, String clientId, String clientSecret,
+ RefreshTokenAccessor refreshTokenAccessor) {
+ var refreshToken = refreshTokenAccessor.getRefreshToken();
+ var cacheEntry = accessTokenCache.get(clientId);
+ if (cacheEntry == null || cacheEntry.isExpired()) {
+ var tokens = requestTokens(tokenEndpoint, clientId, clientSecret, refreshToken);
+ cacheEntry = new CacheEntry(tokens.getAccessToken());
+ accessTokenCache.put(clientId, cacheEntry);
+ refreshTokenAccessor.setRefreshToken(tokens.getRefreshToken().getValue());
+ }
+ return cacheEntry.accessToken.getValue();
+ }
+
+ private Tokens requestTokens(String tokenEndpoint, String clientId,
+ String clientSecret, String refreshTokenValue) {
+ com.nimbusds.oauth2.sdk.token.RefreshToken refreshToken =
+ new com.nimbusds.oauth2.sdk.token.RefreshToken(refreshTokenValue);
+ AuthorizationGrant refreshTokenGrant = new RefreshTokenGrant(refreshToken);
+
+ ClientAuthentication clientAuth = new ClientSecretBasic(
+ new ClientID(clientId), new Secret(clientSecret));
+
+ TokenResponse response;
+ try {
+ TokenRequest request = new TokenRequest(new URI(tokenEndpoint), clientAuth, refreshTokenGrant);
+ response = TokenResponse.parse(request.toHTTPRequest().send());
+ } catch (ParseException | URISyntaxException | IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ if (response.indicatesSuccess()) {
+ return response.toSuccessResponse().getTokens();
+ } else {
+ TokenErrorResponse errorResponse = response.toErrorResponse();
+ throw new ExplicitException(getErrorMessage(errorResponse.getErrorObject()));
+ }
+
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ taskId = taskScheduler.schedule(this);
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ if (taskId != null)
+ taskScheduler.unschedule(taskId);
+ }
+
+ @Override
+ public void execute() {
+ accessTokenCache.entrySet().removeIf(it -> it.getValue().isExpired());
+ }
+
+ @Override
+ public ScheduleBuilder<?> getScheduleBuilder() {
+ return SimpleScheduleBuilder.repeatHourlyForever();
+ }
+
+ private static class CacheEntry {
+
+ final AccessToken accessToken;
+
+ final Date generateDate = new Date();
+
+ CacheEntry(AccessToken accessToken) {
+ this.accessToken = accessToken;
+ }
+
+ boolean isExpired() {
+ var lifetime = accessToken.getLifetime();
+ return lifetime != 0 && new DateTime(generateDate).plusSeconds((int)lifetime).isBeforeNow();
+ }
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/oauth/OAuthTokenManager.java b/server-core/src/main/java/io/onedev/server/util/oauth/OAuthTokenManager.java
new file mode 100644
index 0000000000..3ce6bfc671
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/oauth/OAuthTokenManager.java
@@ -0,0 +1,7 @@
+package io.onedev.server.util.oauth;
+
+public interface OAuthTokenManager {
+ String getAccessToken(String tokenEndpoint, String clientId, String clientSecret,
+ RefreshTokenAccessor refreshTokenAccessor);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/oauth/OAuthUtils.java b/server-core/src/main/java/io/onedev/server/util/oauth/OAuthUtils.java
new file mode 100644
index 0000000000..db3ce43c96
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/oauth/OAuthUtils.java
@@ -0,0 +1,28 @@
+package io.onedev.server.util.oauth;
+
+import com.nimbusds.oauth2.sdk.ErrorObject;
+import io.onedev.commons.utils.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OAuthUtils {
+
+ public static String getErrorMessage(ErrorObject error) {
+ if ("redirect_uri_mismatch".equals(error.getCode())) {
+ return "Redirect uri mismatch: make sure the server url specified in system setting is the same as "
+ + "root part of the authorization callback url at authorization server side";
+ } else {
+ List<String> details = new ArrayList<>();
+ if (error.getCode() != null)
+ details.add("code: " + error.getCode());
+ if (error.getDescription() != null)
+ details.add("description: " + error.getDescription());
+ if (error.getHTTPStatusCode() != 0)
+ details.add("http status code: " + error.getHTTPStatusCode());
+
+ return StringUtils.join(details, ", ");
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/oauth/RefreshTokenAccessor.java b/server-core/src/main/java/io/onedev/server/util/oauth/RefreshTokenAccessor.java
new file mode 100644
index 0000000000..5ca43388d4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/oauth/RefreshTokenAccessor.java
@@ -0,0 +1,11 @@
+package io.onedev.server.util.oauth;
+
+import java.io.Serializable;
+
+public interface RefreshTokenAccessor extends Serializable {
+
+ String getRefreshToken();
+
+ void setRefreshToken(String refreshToken);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index 76c9a45a91..f484c95836 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -134,7 +134,7 @@ public abstract class ProjectInfoPanel extends Panel {
SettingManager settingManager = OneDev.getInstance(SettingManager.class);
if (settingManager.getServiceDeskSetting() != null
&& settingManager.getMailService() != null
- && settingManager.getMailService().getInboxMonitor() != null
+ && settingManager.getMailService().getInboxMonitor(false) != null
&& getProject().isIssueManagement()) {
String serviceDeskEmailAddress;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.html
index bd9d332795..0b09cb1206 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.html
@@ -2,7 +2,7 @@
<div class="input-group">
<input wicket:id="input" type="password" autocomplete="new-password" class="form-control">
<span class="input-group-append">
- <button wicket:id="generate" title="Login and generate refresh token" class="btn btn-outline-secondary btn-icon"><wicket:svg href="user" class="icon"/></button>
+ <button wicket:id="generate" title="Login and generate refresh token" class="btn btn-outline-secondary btn-icon"><wicket:svg href="refresh" class="icon"/></button>
</span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java
index 6c07a58bac..2441458c5e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java
@@ -36,7 +36,7 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.OAuthUtils;
+import io.onedev.server.util.oauth.OAuthUtils;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailServicePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailServicePage.java
index 6e2e81e8a0..303c176a8d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailServicePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailservice/MailServicePage.java
@@ -104,7 +104,7 @@ public class MailServicePage extends AdministrationPage {
protected TaskResult runTask(TaskLogger logger) {
return OneDev.getInstance(SessionManager.class).call(() -> {
var mailService = bean.getMailService();
- var inboxMonitor = mailService.getInboxMonitor();
+ var inboxMonitor = mailService.getInboxMonitor(true);
if (inboxMonitor != null) {
String uuid = UUID.randomUUID().toString();
var futureRef = new AtomicReference<Future<?>>(null);
@@ -131,7 +131,7 @@ public class MailServicePage extends AdministrationPage {
mailService.sendMail(Sets.newHashSet(subAddressed), Sets.newHashSet(),
Sets.newHashSet(), uuid, "[Test] Test Email From OneDev",
"This is a test email from OneDev", null,
- null, null);
+ null, null, true);
logger.log("Waiting for test mail to come back...");
@@ -154,7 +154,7 @@ public class MailServicePage extends AdministrationPage {
String body = "Great, your mail service configuration is working!";
mailService.sendMail(Sets.newHashSet(emailAddress.getValue()),
Sets.newHashSet(), Sets.newHashSet(), "[Test] Test Email From OneDev",
- body, body, null, null, null);
+ body, body, null, null, null, true);
return new TaskResult(true, new PlainMessage("Test mail has been sent to " + emailAddress.getValue() + ", please check your mail box"));
} else {
return new TaskResult(false, new PlainMessage("Primary email address of your account is not specified yet"));
diff --git a/server-ee b/server-ee
index d7f97635ca..f8562422dd 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit d7f97635ca01c5c7564c5e91a8c1b365948aa18c
+Subproject commit f8562422ddc4570badf3060733c19c3c88c07dea
diff --git a/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java b/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java
index 3c839c35b1..92a1f2cbe4 100644
--- a/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java
+++ b/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java
@@ -6,11 +6,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.RefreshToken;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.mail.*;
import io.onedev.server.model.support.administration.mailservice.ImapImplicitSsl;
import io.onedev.server.model.support.administration.mailservice.MailService;
import io.onedev.server.model.support.administration.mailservice.SmtpExplicitSsl;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.oauth.RefreshTokenAccessor;
import org.jetbrains.annotations.Nullable;
import javax.mail.Message;
@@ -170,9 +172,20 @@ public class GmailMailService implements MailService {
};
}
- private SmtpSetting getSmtpSetting() {
- MailCredential smtpCredential = new OAuthAccessToken(
- TOKEN_ENDPOINT, clientId, clientSecret, refreshToken);
+ private SmtpSetting getSmtpSetting(boolean testMode) {
+ MailCredential smtpCredential = new OAuthAccessToken(TOKEN_ENDPOINT, clientId, clientSecret, new RefreshTokenAccessor() {
+ @Override
+ public String getRefreshToken() {
+ return refreshToken;
+ }
+
+ @Override
+ public void setRefreshToken(String refreshToken) {
+ if (!testMode)
+ updateRefreshToken(refreshToken);
+ }
+
+ });
return new SmtpSetting("smtp.gmail.com", new SmtpExplicitSsl(), accountName, smtpCredential,
getTimeout());
}
@@ -190,16 +203,31 @@ public class GmailMailService implements MailService {
@Override
public void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
String subject, String htmlBody, String textBody, @Nullable String replyAddress,
- @Nullable String senderName, @Nullable String references) {
- getMailManager().sendMail(getSmtpSetting(), toList, ccList, bccList, subject, htmlBody, textBody,
+ @Nullable String senderName, @Nullable String references, boolean testMode) {
+ getMailManager().sendMail(getSmtpSetting(testMode), toList, ccList, bccList, subject, htmlBody, textBody,
replyAddress, senderName, getSystemAddress(), references);
}
+ private void updateRefreshToken(String refreshToken) {
+ this.refreshToken = refreshToken;
+ OneDev.getInstance(SettingManager.class).saveMailService(this);
+ }
+
@Override
- public InboxMonitor getInboxMonitor() {
+ public InboxMonitor getInboxMonitor(boolean testMode) {
if (inboxPollSetting != null) {
- var imapCredential = new OAuthAccessToken(
- TOKEN_ENDPOINT, clientId, clientSecret, refreshToken);
+ var imapCredential = new OAuthAccessToken(TOKEN_ENDPOINT, clientId, clientSecret, new RefreshTokenAccessor() {
+ @Override
+ public String getRefreshToken() {
+ return refreshToken;
+ }
+
+ @Override
+ public void setRefreshToken(String refreshToken) {
+ if (!testMode)
+ updateRefreshToken(refreshToken);
+ }
+ });
var imapSetting = new ImapSetting("imap.gmail.com",
new ImapImplicitSsl(), accountName, imapCredential,
inboxPollSetting.getPollInterval(), getTimeout());
diff --git a/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java b/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java
index 231e5c309e..42060e5ac3 100644
--- a/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java
+++ b/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java
@@ -6,11 +6,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.RefreshToken;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.mail.*;
import io.onedev.server.model.support.administration.mailservice.ImapImplicitSsl;
import io.onedev.server.model.support.administration.mailservice.MailService;
import io.onedev.server.model.support.administration.mailservice.SmtpExplicitSsl;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.oauth.RefreshTokenAccessor;
import org.jetbrains.annotations.Nullable;
import javax.mail.Message;
@@ -19,7 +21,6 @@ import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
import java.util.function.Consumer;
@@ -204,9 +205,24 @@ public class Office365MailService implements MailService {
};
}
- private SmtpSetting getSmtpSetting() {
- MailCredential smtpCredential = new OAuthAccessToken(
- getTokenEndpoint(tenantId), clientId, clientSecret, refreshToken);
+ private void updateRefreshToken(String refreshToken) {
+ this.refreshToken = refreshToken;
+ OneDev.getInstance(SettingManager.class).saveMailService(this);
+ }
+
+ private SmtpSetting getSmtpSetting(boolean testMode) {
+ MailCredential smtpCredential = new OAuthAccessToken(getTokenEndpoint(tenantId), clientId, clientSecret, new RefreshTokenAccessor() {
+ @Override
+ public String getRefreshToken() {
+ return refreshToken;
+ }
+
+ @Override
+ public void setRefreshToken(String refreshToken) {
+ if (!testMode)
+ updateRefreshToken(refreshToken);
+ }
+ });
return new SmtpSetting("smtp.office365.com", new SmtpExplicitSsl(), userPrincipalName,
smtpCredential, getTimeout());
}
@@ -214,16 +230,27 @@ public class Office365MailService implements MailService {
@Override
public void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
String subject, String htmlBody, String textBody, @Nullable String replyAddress,
- @Nullable String senderName, @Nullable String references) {
- getMailManager().sendMail(getSmtpSetting(), toList, ccList, bccList, subject, htmlBody, textBody,
+ @Nullable String senderName, @Nullable String references, boolean testMode) {
+ getMailManager().sendMail(getSmtpSetting(testMode), toList, ccList, bccList, subject, htmlBody, textBody,
replyAddress, senderName, getSystemAddress(), references);
}
@Override
- public InboxMonitor getInboxMonitor() {
+ public InboxMonitor getInboxMonitor(boolean testMode) {
var imapUser = getUserPrincipalName();
- var imapCredential = new OAuthAccessToken(
- getTokenEndpoint(tenantId), clientId, clientSecret, refreshToken);
+ var imapCredential = new OAuthAccessToken(getTokenEndpoint(tenantId), clientId, clientSecret, new RefreshTokenAccessor() {
+ @Override
+ public String getRefreshToken() {
+ return refreshToken;
+ }
+
+ @Override
+ public void setRefreshToken(String refreshToken) {
+ if (!testMode)
+ updateRefreshToken(refreshToken);
+ }
+
+ });
if (inboxPollSetting != null) {
var imapSetting = new ImapSetting("outlook.office365.com",
new ImapImplicitSsl(), imapUser, imapCredential,
diff --git a/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java b/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java
index d7559501ab..c3988089e3 100644
--- a/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java
+++ b/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java
@@ -125,13 +125,13 @@ public class SmtpImapMailService implements MailService {
@Override
public void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
String subject, String htmlBody, String textBody, @Nullable String replyAddress,
- @Nullable String senderName, @Nullable String references) {
+ @Nullable String senderName, @Nullable String references, boolean testMode) {
getMailManager().sendMail(getSmtpSetting(), toList, ccList, bccList, subject, htmlBody, textBody,
replyAddress, senderName, getSystemAddress(), references);
}
@Override
- public InboxMonitor getInboxMonitor() {
+ public InboxMonitor getInboxMonitor(boolean testMode) {
if (inboxPollSetting != null) {
var imapUser = inboxPollSetting.getImapUser();
var imapCredential = new BasicAuthPassword(inboxPollSetting.getImapPassword());
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index 6845a75725..3e0ab9c55a 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -23,7 +23,7 @@ import io.onedev.server.annotation.UrlSegment;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
import io.onedev.server.model.support.administration.sso.SsoConnector;
-import io.onedev.server.util.OAuthUtils;
+import io.onedev.server.util.oauth.OAuthUtils;
import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;