fixed missing null check in request object parser
parent
ed0b476bb7
commit
dee78c130c
|
@ -39,6 +39,7 @@ import org.springframework.security.oauth2.provider.AuthorizationRequest;
|
||||||
import org.springframework.security.oauth2.provider.request.DefaultOAuth2RequestFactory;
|
import org.springframework.security.oauth2.provider.request.DefaultOAuth2RequestFactory;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import com.google.common.base.Strings;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
|
@ -358,11 +359,15 @@ public class ConnectOAuth2RequestFactory extends DefaultOAuth2RequestFactory {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private JsonObject parseClaimRequest(String claimRequestString) {
|
private JsonObject parseClaimRequest(String claimRequestString) {
|
||||||
JsonElement el = parser .parse(claimRequestString);
|
if (Strings.isNullOrEmpty(claimRequestString)) {
|
||||||
if (el != null && el.isJsonObject()) {
|
|
||||||
return el.getAsJsonObject();
|
|
||||||
} else {
|
|
||||||
return null;
|
return null;
|
||||||
|
} else {
|
||||||
|
JsonElement el = parser.parse(claimRequestString);
|
||||||
|
if (el != null && el.isJsonObject()) {
|
||||||
|
return el.getAsJsonObject();
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue