Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
1113c356
Commit
1113c356
authored
Sep 13, 2018
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ReactiveOAuth2ClientAutoConfiguration backs off for servlet env
Fixes gh-14463
parent
d4b11c8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
0 deletions
+26
-0
ReactiveOAuth2ClientAutoConfiguration.java
...lient/reactive/ReactiveOAuth2ClientAutoConfiguration.java
+16
-0
ReactiveOAuth2ClientAutoConfigurationTests.java
.../reactive/ReactiveOAuth2ClientAutoConfigurationTests.java
+10
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfiguration.java
View file @
1113c356
...
...
@@ -25,6 +25,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
;
import
org.springframework.boot.autoconfigure.condition.NoneNestedConditions
;
import
org.springframework.boot.autoconfigure.security.oauth2.client.ClientsConfiguredCondition
;
import
org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties
;
import
org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientPropertiesRegistrationAdapter
;
...
...
@@ -52,6 +54,7 @@ import org.springframework.security.oauth2.client.web.server.ServerOAuth2Authori
@Configuration
@AutoConfigureBefore
(
ReactiveSecurityAutoConfiguration
.
class
)
@EnableConfigurationProperties
(
OAuth2ClientProperties
.
class
)
@Conditional
(
ReactiveOAuth2ClientAutoConfiguration
.
NonServletApplicationCondition
.
class
)
@ConditionalOnClass
({
Flux
.
class
,
EnableWebFluxSecurity
.
class
,
ClientRegistration
.
class
})
public
class
ReactiveOAuth2ClientAutoConfiguration
{
...
...
@@ -89,4 +92,17 @@ public class ReactiveOAuth2ClientAutoConfiguration {
authorizedClientService
);
}
static
class
NonServletApplicationCondition
extends
NoneNestedConditions
{
NonServletApplicationCondition
()
{
super
(
ConfigurationPhase
.
PARSE_CONFIGURATION
);
}
@ConditionalOnWebApplication
(
type
=
ConditionalOnWebApplication
.
Type
.
SERVLET
)
static
class
ServletApplicationCondition
{
}
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java
View file @
1113c356
...
...
@@ -24,6 +24,7 @@ import reactor.core.publisher.Flux;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
...
...
@@ -53,6 +54,15 @@ public class ReactiveOAuth2ClientAutoConfigurationTests {
private
static
final
String
REGISTRATION_PREFIX
=
"spring.security.oauth2.client.registration.login"
;
@Test
public
void
autoConfigurationShouldBackOffForServletEnvironments
()
{
WebApplicationContextRunner
contextRunner
=
new
WebApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
ReactiveOAuth2ClientAutoConfiguration
.
class
));
contextRunner
.
run
((
context
)
->
assertThat
(
context
)
.
doesNotHaveBean
(
ReactiveOAuth2ClientAutoConfiguration
.
class
));
}
@Test
public
void
clientRegistrationRepositoryBeanShouldNotBeCreatedWhenPropertiesAbsent
()
{
this
.
contextRunner
.
run
((
context
)
->
assertThat
(
context
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment