Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fallback to Simple Registration 1.1 when version 1.0 is not available #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fallback to Simple Registration 1.1 when version 1.0 is not available #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/sonar/plugins/openid/OpenIdClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ static UserDetails toUser(AuthSuccess authSuccess) {
String email = null;

SRegResponse sr = OpenIdUtils.getMessageAs(SRegResponse.class, authSuccess, SRegMessage.OPENID_NS_SREG);
if (sr == null) {
sr = OpenIdUtils.getMessageAs(SRegResponse.class, authSuccess, SRegMessage.OPENID_NS_SREG11);
}
if (sr != null) {
name = sr.getAttributeValue(SREG_ATTR_FULLNAME);
email = sr.getAttributeValue(SREG_ATTR_EMAIL);
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/org/sonar/plugins/openid/OpenIdClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,21 @@ public void toUserDetails_sreg_attributes() throws Exception {
assertThat(user.getEmail()).isEqualTo("me@here.com");
}

@Test
public void toUserDetails_sreg11_attributes() throws Exception {
AuthSuccess authSuccess = mock(AuthSuccess.class);
when(authSuccess.hasExtension(SRegMessage.OPENID_NS_SREG11)).thenReturn(true);
SRegResponse sreg = SRegResponse.createFetchResponse();
sreg.addAttribute("fullname", "Dee Dee MacCall");
sreg.addAttribute("email", "deedee@maccall.com");
when(authSuccess.getExtension(SRegMessage.OPENID_NS_SREG11)).thenReturn(sreg);

UserDetails user = OpenIdClient.toUser(authSuccess);

assertThat(user.getName()).isEqualTo("Dee Dee MacCall");
assertThat(user.getEmail()).isEqualTo("deedee@maccall.com");
}

@Test
public void toUserDetails_missing_fields() throws Exception {
AuthSuccess authSuccess = mock(AuthSuccess.class);
Expand Down