The Unified and Autonomous Development Platform
feat: Accept email as verified if verified_email claim is not present in OIDC provider (OD-2573)
Robin Shen16a4178fefdd
diff --git a/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.java b/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.javaindex 68d89b4300..74449fcb9d 100644--- a/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.java+++ b/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.java@@ -5,7 +5,7 @@ import io.onedev.commons.utils.ExplicitException;public class PullRequestReviewRejectedException extends ExplicitException {public PullRequestReviewRejectedException(String message) {- super(message);+ super(message);}}\ No newline at end of filediff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.javaindex d105b23339..84db3ca1e1 100644--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java@@ -118,7 +118,7 @@ public class DiscordConnector extends SsoConnector {String userName = (String) userObject.get("username");String email = StringUtils.trimToNull((String) userObject.get("email"));Boolean verified = (Boolean) userObject.get("verified");- if (!Boolean.TRUE.equals(verified))+ if (verified != null && !verified)email = null;if (bCheckGuilds) {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.javaindex 9e95aae055..b80099088d 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@@ -225,10 +225,11 @@ public class OpenIdConnector extends SsoConnector {String subject = claims.getSubject();String email = StringUtils.trimToNull(claims.getStringClaim("email"));+Boolean emailVerified = claims.getBooleanClaim("email_verified");if (emailVerified == null)emailVerified = claims.getBooleanClaim("emailVerified");- if (!Boolean.TRUE.equals(emailVerified))+ if (emailVerified != null && !emailVerified)email = null;String userName = StringUtils.trimToNull(claims.getStringClaim("preferred_username"));@@ -264,7 +265,7 @@ public class OpenIdConnector extends SsoConnector {emailVerified = getBooleanValue(json.get("email_verified"));if (emailVerified == null)emailVerified = getBooleanValue(json.get("emailVerified"));- if (!Boolean.TRUE.equals(emailVerified))+ if (emailVerified != null && !emailVerified)email = null;}@@ -335,7 +336,7 @@ public class OpenIdConnector extends SsoConnector {public void setRequestScopes(String requestScopes) {this.requestScopes = requestScopes;}-+@Editable(order=10100, group = "More Settings", description="Optionally specify the OpenID claim to retrieve " +"groups of authenticated user. Depending on the provider, you may need to request additional scopes " +"above to make this claim available")