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
27ada029
Commit
27ada029
authored
May 13, 2020
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Expose property to configure OAuth2 provider configurationMetadata"
This reverts commit
7b790299
. See gh-21375
parent
daed5120
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
26 deletions
+0
-26
OAuth2ClientProperties.java
...figure/security/oauth2/client/OAuth2ClientProperties.java
+0
-10
OAuth2ClientPropertiesRegistrationAdapter.java
...th2/client/OAuth2ClientPropertiesRegistrationAdapter.java
+0
-1
OAuth2ClientPropertiesRegistrationAdapterTests.java
...lient/OAuth2ClientPropertiesRegistrationAdapterTests.java
+0
-14
spring-boot-features.adoc
...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+0
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java
View file @
27ada029
...
...
@@ -17,7 +17,6 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
security
.
oauth2
.
client
;
import
java.util.HashMap
;
import
java.util.LinkedHashMap
;
import
java.util.Map
;
import
java.util.Set
;
...
...
@@ -220,11 +219,6 @@ public class OAuth2ClientProperties {
*/
private
String
issuerUri
;
/**
* Additional metadata describing the provider's configuration.
*/
private
Map
<
String
,
Object
>
configurationMetadata
=
new
LinkedHashMap
<>();
public
String
getAuthorizationUri
()
{
return
this
.
authorizationUri
;
}
...
...
@@ -281,10 +275,6 @@ public class OAuth2ClientProperties {
this
.
issuerUri
=
issuerUri
;
}
public
Map
<
String
,
Object
>
getConfigurationMetadata
()
{
return
this
.
configurationMetadata
;
}
}
}
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java
View file @
27ada029
...
...
@@ -116,7 +116,6 @@ public final class OAuth2ClientPropertiesRegistrationAdapter {
.
to
(
builder:
:
userInfoAuthenticationMethod
);
map
.
from
(
provider:
:
getJwkSetUri
).
to
(
builder:
:
jwkSetUri
);
map
.
from
(
provider:
:
getUserNameAttribute
).
to
(
builder:
:
userNameAttributeName
);
map
.
from
(
provider:
:
getConfigurationMetadata
).
to
(
builder:
:
providerConfigurationMetadata
);
return
builder
;
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
View file @
27ada029
...
...
@@ -238,20 +238,6 @@ class OAuth2ClientPropertiesRegistrationAdapterTests {
testIssuerConfiguration
(
login
,
"okta"
,
2
,
3
);
}
@Test
void
configurationMetadataFromProviderIsAdapted
()
{
Provider
provider
=
createProvider
();
provider
.
getConfigurationMetadata
().
put
(
"end_session_endpoint"
,
"https://myendsessionendpoint"
);
OAuth2ClientProperties
.
Registration
registration
=
createRegistration
(
"my-oauth-provider"
);
OAuth2ClientProperties
properties
=
new
OAuth2ClientProperties
();
properties
.
getRegistration
().
put
(
"registration"
,
registration
);
properties
.
getProvider
().
put
(
"my-oauth-provider"
,
provider
);
Map
<
String
,
ClientRegistration
>
registrations
=
OAuth2ClientPropertiesRegistrationAdapter
.
getClientRegistrations
(
properties
);
assertThat
(
registrations
.
get
(
"registration"
).
getProviderDetails
().
getConfigurationMetadata
()
.
get
(
"end_session_endpoint"
)).
isEqualTo
(
"https://myendsessionendpoint"
);
}
@Test
void
oidcProviderConfigurationWithCustomConfigurationOverridesProviderDefaults
()
throws
Exception
{
this
.
server
=
new
MockWebServer
();
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
27ada029
...
...
@@ -3219,7 +3219,6 @@ You can register multiple OAuth2 clients and providers under the `spring.securit
spring.security.oauth2.client.provider.my-oauth-provider.user-info-authentication-method=header
spring.security.oauth2.client.provider.my-oauth-provider.jwk-set-uri=https://my-auth-server/token_keys
spring.security.oauth2.client.provider.my-oauth-provider.user-name-attribute=name
spring.security.oauth2.client.provider.my-oauth-provider.configuration-metadata.end_session_endpoint=https://my-end-session-endpoint
----
For OpenID Connect providers that support https://openid.net/specs/openid-connect-discovery-1_0.html[OpenID Connect discovery], the configuration can be further simplified.
...
...
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