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

Polish OAuth 2.0 Samples

Browse Source 
- Favor @TestConfiguration so as to not disable Spring Boot's
auto-configuration of ClientRegistrationRepository and
OAuth2AuthorizedClientRepository
This commit is contained in:
Josh Cummings
2020-05-27 15:57:48 -06:00
parent 8d84bc58f6
commit d5b8981678
5 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientControllerTests.java
View File

@@ -22,14 +22,13 @@ import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import sample.config.SecurityConfig;
import sample.web.OAuth2WebClientController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
import org.springframework.test.context.junit4.SpringRunner;
@@ -40,7 +39,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login;
@WebFluxTest
@Import({ SecurityConfig.class, OAuth2WebClientController.class })
@Import(SecurityConfig.class)
@AutoConfigureWebTestClient
@RunWith(SpringRunner.class)
public class OAuth2WebClientControllerTests {
@@ -94,7 +93,7 @@ public class OAuth2WebClientControllerTests {
.expectStatus().isOk();
}
@Configuration
@TestConfiguration
static class WebClientConfig {
@Bean
WebClient web() {

7
samples/boot/oauth2webclient-webflux/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java
View File

@@ -22,14 +22,13 @@ import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import sample.config.SecurityConfig;
import sample.web.RegisteredOAuth2AuthorizedClientController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
import org.springframework.test.context.junit4.SpringRunner;
@@ -40,7 +39,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login;
@WebFluxTest
@Import({ SecurityConfig.class, RegisteredOAuth2AuthorizedClientController.class })
@Import(SecurityConfig.class)
@AutoConfigureWebTestClient
@RunWith(SpringRunner.class)
public class RegisteredOAuth2AuthorizedClientControllerTests {
@@ -94,7 +93,7 @@ public class RegisteredOAuth2AuthorizedClientControllerTests {
.expectStatus().isOk();
}
@Configuration
@TestConfiguration
static class WebClientConfig {
@Bean
WebClient web() {