The Unified and Autonomous Development Platform
fix(auth): handle redirect after SSO login
Robin Shenfa21e48f2e04
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.javaindex fe17279c17..3e72991af3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java@@ -100,7 +100,7 @@ public class LoginPage extends SimplePage {var ssoProviders = ssoProviderService.query();boolean disableInternalLogin = settingService.getSecuritySetting().isDisableInternalLogin()&& !ssoProviders.isEmpty();- if (disableInternalLogin && ssoProviders.size() == 1) {+ if (disableInternalLogin && ssoProviders.size() == 1) {var provider = ssoProviders.iterator().next();throw new RedirectToUrlException(serverUrl + "/" + MOUNT_PATH + "/" + STAGE_INITIATE+ "/" + provider.getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.javaindex f749bb0a96..d54b13bba9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java@@ -107,6 +107,14 @@ public class SsoProcessPage extends SimplePage {public SsoProcessPage(PageParameters params) {super(params);++ if (getLoginUser() != null) {+ String redirectUrlAfterLogin = (String) getSession().getAttribute(SESSION_ATTR_REDIRECT_URL);+ if (StringUtils.isBlank(redirectUrlAfterLogin))+ throw new RedirectToUrlException(redirectUrlAfterLogin);+ else+ throw new RestartResponseException(HomePage.class);+ }stage = params.get(PARAM_STAGE).toString();