archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2026-02-01 17:37:19 +00:00
Code Issues Projects Releases Wiki Activity

fix: Referencing users if username contains @ sign (OD-2038)

Browse Source
This commit is contained in:
Robin Shen 2024-08-25 07:50:46 +08:00
parent 260c5cce2d
commit 9672ba0c45
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
View File

@ -241,18 +241,15 @@ public class OpenIdConnector extends SsoConnector {
if (!subject.equals(json.get("sub")))
throw new AuthenticationException("OIDC error: Inconsistent sub in ID token and userinfo");
if (email == null) {
if (email == null)
email = getStringValue(json.get("email"));
if (email == null)
throw new AuthenticationException("OIDC error: No email claim returned");
}
if (email == null)
throw new AuthenticationException("OIDC error: No email claim returned");
if (userName == null) {
if (userName == null)
userName = getStringValue(json.get("preferred_username"));
if (userName == null)
userName = email;
userName = StringUtils.substringBefore(userName, "@");
}
if (userName == null)
userName = email;
if (fullName == null)
fullName = getStringValue(json.get("name"));
@ -271,6 +268,7 @@ public class OpenIdConnector extends SsoConnector {
throw buildException(UserInfoErrorResponse.parse(httpResponse).getErrorObject());
}
}
userName = StringUtils.substringBefore(userName, "@");
if (groups != null)
groups = convertGroups(accessToken, groups);
return new SsoAuthenticated(userName, email, fullName, groups, null, this);