OLTU-205 - JSON token response incorrect, google token has a unexpected format
git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1813303 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java b/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java
index 96fc91b..2efdd7b 100644
--- a/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java
+++ b/demos/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java
@@ -99,13 +99,15 @@
if (Utils.GOOGLE.equalsIgnoreCase(app)) {
OpenIdConnectResponse openIdConnectResponse = ((OpenIdConnectResponse) oauthResponse);
JWT idToken = openIdConnectResponse.getIdToken();
- oauthParams.setIdToken(idToken.getRawString());
+ if (idToken != null) {
+ oauthParams.setIdToken(idToken.getRawString());
- oauthParams.setHeader(new JWTHeaderWriter().write(idToken.getHeader()));
- oauthParams.setClaimsSet(new JWTClaimsSetWriter().write(idToken.getClaimsSet()));
+ oauthParams.setHeader(new JWTHeaderWriter().write(idToken.getHeader()));
+ oauthParams.setClaimsSet(new JWTClaimsSetWriter().write(idToken.getClaimsSet()));
- URI uri = URI.create(oauthParams.getTokenEndpoint());
- oauthParams.setIdTokenValid(openIdConnectResponse.checkId(uri.getHost(), oauthParams.getClientId()));
+ URI uri = URI.create(oauthParams.getTokenEndpoint());
+ oauthParams.setIdTokenValid(openIdConnectResponse.checkId(uri.getHost(), oauthParams.getClientId()));
+ }
}
return new ModelAndView("get_resource");
