From cd99f27bf89db75396492c8cdbe486300f68af8e Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Fri, 10 May 2013 11:43:41 -0700
Subject: [PATCH] Changed references from ClientDetails to ClientDetailsEntity,
pending new ClientConfiguration class utility class from #335. Addresses #331
---
.../openid/connect/client/OIDCAuthenticationFilter.java | 4 ++--
.../client/service/ClientConfigurationService.java | 3 ++-
.../DynamicRegistrationClientConfigurationService.java | 2 +-
.../service/impl/StaticClientConfigurationService.java | 9 +++++----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
index 7200942ba..df1784080 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
@@ -229,7 +229,7 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi
// pull the configurations based on that 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>();
form.add("grant_type", "authorization_code");
@@ -249,7 +249,7 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi
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
restTemplate = new RestTemplate(factory) {
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
index d3af10725..36990c8fa 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
@@ -19,6 +19,7 @@
*/
package org.mitre.openid.connect.client.service;
+import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.openid.connect.config.ServerConfiguration;
import org.springframework.security.oauth2.provider.ClientDetails;
@@ -28,6 +29,6 @@ import org.springframework.security.oauth2.provider.ClientDetails;
*/
public interface ClientConfigurationService {
- public ClientDetails getClientConfiguration(ServerConfiguration issuer);
+ public ClientDetailsEntity getClientConfiguration(ServerConfiguration issuer);
}
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
index 72131bc00..e112908d9 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
@@ -60,7 +60,7 @@ public class DynamicRegistrationClientConfigurationService implements ClientConf
}
@Override
- public ClientDetails getClientConfiguration(ServerConfiguration issuer) {
+ public ClientDetailsEntity getClientConfiguration(ServerConfiguration issuer) {
try {
return clients.get(issuer);
} catch (ExecutionException e) {
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
index cbf92cb74..83e062611 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
@@ -21,6 +21,7 @@ package org.mitre.openid.connect.client.service.impl;
import java.util.Map;
+import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.openid.connect.client.service.ClientConfigurationService;
import org.mitre.openid.connect.config.ServerConfiguration;
import org.springframework.beans.factory.InitializingBean;
@@ -37,19 +38,19 @@ import org.springframework.security.oauth2.provider.ClientDetails;
public class StaticClientConfigurationService implements ClientConfigurationService, InitializingBean {
// Map of issuer URL -> client configuration information
- private Map<String, ClientDetails> clients;
+ private Map<String, ClientDetailsEntity> clients;
/**
* @return the clients
*/
- public Map<String, ClientDetails> getClients() {
+ public Map<String, ClientDetailsEntity> getClients() {
return clients;
}
/**
* @param clients the clients to set
*/
- public void setClients(Map<String, ClientDetails> clients) {
+ public void setClients(Map<String, ClientDetailsEntity> 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)
*/
@Override
- public ClientDetails getClientConfiguration(ServerConfiguration issuer) {
+ public ClientDetailsEntity getClientConfiguration(ServerConfiguration issuer) {
return clients.get(issuer.getIssuer());
}