From f8d938630e91eec084313631c031092a90e4f194 Mon Sep 17 00:00:00 2001
From: Mike Derryberry <derryberry@mitre.org>
Date: Wed, 8 Aug 2012 13:20:05 -0400
Subject: [PATCH] added passthrough parameters to server config

---
 .../client/OIDCAuthenticationFilter.java      |  4 -
 .../client/OIDCSignedRequestFilter.java       | 77 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 7 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 23dd02ca0..f631a4ab8 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
@@ -122,10 +122,6 @@ public class OIDCAuthenticationFilter extends AbstractOIDCAuthenticationFilter {
 		oidcServerConfig.setClientSecret(clientSecret);
 	}
 
-	public void setErrorRedirectURI(String errorRedirectURI) {
-		this.errorRedirectURI = errorRedirectURI;
-	}
-
 	public void setTokenEndpointURI(String tokenEndpointURI) {
 		oidcServerConfig.setTokenEndpointURI(tokenEndpointURI);
 	}
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCSignedRequestFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCSignedRequestFilter.java
index 767b77543..b5c3235e3 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCSignedRequestFilter.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCSignedRequestFilter.java
@@ -75,10 +75,9 @@ public class OIDCSignedRequestFilter extends AbstractOIDCAuthenticationFilter {
 				e.printStackTrace();
 			}
 
-		} else if (StringUtils.isNotBlank(request.getParameter("token"))) {
-			
+		} else {
+
 			handleAuthorizationRequest(request, response, oidcServerConfig);
-		
 		}
 
 		return null;
@@ -141,4 +140,76 @@ public class OIDCSignedRequestFilter extends AbstractOIDCAuthenticationFilter {
 		this.signingAndValidationService = signingAndValidationService;
 	}
 
+	/**
+	 * @param authorizationEndpointURI
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setAuthorizationEndpointURI(java.lang.String)
+	 */
+	public void setAuthorizationEndpointURI(String authorizationEndpointURI) {
+		oidcServerConfig.setAuthorizationEndpointURI(authorizationEndpointURI);
+	}
+
+	/**
+	 * @param clientId
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setClientId(java.lang.String)
+	 */
+	public void setClientId(String clientId) {
+		oidcServerConfig.setClientId(clientId);
+	}
+
+	/**
+	 * @param issuer
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setIssuer(java.lang.String)
+	 */
+	public void setIssuer(String issuer) {
+		oidcServerConfig.setIssuer(issuer);
+	}
+
+	/**
+	 * @param clientSecret
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setClientSecret(java.lang.String)
+	 */
+	public void setClientSecret(String clientSecret) {
+		oidcServerConfig.setClientSecret(clientSecret);
+	}
+
+	/**
+	 * @param tokenEndpointURI
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setTokenEndpointURI(java.lang.String)
+	 */
+	public void setTokenEndpointURI(String tokenEndpointURI) {
+		oidcServerConfig.setTokenEndpointURI(tokenEndpointURI);
+	}
+
+	/**
+	 * @param x509EncryptUrl
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setX509EncryptUrl(java.lang.String)
+	 */
+	public void setX509EncryptUrl(String x509EncryptUrl) {
+		oidcServerConfig.setX509EncryptUrl(x509EncryptUrl);
+	}
+
+	/**
+	 * @param x509SigningUrl
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setX509SigningUrl(java.lang.String)
+	 */
+	public void setX509SigningUrl(String x509SigningUrl) {
+		oidcServerConfig.setX509SigningUrl(x509SigningUrl);
+	}
+
+	/**
+	 * @param jwkEncryptUrl
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setJwkEncryptUrl(java.lang.String)
+	 */
+	public void setJwkEncryptUrl(String jwkEncryptUrl) {
+		oidcServerConfig.setJwkEncryptUrl(jwkEncryptUrl);
+	}
+
+	/**
+	 * @param jwkSigningUrl
+	 * @see org.mitre.openid.connect.config.OIDCServerConfiguration#setJwkSigningUrl(java.lang.String)
+	 */
+	public void setJwkSigningUrl(String jwkSigningUrl) {
+		oidcServerConfig.setJwkSigningUrl(jwkSigningUrl);
+	}
+
 }