github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed references from ClientDetails to ClientDetailsEntity, pending new ClientConfiguration class utility class from #335. 

Addresses #331
pull/338/head
Justin Richer 2013-05-10 11:43:41 -07:00
parent cd711a8ac6
commit cd99f27bf8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
View File

@ -229,7 +229,7 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi
// pull the configurations based on that issuer // pull the configurations based on that issuer
ServerConfiguration serverConfig = servers.getServerConfiguration(issuer); ServerConfiguration serverConfig = servers.getServerConfiguration(issuer);
final ClientDetails clientConfig = clients.getClientConfiguration(serverConfig); final ClientDetailsEntity clientConfig = clients.getClientConfiguration(serverConfig);
MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>(); MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
form.add("grant_type", "authorization_code"); form.add("grant_type", "authorization_code");
@ -249,7 +249,7 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi
RestTemplate restTemplate; RestTemplate restTemplate;
if (clientConfig instanceof ClientDetailsEntity && SECRET_BASIC.equals(((ClientDetailsEntity) clientConfig).getTokenEndpointAuthMethod())){ if (SECRET_BASIC.equals(clientConfig.getTokenEndpointAuthMethod())){
// use BASIC auth if configured to do so // use BASIC auth if configured to do so
restTemplate = new RestTemplate(factory) { restTemplate = new RestTemplate(factory) {

3
openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
View File

@ -19,6 +19,7 @@
*/ */
package org.mitre.openid.connect.client.service; package org.mitre.openid.connect.client.service;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.openid.connect.config.ServerConfiguration; import org.mitre.openid.connect.config.ServerConfiguration;
import org.springframework.security.oauth2.provider.ClientDetails; import org.springframework.security.oauth2.provider.ClientDetails;
@ -28,6 +29,6 @@ import org.springframework.security.oauth2.provider.ClientDetails;
*/ */
public interface ClientConfigurationService { public interface ClientConfigurationService {
public ClientDetails getClientConfiguration(ServerConfiguration issuer); public ClientDetailsEntity getClientConfiguration(ServerConfiguration issuer);
} }

2
openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
View File

@ -60,7 +60,7 @@ public class DynamicRegistrationClientConfigurationService implements ClientConf
} }
@Override @Override
public ClientDetails getClientConfiguration(ServerConfiguration issuer) { public ClientDetailsEntity getClientConfiguration(ServerConfiguration issuer) {
try { try {
return clients.get(issuer); return clients.get(issuer);
} catch (ExecutionException e) { } catch (ExecutionException e) {

9
openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
View File

@ -21,6 +21,7 @@ package org.mitre.openid.connect.client.service.impl;
import java.util.Map; import java.util.Map;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.openid.connect.client.service.ClientConfigurationService; import org.mitre.openid.connect.client.service.ClientConfigurationService;
import org.mitre.openid.connect.config.ServerConfiguration; import org.mitre.openid.connect.config.ServerConfiguration;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@ -37,19 +38,19 @@ import org.springframework.security.oauth2.provider.ClientDetails;
public class StaticClientConfigurationService implements ClientConfigurationService, InitializingBean { public class StaticClientConfigurationService implements ClientConfigurationService, InitializingBean {
// Map of issuer URL -> client configuration information // Map of issuer URL -> client configuration information
private Map<String, ClientDetails> clients; private Map<String, ClientDetailsEntity> clients;
/** /**
* @return the clients * @return the clients
*/ */
public Map<String, ClientDetails> getClients() { public Map<String, ClientDetailsEntity> getClients() {
return clients; return clients;
} }
/** /**
* @param clients the clients to set * @param clients the clients to set
*/ */
public void setClients(Map<String, ClientDetails> clients) { public void setClients(Map<String, ClientDetailsEntity> clients) {
this.clients = clients; this.clients = clients;
} }
@ -59,7 +60,7 @@ public class StaticClientConfigurationService implements ClientConfigurationServ
* @see org.mitre.openid.connect.client.service.ClientConfigurationService#getClientConfiguration(java.lang.String) * @see org.mitre.openid.connect.client.service.ClientConfigurationService#getClientConfiguration(java.lang.String)
*/ */
@Override @Override
public ClientDetails getClientConfiguration(ServerConfiguration issuer) { public ClientDetailsEntity getClientConfiguration(ServerConfiguration issuer) {
return clients.get(issuer.getIssuer()); return clients.get(issuer.getIssuer());
} }