From 22e31e00fe803d5e1cc08a49a486d965c9671aaa Mon Sep 17 00:00:00 2001 From: tonis Date: Wed, 1 Mar 2023 19:37:06 +0700 Subject: [PATCH 1/2] fix unauthorized error in sandbox --- hmkit-fleet/src/main/kotlin/HMKitFleet.kt | 2 -- hmkit-fleet/src/main/kotlin/network/AuthTokenRequests.kt | 2 +- .../highmobility/hmkitfleet/network/AuthTokenRequestsTest.kt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hmkit-fleet/src/main/kotlin/HMKitFleet.kt b/hmkit-fleet/src/main/kotlin/HMKitFleet.kt index cd6defd..16e2f80 100644 --- a/hmkit-fleet/src/main/kotlin/HMKitFleet.kt +++ b/hmkit-fleet/src/main/kotlin/HMKitFleet.kt @@ -201,8 +201,6 @@ object HMKitFleet { */ @JvmField var webUrl: String? = null - internal val jwtUrl: String? - get() = webUrl } } diff --git a/hmkit-fleet/src/main/kotlin/network/AuthTokenRequests.kt b/hmkit-fleet/src/main/kotlin/network/AuthTokenRequests.kt index 3b80469..c7c0158 100644 --- a/hmkit-fleet/src/main/kotlin/network/AuthTokenRequests.kt +++ b/hmkit-fleet/src/main/kotlin/network/AuthTokenRequests.kt @@ -94,7 +94,7 @@ internal class AuthTokenRequests( put("ver", configuration.version) put("iss", configuration.serviceAccountApiKey) // OAuth is always in prod - put("aud", HMKitFleet.Environment.jwtUrl) + put("aud", HMKitFleet.environment.url) put("jti", configuration.createJti()) put("iat", configuration.createIat()) }.toString() diff --git a/hmkit-fleet/src/test/kotlin/com/highmobility/hmkitfleet/network/AuthTokenRequestsTest.kt b/hmkit-fleet/src/test/kotlin/com/highmobility/hmkitfleet/network/AuthTokenRequestsTest.kt index 81b06a7..94f8460 100644 --- a/hmkit-fleet/src/test/kotlin/com/highmobility/hmkitfleet/network/AuthTokenRequestsTest.kt +++ b/hmkit-fleet/src/test/kotlin/com/highmobility/hmkitfleet/network/AuthTokenRequestsTest.kt @@ -218,7 +218,7 @@ internal class AuthTokenRequestsTest : BaseTest() { val jwtBody = buildJsonObject { put("ver", configuration.version) put("iss", configuration.serviceAccountApiKey) - put("aud", HMKitFleet.Environment.jwtUrl) + put("aud", HMKitFleet.environment.url) put("jti", configuration.createJti()) put("iat", configuration.createIat()) }.toString() From 50691e7fabb798d56db48b4c3f8186ae7604767b Mon Sep 17 00:00:00 2001 From: tonis Date: Wed, 1 Mar 2023 19:37:51 +0700 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f78e16b..496a725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [0.6.5] +- fix JWT Authorization error in sandbox + ## [0.6.5] - Compile for Java 8