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

fixed use of wrong constant, closes #940

pull/943/head
Justin Richer 2015-10-13 18:08:56 -04:00
parent a5701f4ea3
commit 96f4d5e8a8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java
View File

@ -16,6 +16,11 @@
*******************************************************************************/ *******************************************************************************/
package org.mitre.openid.connect.token; package org.mitre.openid.connect.token;
import static org.mitre.openid.connect.request.ConnectRequestParameters.APPROVED_SITE;
import static org.mitre.openid.connect.request.ConnectRequestParameters.PROMPT;
import static org.mitre.openid.connect.request.ConnectRequestParameters.PROMPT_CONSENT;
import static org.mitre.openid.connect.request.ConnectRequestParameters.PROMPT_SEPARATOR;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
@ -47,10 +52,6 @@ import com.google.common.base.Splitter;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import static org.mitre.openid.connect.request.ConnectRequestParameters.APPROVED_SITE;
import static org.mitre.openid.connect.request.ConnectRequestParameters.PROMPT;
import static org.mitre.openid.connect.request.ConnectRequestParameters.PROMPT_SEPARATOR;
/** /**
* Custom User Approval Handler implementation which uses a concept of a whitelist, * Custom User Approval Handler implementation which uses a concept of a whitelist,
* blacklist, and greylist. * blacklist, and greylist.
@ -132,7 +133,7 @@ public class TofuUserApprovalHandler implements UserApprovalHandler {
// find out if we're supposed to force a prompt on the user or not // find out if we're supposed to force a prompt on the user or not
String prompt = (String) authorizationRequest.getExtensions().get(PROMPT); String prompt = (String) authorizationRequest.getExtensions().get(PROMPT);
List<String> prompts = Splitter.on(PROMPT_SEPARATOR).splitToList(Strings.nullToEmpty(prompt)); List<String> prompts = Splitter.on(PROMPT_SEPARATOR).splitToList(Strings.nullToEmpty(prompt));
if (!prompts.contains(PROMPT_SEPARATOR)) { if (!prompts.contains(PROMPT_CONSENT)) {
// if the prompt parameter is set to "consent" then we can't use approved sites or whitelisted sites // if the prompt parameter is set to "consent" then we can't use approved sites or whitelisted sites
// otherwise, we need to check them below // otherwise, we need to check them below