opendev/gerrit
Code Issues Proposed changes

Merge "OAuthRealm should not overwrite custom AuthRequest parameters"

Browse Source
This commit is contained in:
Edwin Kempin
2016-05-12 14:05:18 +00:00
committed by Gerrit Code Review
parent 1b0ef922dd c033fa8554
commit ad2d416cf7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/auth/oauth/OAuthRealm.java
View File

@@ -103,10 +103,14 @@ public class OAuthRealm extends AbstractRealm {
if (userInfo == null) { if (userInfo == null) {
throw new AccountException("Cannot authenticate"); throw new AccountException("Cannot authenticate");
} }
if (!Strings.isNullOrEmpty(userInfo.getEmailAddress())) { if (!Strings.isNullOrEmpty(userInfo.getEmailAddress())
&& (Strings.isNullOrEmpty(who.getUserName())
|| !allowsEdit(FieldName.REGISTER_NEW_EMAIL))) {
who.setEmailAddress(userInfo.getEmailAddress()); who.setEmailAddress(userInfo.getEmailAddress());
} }
if (!Strings.isNullOrEmpty(userInfo.getDisplayName())) { if (!Strings.isNullOrEmpty(userInfo.getDisplayName())
&& (Strings.isNullOrEmpty(who.getDisplayName())
|| !allowsEdit(FieldName.FULL_NAME))) {
who.setDisplayName(userInfo.getDisplayName()); who.setDisplayName(userInfo.getDisplayName());
} }
return who; return who;