Fixed a ClassCastException happening while parsing access tokens with Gson

Author: jaaufauvre

library/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mastercard.developer</groupId>
         <artifactId>oauth2-client-java-root</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>oauth2-client-java</artifactId>
     <packaging>jar</packaging>

library/src/main/java/com/mastercard/developer/oauth2/core/OAuth2Handler.java

@@ -323,11 +323,11 @@ public static AccessTokenResponse parseAccessTokenJson(String accessTokenRespons
             if (null == tokenValue) {
                 throw new OAuth2ClientException("Missing value in access token response: access_token");
             }
-            var expiresInSeconds = (Integer) jsonMap.get("expires_in");
+            var expiresInSeconds = (Number) jsonMap.get("expires_in");
             if (null == expiresInSeconds) {
                 throw new OAuth2ClientException("Missing value in access token response: expires_in");
             }
-            Instant expiry = Instant.now().plusSeconds(expiresInSeconds);
+            Instant expiry = Instant.now().plusSeconds(expiresInSeconds.intValue());
             String scopeNode = (String) jsonMap.get("scope");
             Set<String> scopes = (scopeNode == null) ? Set.of() : Set.of(scopeNode.trim().split("\\s+"));
             return new AccessTokenResponse(tokenValue, scopes, expiry);

library/src/test/java/com/mastercard/developer/oauth2/internal/json/JsonProvidersTest.java

@@ -44,10 +44,26 @@ void parse_ShouldParseAccessTokenResponse(JsonProvider provider) throws Exceptio
         // THEN
         assertEquals("eyJ4NXQjUzI1NiI6Ii...oPIq4PZf2WaMxLow", map.get("access_token"));
         assertEquals("DPoP", map.get("token_type"));
-        assertEquals(900.0, ((Number) map.get("expires_in")).doubleValue());
+        assertEquals(900, ((Number) map.get("expires_in")).intValue());
         assertEquals("service:scope1 service:scope2", map.get("scope"));
     }
 
+    @ParameterizedTest
+    @MethodSource("jsonProviders")
+    void parse_ShouldParseExpireInDecimalValues(JsonProvider provider) throws Exception {
+        // GIVEN
+        var json = """
+            {
+              "expires_in": 900.0
+            }""";
+
+        // WHEN
+        Map<String, Object> map = provider.parse(json);
+
+        // THEN
+        assertEquals(900, ((Number) map.get("expires_in")).intValue());
+    }
+
     @ParameterizedTest
     @MethodSource("jsonProviders")
     void parse_ShouldParseJwk(JsonProvider provider) throws Exception {

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mastercard.developer</groupId>
     <artifactId>oauth2-client-java-root</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
 
     <properties>

test-clients/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mastercard.developer</groupId>
         <artifactId>oauth2-client-java-root</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>oauth2-client-java-test-clients</artifactId>
     <packaging>jar</packaging>