Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add oauth2Login MockMvc Support

Browse Source 
Fixes gh-7789
This commit is contained in:
Josh Cummings
2020-01-06 14:42:05 -07:00
parent 2df1099da5
commit 84ba3ddf26
4 changed files with 399 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java
View File

@@ -73,8 +73,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.security.oauth2.core.oidc.IdTokenClaimNames.SUB;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oidcLogin;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
@@ -261,12 +260,12 @@ public class OAuth2LoginApplicationTests {
}
@Test
public void requestWhenMockOidcLoginThenIndex() throws Exception {
public void requestWhenMockOAuth2LoginThenIndex() throws Exception {
ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("github");
this.mvc.perform(get("/").with(oidcLogin().clientRegistration(clientRegistration)))
this.mvc.perform(get("/").with(oauth2Login().clientRegistration(clientRegistration)))
.andExpect(model().attribute("userName", "test-subject"))
.andExpect(model().attribute("clientName", "GitHub"))
.andExpect(model().attribute("userAttributes", Collections.singletonMap(SUB, "test-subject")));
.andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "test-subject")));
}
private void assertLoginPage(HtmlPage page) {

13
samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java
View File

@@ -34,8 +34,7 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import static org.springframework.security.oauth2.core.oidc.IdTokenClaimNames.SUB;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oidcLogin;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
@@ -64,10 +63,10 @@ public class OAuth2LoginControllerTests {
@Test
public void rootWhenAuthenticatedReturnsUserAndClient() throws Exception {
this.mvc.perform(get("/").with(oidcLogin()))
this.mvc.perform(get("/").with(oauth2Login()))
.andExpect(model().attribute("userName", "test-subject"))
.andExpect(model().attribute("clientName", "test"))
.andExpect(model().attribute("userAttributes", Collections.singletonMap(SUB, "test-subject")));
.andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "test-subject")));
}
@Test
@@ -79,11 +78,11 @@ public class OAuth2LoginControllerTests {
.tokenUri("https://token-uri.example.org")
.build();
this.mvc.perform(get("/").with(oidcLogin()
this.mvc.perform(get("/").with(oauth2Login()
.clientRegistration(clientRegistration)
.idToken(i -> i.subject("spring-security"))))
.attributes(a -> a.put("sub", "spring-security"))))
.andExpect(model().attribute("userName", "spring-security"))
.andExpect(model().attribute("clientName", "my-client-name"))
.andExpect(model().attribute("userAttributes", Collections.singletonMap(SUB, "spring-security")));
.andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "spring-security")));
}
}