Merge pull request #249 from AzureAD/dev

Pesomka/release.1.6.1 (#248)

Author: SomkaPe

README.md

@@ -16,7 +16,7 @@ Quick links:
 The library supports the following Java environments:
 - Java 8 (or higher)
 
-Current version - 1.6.0
+Current version - 1.6.1
 
 You can find the changes for each version in the [change log](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/master/changelog.txt).
 
@@ -28,13 +28,13 @@ Find [the latest package in the Maven repository](https://mvnrepository.com/arti
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>msal4j</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
 </dependency>
 ```
 ### Gradle
 
 ```
-compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.6.0'
+compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.6.1'
 ```
 
 ## Usage

changelog.txt

@@ -1,3 +1,7 @@
+Version 1.6.1
+=============
+- Compatibility with json-smart [1.3.1 - 2.3]
+
 Version 1.6.0
 =============
 - Client capabilities support

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>msal4j</artifactId>
-	<version>1.6.0</version>
+	<version>1.6.1</version>
 	<packaging>jar</packaging>
 	<name>msal4j</name>
 	<description>

src/main/java/com/microsoft/aad/msal4j/TokenResponse.java

@@ -42,6 +42,18 @@ static TokenResponse parseHttpResponse(final HTTPResponse httpResponse) throws P
         return parseJsonObject(jsonObject);
     }
 
+    static Long getLongValue(JSONObject jsonObject, String key) throws ParseException {
+        Object value = jsonObject.get(key);
+
+        if(value instanceof Long){
+            return JSONObjectUtils.getLong(jsonObject, key);
+        }
+        else
+        {
+            return Long.parseLong(JSONObjectUtils.getString(jsonObject, key));
+        }
+    }
+
     static TokenResponse parseJsonObject(final JSONObject jsonObject)
             throws ParseException {
 
@@ -68,12 +80,12 @@ static TokenResponse parseJsonObject(final JSONObject jsonObject)
 
         long expiresIn = 0;
         if (jsonObject.containsKey("expires_in")) {
-            expiresIn = Long.parseLong(jsonObject.getAsString("expires_in"));
+            expiresIn = getLongValue(jsonObject, "expires_in");
         }
 
         long ext_expires_in = 0;
         if (jsonObject.containsKey("ext_expires_in")) {
-            ext_expires_in = Long.parseLong(jsonObject.getAsString("ext_expires_in"));
+            ext_expires_in = getLongValue(jsonObject, "ext_expires_in");
         }
 
         String foci = null;

src/samples/msal-b2c-web-sample/pom.xml

@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>msal4j</artifactId>
-			<version>1.6.0</version>
+			<version>1.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>

src/samples/msal-obo-sample/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>msal4j</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>com.nimbusds</groupId>

src/samples/msal-web-sample/pom.xml

@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>msal4j</artifactId>
-			<version>1.6.0</version>
+			<version>1.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>

src/test/java/com/microsoft/aad/msal4j/CacheFormatTests.java

@@ -197,8 +197,9 @@ private void validateAccessTokenCacheEntity(String folder, String tokenResponse,
         String valueExpected = readResource(folder + AT_CACHE_ENTITY);
 
         JSONObject tokenResponseJsonObj = JSONObjectUtils.parse(tokenResponse);
-        long expireIn = Long.parseLong(tokenResponseJsonObj.getAsString("expires_in"));
-        long extExpireIn = Long.parseLong(tokenResponseJsonObj.getAsString("ext_expires_in"));
+        long expireIn = TokenResponse.getLongValue(tokenResponseJsonObj, "expires_in");
+
+        long extExpireIn = TokenResponse.getLongValue(tokenResponseJsonObj, "ext_expires_in");
 
         JSONAssert.assertEquals(valueExpected, valueActual,
                 new DynamicTimestampsComparator(JSONCompareMode.STRICT, expireIn, extExpireIn));