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
3a95a753
Commit
3a95a753
authored
Jan 26, 2018
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UserDetailsService not created when OAuth configured
Fixes gh-10531
parent
777cbe3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
AuthenticationManagerConfiguration.java
.../security/servlet/AuthenticationManagerConfiguration.java
+1
-0
AuthenticationManagerConfigurationTests.java
...rity/servlet/AuthenticationManagerConfigurationTests.java
+20
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/AuthenticationManagerConfiguration.java
View file @
3a95a753
...
...
@@ -61,6 +61,7 @@ public class AuthenticationManagerConfiguration {
.
getLog
(
AuthenticationManagerConfiguration
.
class
);
@Bean
@ConditionalOnMissingBean
(
type
=
"org.springframework.security.oauth2.client.registration.ClientRegistrationRepository"
)
public
InMemoryUserDetailsManager
inMemoryUserDetailsManager
(
SecurityProperties
properties
,
ObjectProvider
<
PasswordEncoder
>
passwordEncoder
)
throws
Exception
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/AuthenticationManagerConfigurationTests.java
View file @
3a95a753
...
...
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Configuration;
import
org.springframework.context.annotation.Import
;
import
org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
;
import
org.springframework.security.crypto.password.PasswordEncoder
;
import
org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
;
import
org.springframework.security.provisioning.InMemoryUserDetailsManager
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -68,6 +69,14 @@ public class AuthenticationManagerConfigurationTests {
testPasswordEncoding
(
TestConfigWithPasswordEncoder
.
class
,
"secret"
,
"secret"
);
}
@Test
public
void
userDetailsServiceWhenClientRegistrationRepositoryBeanPresent
()
{
this
.
contextRunner
.
withUserConfiguration
(
TestConfigWithClientRegistrationRepository
.
class
,
AuthenticationManagerConfiguration
.
class
)
.
run
(((
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
InMemoryUserDetailsManager
.
class
)));
}
private
void
testPasswordEncoding
(
Class
<?>
configClass
,
String
providedPassword
,
String
expectedPassword
)
{
this
.
contextRunner
...
...
@@ -101,4 +110,15 @@ public class AuthenticationManagerConfigurationTests {
}
@Configuration
@Import
(
TestSecurityConfiguration
.
class
)
protected
static
class
TestConfigWithClientRegistrationRepository
{
@Bean
public
ClientRegistrationRepository
clientRegistrationRepository
()
{
return
mock
(
ClientRegistrationRepository
.
class
);
}
}
}
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