Merge pull request #82 from docusign/DCM-2570

Fixed issue #81

Author: mmallis87

CHANGELOG.md

@@ -1,12 +1,9 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
+# DocuSign Java Client Changelog
 See [DocuSign Support Center](https://support.docusign.com/en/releasenotes/) for Product Release Notes.
 
-## [Unreleased]
-### Changed
-- Updated the package with the latest API monthly release.
-
+## [v2.6.2] - eSignature API v18.1.02 - 7/3/2018
+### Fixed
+* Fixed a problem that could cause the getUserInfo method to generate an exception when returning information about a user who was part of an organization. The method now returns same set of organization data as the [oauth/userinfo](https://developers.docusign.com/esign-rest-api/guides/authentication/user-info-endpoints) API endpoint method.
 
 ## [2.6.1] - 2018-06-06
 ### Security

src/main/java/com/docusign/esign/client/ApiClient.java

@@ -76,6 +76,7 @@ public class ApiClient {
 
   public ApiClient() {
     mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -514,6 +515,7 @@ public OAuth.OAuthToken generateAccessToken(String clientId, String clientSecret
                       respBody);
           }
           ObjectMapper mapper = new ObjectMapper();
+          mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 		  OAuth.OAuthToken oAuthToken = mapper.readValue(response.getEntityInputStream(), OAuth.OAuthToken.class);
 	      return oAuthToken;
 	  } catch (JsonParseException e) {
@@ -550,6 +552,7 @@ public OAuth.UserInfo getUserInfo(String accessToken) throws IllegalArgumentExce
                         respBody);
             }
             ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             OAuth.UserInfo userInfo = mapper.readValue(response.getEntityInputStream(), OAuth.UserInfo.class);
 
 			// TODO "auto-assign base uri of the default account" is coming in next versions
@@ -562,7 +565,7 @@ public OAuth.UserInfo getUserInfo(String accessToken) throws IllegalArgumentExce
 			}*/
 			return userInfo;
 		} catch (Exception e) {
-			throw new ApiException("Error while fecthing user info: " + e.getMessage());
+			throw new ApiException("Error while fetching user info: " + e.getMessage());
 		}
 	}
 
@@ -623,6 +626,7 @@ public void configureJWTAuthorizationFlow(String publicKeyFilename, String priva
 				    .post(ClientResponse.class, form);
 
 		  ObjectMapper mapper = new ObjectMapper();
+          mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 	      JsonNode responseJson = mapper.readValue(response.getEntityInputStream(), JsonNode.class);
 	      if (!responseJson.has("access_token") || !responseJson.has("expires_in")) {
 	    	  throw new ApiException("Error while requesting an access token: " + responseJson);