From c98e34fc8f0b5bd84c569ae32cdd396dc44b13b0 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 6 Sep 2013 13:53:01 -0400 Subject: [PATCH] introspected scopes are now space-separated, not arrays --- .../introspectingfilter/AuthorizationRequestImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java index 44732f2cc..03b2a2d3c 100644 --- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java +++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java @@ -24,6 +24,8 @@ import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.oauth2.provider.AuthorizationRequest; +import com.google.common.base.Splitter; +import com.google.common.collect.Sets; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -36,9 +38,8 @@ public class AuthorizationRequestImpl implements AuthorizationRequest { public AuthorizationRequestImpl(JsonObject token) { this.token = token; clientId = token.get("client_id").getAsString(); - scopes = new HashSet(); - for (JsonElement e : token.get("scope").getAsJsonArray()) { - scopes.add(e.getAsString()); + if (token.get("scope") != null) { + scopes = Sets.newHashSet(Splitter.on(" ").split(token.get("scope").getAsString())); } }