Upgrade com.nimbusds:oauth2-oidc-sdk version (#4)

* Upgrade com.nimbusds:oauth2-oidc-sdk version * Bump version Co-authored-by: Oscar Silver <[email protected]>
schibsted · May 13, 2022 · ec04a46 · ec04a46
1 parent dce3b50
commit ec04a46
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2022-05-13
+Upgrade com.nimbusds:oauth2-oidc-sdk version
+
+## [1.0.2] - 2022-03-10
+
+Add support for acr_values query parameter in login flow.
+
 ## [1.0.1] - 2021-05-05
 
 No changes. Only released to migrate from Bintray to Maven Central.

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 }
 
-version '1.0.2'
+version '1.0.3'
 group 'com.schibsted.account'
 
 repositories {
@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     compile('com.konghq:unirest-java:3.10.00')
-    compile('com.nimbusds:oauth2-oidc-sdk:8.19')
+    compile('com.nimbusds:oauth2-oidc-sdk:9.35')
     compile('ch.qos.logback:logback-core:1.2.3')
     compile('ch.qos.logback:logback-classic:1.2.3')
     compile('org.slf4j:slf4j-api:1.7.25')

diff --git a/src/main/java/com/schibsted/account/nimbus/NimbusWrapper.java b/src/main/java/com/schibsted/account/nimbus/NimbusWrapper.java
@@ -185,7 +185,7 @@ private JSONObject makeHTTPRequest(HTTPRequest httpRequest) throws HTTPException
 
         try {
             HttpResponse<String> response = request.body(httpRequest.getQuery()).asString();
-            return JSONObjectUtils.parse(response.getBody());
+            return new JSONObject(JSONObjectUtils.parse(response.getBody()));
         } catch (UnirestException | java.text.ParseException e) {
             throw new HTTPException(e);
         }

diff --git a/src/test/java/com/schibsted/account/testutil/TokenHelper.java b/src/test/java/com/schibsted/account/testutil/TokenHelper.java
@@ -101,7 +101,7 @@ public static JWKSet jwks() {
     }
 
     public static String introspectionResponse(JWTClaimsSet tokenClaims) {
-        JSONObject claims = tokenClaims.toJSONObject();
+        JSONObject claims = new JSONObject(tokenClaims.toJSONObject());
         claims.put("active", true);
         return claims.toJSONString();
     }