Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-03 00:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change ClientAuthenticationMethod from enum to class

Browse Source 
Fixes gh-4313
This commit is contained in:
Joe Grandja
2017-05-30 14:19:28 -04:00
parent e5ceeb4e22
commit 435e389609
6 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/boot/oauth2login/README.adoc
+8 -8
View File
@@ -393,7 +393,7 @@ The following specifies the common set of properties available for configuring a
- At the base of the *_client property key_* are the properties for specifying the configuration for an OAuth Client.
====
- *client-authentication-method* - the method used to authenticate the _Client_ with the _Provider_. Supported values are *header* and *form*.
- *client-authentication-method* - the method used to authenticate the _Client_ with the _Provider_. Supported values are *basic* and *post*.
- *authorized-grant-type* - the OAuth 2.0 Authorization Framework defines the https://tools.ietf.org/html/rfc6749#section-1.3.1[Authorization Code] grant type,
which is used to realize the _"authentication flow"_. Currently, this is the only supported grant type.
- *redirect-uri* - this is the client's _registered_ redirect URI that the _Authorization Server_ redirects the end-user's user-agent
@@ -443,7 +443,7 @@ security:
oauth2:
client:
google:
client-authentication-method: header
client-authentication-method: basic
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: openid, email, profile
@@ -454,7 +454,7 @@ security:
client-name: Google
client-alias: google
github:
client-authentication-method: header
client-authentication-method: basic
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: user
@@ -465,7 +465,7 @@ security:
client-name: GitHub
client-alias: github
facebook:
client-authentication-method: form
client-authentication-method: post
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: public_profile, email
@@ -476,7 +476,7 @@ security:
client-name: Facebook
client-alias: facebook
okta:
client-authentication-method: header
client-authentication-method: basic
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: openid, email, profile
@@ -503,7 +503,7 @@ Let's assume we have a _properties file_ named *oauth2-clients.properties* on th
----
security.oauth2.client.google.client-id=${client-id}
security.oauth2.client.google.client-secret=${client-secret}
security.oauth2.client.google.client-authentication-method=header
security.oauth2.client.google.client-authentication-method=basic
security.oauth2.client.google.authorized-grant-type=authorization_code
security.oauth2.client.google.redirect-uri=http://localhost:8080/oauth2/authorize/code/google
security.oauth2.client.google.scopes=openid,email,profile
@@ -553,8 +553,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
private ClientRegistration clientRegistration(String clientPropertyKey) {
String clientId = this.environment.getProperty(clientPropertyKey + "client-id");
String clientSecret = this.environment.getProperty(clientPropertyKey + "client-secret");
ClientAuthenticationMethod clientAuthenticationMethod = ClientAuthenticationMethod.valueOf(
this.environment.getProperty(clientPropertyKey + "client-authentication-method").toUpperCase());
ClientAuthenticationMethod clientAuthenticationMethod = new ClientAuthenticationMethod(
this.environment.getProperty(clientPropertyKey + "client-authentication-method"));
AuthorizationGrantType authorizationGrantType = AuthorizationGrantType.valueOf(
this.environment.getProperty(clientPropertyKey + "authorized-grant-type").toUpperCase());
String redirectUri = this.environment.getProperty(clientPropertyKey + "redirect-uri");
samples/boot/oauth2login/src/main/resources/META-INF/oauth2-clients-defaults.yml
+4 -4
View File
@@ -2,7 +2,7 @@ security:
oauth2:
client:
google:
client-authentication-method: header
client-authentication-method: basic
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: openid, email, profile
@@ -13,7 +13,7 @@ security:
client-name: Google
client-alias: google
github:
client-authentication-method: header
client-authentication-method: basic
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: user
@@ -24,7 +24,7 @@ security:
client-name: GitHub
client-alias: github
facebook:
client-authentication-method: form
client-authentication-method: post
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: public_profile, email
@@ -35,7 +35,7 @@ security:
client-name: Facebook
client-alias: facebook
okta:
client-authentication-method: header
client-authentication-method: basic
authorized-grant-type: authorization_code
redirect-uri: "{scheme}://{serverName}:{serverPort}{baseAuthorizeUri}/{clientAlias}"
scopes: openid, email, profile