Merge pull request #14 from highmobility/fix-jwt

Fix jwt
highmobility · Mar 1, 2023 · 60debe6 · 60debe6
2 parents 52e46f9 + 50691e7
commit 60debe6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
 

diff --git 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
@@ -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
@@ -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()