Skip to content

The Unified and Autonomous Development Platform

refactor(sso): remove OpenID logout handling from connectors

Robin Shendfa0220808f7
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java
index c7e8e60ba2..dee6265dc3 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java
@@ -53,11 +53,6 @@ public class GitHubConnector extends OpenIdConnector {
return super.getGroupsClaim();
}
- @Override
- public boolean isUseOpenIdLogout() {
- return false;
- }
-
@Override
protected SsoAuthenticated processTokenResponse(OIDCTokenResponse tokenResponse) {
BearerAccessToken accessToken = tokenResponse.getTokens().getBearerAccessToken();
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 aa43447902..2fb42f9083 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
@@ -91,8 +91,6 @@ public class OpenIdConnector extends SsoConnector {
private String groupsClaim;
private String buttonImageUrl;
-
- private boolean useOpenIdLogout;
public OpenIdConnector() {
buttonImageUrl = "/wicket/resource/" + OpenIdConnector.class.getName() + "/openid.png";
@@ -229,8 +227,7 @@ public class OpenIdConnector extends SsoConnector {
if (claims.getExpirationTime() != null && now.toDate().after(claims.getExpirationTime()))
throw new AuthenticationException(_T("ID token was expired"));
- if (isUseOpenIdLogout())
- Session.get().setAttribute(SESSION_ATTR_ID_TOKEN, idToken.serialize());
+ Session.get().setAttribute(SESSION_ATTR_ID_TOKEN, idToken.serialize());
String subject = claims.getSubject();
String email = StringUtils.trimToNull(claims.getStringClaim("email"));
@@ -368,23 +365,9 @@ public class OpenIdConnector extends SsoConnector {
this.buttonImageUrl = buttonImageUrl;
}
- @Editable(name="Use OpenID Sign Out", order=10300, group="More Settings", description="Check this to " +
- "also sign out from OpenID provider when signing out of OneDev. This requires provider " +
- "metadata to advertise an end session endpoint")
- public boolean isUseOpenIdLogout() {
- return useOpenIdLogout;
- }
-
- public void setUseOpenIdLogout(boolean useOpenIdLogout) {
- this.useOpenIdLogout = useOpenIdLogout;
- }
-
@Nullable
@Override
public String buildLogoutUrl(String providerName) {
- if (!isUseOpenIdLogout())
- return null;
-
var endSessionEndpoint = getCachedProviderMetadata().getEndSessionEndpoint();
var idToken = (String) Session.get().getAttribute(SESSION_ATTR_ID_TOKEN);
if (endSessionEndpoint == null || idToken == null)
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java
index 1a1f442e45..6b59ef29e1 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java
@@ -54,11 +54,6 @@ public class TwitchConnector extends OpenIdConnector {
return "openid user:read:email";
}
- @Override
- public boolean isUseOpenIdLogout() {
- return false;
- }
-
@Override
protected ClientAuthentication createTokenRequestAuthentication(ClientID id, Secret secret) {
return new ClientSecretPost(id, secret);