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

buildRedirectURI moved to URLUtils

pull/210/head
Stephen Moore 2012-09-07 15:52:56 -04:00
parent 05efdbf39d
commit 4eee172f79
1 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
openid-connect-client/src/main/java/org/mitre/openid/connect/client/AbstractOIDCAuthenticationFilter.java
View File

@ -110,6 +110,8 @@ public class AbstractOIDCAuthenticationFilter extends
boolean isFirst = true; boolean isFirst = true;
StringBuffer sb = request.getRequestURL(); StringBuffer sb = request.getRequestURL();
List<NameValuePair> queryparams = new ArrayList<NameValuePair>();
for (Enumeration<?> e = request.getParameterNames(); e.hasMoreElements();) { for (Enumeration<?> e = request.getParameterNames(); e.hasMoreElements();) {
@ -125,20 +127,22 @@ public class AbstractOIDCAuthenticationFilter extends
continue; continue;
} }
if (isFirst) { queryparams.add(new BasicNameValuePair(name,value));
sb.append("?");
isFirst = false; //if (isFirst) {
// sb.append("?");
// isFirst = false;
//}
//sb.append(name).append("=").append(value);
//if (e.hasMoreElements()) {
// sb.append("&");
//}
} }
sb.append(name).append("=").append(value);
if (e.hasMoreElements()) {
sb.append("&");
} }
} return sb.append("?").append(URLEncodedUtils.format(queryparams, "UTF-8")).toString();
}
return sb.toString();
} }
/** /**
@ -156,7 +160,6 @@ public class AbstractOIDCAuthenticationFilter extends
* parameters. * parameters.
*/ */
public static String buildURL(String baseURI, Map<String, String> queryStringFields) { public static String buildURL(String baseURI, Map<String, String> queryStringFields) {
// TODO: replace this with URIUtils call
StringBuilder URLBuilder = new StringBuilder(baseURI); StringBuilder URLBuilder = new StringBuilder(baseURI);
List<NameValuePair> queryparams = new ArrayList<NameValuePair>(); List<NameValuePair> queryparams = new ArrayList<NameValuePair>();
char appendChar = '?'; char appendChar = '?';
@ -167,35 +170,6 @@ public class AbstractOIDCAuthenticationFilter extends
} }
URLBuilder.append(appendChar).append(URLEncodedUtils.format(queryparams, "UTF-8")); URLBuilder.append(appendChar).append(URLEncodedUtils.format(queryparams, "UTF-8"));
/* try {
URI uri = new URI(baseURI);
URI returnURI = URIUtils.createURI(uri.getScheme(), uri.getHost(), uri.getPort(), uri.getPath(), URLEncodedUtils.format(queryparams, "UTF-8"), null);
return returnURI.toString();
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
for (Map.Entry<String, String> param : queryStringFields.entrySet()) {
try {
URLBuilder.append(appendChar)
.append(param.getKey())
.append('=')
.append(URLEncoder.encode(param.getValue(), "UTF-8"));
} catch (UnsupportedEncodingException uee) {
throw new IllegalStateException(uee);
}
appendChar = '&';
} */
return URLBuilder.toString(); return URLBuilder.toString();
} }