fix NPE for OpenId providers

kullfar · kullfar · commit dc8cfc354788 · 2019-06-13T13:29:48.000+03:00
diff --git a/changelog b/changelog
@@ -1,3 +1,6 @@
+[SNAPSHOT]
+ * fix NPE for OpenId providers
+ 
 [6.6.2]
  * add PMD checks on compile
  * add all OAuth error codes from supported RFCs (incl. "invalid_token") (thanks to https://github.com/echorebel)
diff --git a/pom.xml b/pom.xml
@@ -101,12 +101,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.20</version>
+                            <version>8.21</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -273,7 +273,7 @@
 
     <properties>
         <java.release>7</java.release>
-        <pmdVersion>6.14.0</pmdVersion>
+        <pmdVersion>6.15.0</pmdVersion>
     </properties>
 
     <profiles>
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/openid/OpenIdJsonTokenExtractor.java
@@ -23,7 +23,8 @@ public static OpenIdJsonTokenExtractor instance() {
     @Override
     protected OpenIdOAuth2AccessToken createToken(String accessToken, String tokenType, Integer expiresIn,
             String refreshToken, String scope, JsonNode response, String rawResponse) {
+        final JsonNode idToken = response.get("id_token");
         return new OpenIdOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope,
-                response.get("id_token").asText(), rawResponse);
+                idToken == null ? null : idToken.asText(), rawResponse);
     }
 }
diff --git a/scribejava-httpclient-ahc/pom.xml b/scribejava-httpclient-ahc/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>2.8.1</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.scribejava</groupId>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public static OpenIdJsonTokenExtractor instance() {`
`23`	`23`	`@Override`
`24`	`24`	`protected OpenIdOAuth2AccessToken createToken(String accessToken, String tokenType, Integer expiresIn,`
`25`	`25`	`String refreshToken, String scope, JsonNode response, String rawResponse) {`
	`26`	`+ final JsonNode idToken = response.get("id_token");`
`26`	`27`	`return new OpenIdOAuth2AccessToken(accessToken, tokenType, expiresIn, refreshToken, scope,`
`27`		`- response.get("id_token").asText(), rawResponse);`
	`28`	`+ idToken == null ? null : idToken.asText(), rawResponse);`
`28`	`29`	`}`
`29`	`30`	`}`