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
840948c6
Commit
840948c6
authored
May 31, 2018
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
3fb79194
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
ClientsConfiguredCondition.java
...re/security/oauth2/client/ClientsConfiguredCondition.java
+8
-6
OAuth2ClientPropertiesRegistrationAdapter.java
...th2/client/OAuth2ClientPropertiesRegistrationAdapter.java
+1
-0
ReactiveOAuth2WebSecurityConfiguration.java
...ient/reactive/ReactiveOAuth2WebSecurityConfiguration.java
+1
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java
View file @
840948c6
...
@@ -31,10 +31,13 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
...
@@ -31,10 +31,13 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
/**
/**
* Condition that matches if any {@code spring.security.oauth2.client.registration}
* Condition that matches if any {@code spring.security.oauth2.client.registration}
* properties are defined.
* properties are defined.
*
* @author Madhura Bhave
* @since 2.1.0
*/
*/
public
class
ClientsConfiguredCondition
extends
SpringBootCondition
{
public
class
ClientsConfiguredCondition
extends
SpringBootCondition
{
private
static
final
Bindable
<
Map
<
String
,
OAuth2ClientProperties
.
Registration
>>
BINDABLE_REGISTRATION
=
Bindable
private
static
final
Bindable
<
Map
<
String
,
OAuth2ClientProperties
.
Registration
>>
STRING_REGISTRATION_MAP
=
Bindable
.
mapOf
(
String
.
class
,
OAuth2ClientProperties
.
Registration
.
class
);
.
mapOf
(
String
.
class
,
OAuth2ClientProperties
.
Registration
.
class
);
@Override
@Override
...
@@ -42,8 +45,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
...
@@ -42,8 +45,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
AnnotatedTypeMetadata
metadata
)
{
AnnotatedTypeMetadata
metadata
)
{
ConditionMessage
.
Builder
message
=
ConditionMessage
ConditionMessage
.
Builder
message
=
ConditionMessage
.
forCondition
(
"OAuth2 Clients Configured Condition"
);
.
forCondition
(
"OAuth2 Clients Configured Condition"
);
Map
<
String
,
OAuth2ClientProperties
.
Registration
>
registrations
=
this
Map
<
String
,
OAuth2ClientProperties
.
Registration
>
registrations
=
getRegistrations
(
.
getRegistrations
(
context
.
getEnvironment
());
context
.
getEnvironment
());
if
(!
registrations
.
isEmpty
())
{
if
(!
registrations
.
isEmpty
())
{
return
ConditionOutcome
.
match
(
message
return
ConditionOutcome
.
match
(
message
.
foundExactly
(
"registered clients "
+
registrations
.
values
().
stream
()
.
foundExactly
(
"registered clients "
+
registrations
.
values
().
stream
()
...
@@ -55,9 +58,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
...
@@ -55,9 +58,8 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
private
Map
<
String
,
OAuth2ClientProperties
.
Registration
>
getRegistrations
(
private
Map
<
String
,
OAuth2ClientProperties
.
Registration
>
getRegistrations
(
Environment
environment
)
{
Environment
environment
)
{
return
Binder
.
get
(
environment
)
return
Binder
.
get
(
environment
).
bind
(
"spring.security.oauth2.client.registration"
,
.
bind
(
"spring.security.oauth2.client.registration"
,
BINDABLE_REGISTRATION
)
STRING_REGISTRATION_MAP
).
orElse
(
Collections
.
emptyMap
());
.
orElse
(
Collections
.
emptyMap
());
}
}
}
}
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java
View file @
840948c6
...
@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
...
@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
*
*
* @author Phillip Webb
* @author Phillip Webb
* @author Thiago Hirata
* @author Thiago Hirata
* @since 2.1.0
*/
*/
public
final
class
OAuth2ClientPropertiesRegistrationAdapter
{
public
final
class
OAuth2ClientPropertiesRegistrationAdapter
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2WebSecurityConfiguration.java
View file @
840948c6
...
@@ -28,6 +28,7 @@ import org.springframework.security.oauth2.client.registration.ReactiveClientReg
...
@@ -28,6 +28,7 @@ import org.springframework.security.oauth2.client.registration.ReactiveClientReg
* {@link ReactiveOAuth2AuthorizedClientService}.
* {@link ReactiveOAuth2AuthorizedClientService}.
*
*
* @author Madhura Bhave
* @author Madhura Bhave
* @since 2.1.0
*/
*/
@Configuration
@Configuration
public
class
ReactiveOAuth2WebSecurityConfiguration
{
public
class
ReactiveOAuth2WebSecurityConfiguration
{
...
...
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