fix: Fixed failing test and null pointer exception

Sphereon-Opensource · Jul 23, 2024 · 3fb5bb6 · 3fb5bb6
1 parent 859d788
commit 3fb5bb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/...penid-federation-common/src/jvmMain/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwt.jvm.kt b/...penid-federation-common/src/jvmMain/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwt.jvm.kt
@@ -20,15 +20,10 @@ actual fun sign(
         .keyID(UUID.randomUUID().toString())
         .generate()
 
-    val kid = rsaJWK?.keyID
-
-    val header: JWSHeader?
-    if (opts["jwtHeader"] != null) {
-        header = JWSHeader.parse(opts["jwtHeader"] as String?)
-    } else {
-        header = JWSHeader.Builder(JWSAlgorithm.RS256).keyID(kid).build()
-    }
-
+    val header = opts["jwtHeader"]?.let {
+        JWSHeader.parse(it as String?)
+    } ?: JWSHeader.Builder(JWSAlgorithm.RS256).keyID(rsaJWK.keyID).build()
+
     val signer: JWSSigner = RSASSASigner(rsaJWK)
 
     val claimsSet = JWTClaimsSet.parse(payload)
@@ -54,6 +49,6 @@ actual fun verify(
         val verified = signedJWT.verify(verifier)
         return verified
     } catch (e: Exception) {
-        throw Exception("Couldn't verify the JWT Signature: ${e.message}")
+        throw Exception("Couldn't verify the JWT Signature: ${e.message}", e)
     }
 }
diff --git a/...d-federation-common/src/jvmTest/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwtTest.jvm.kt b/...d-federation-common/src/jvmTest/kotlin/com/sphereon/oid/fed/common/jwt/JoseJwtTest.jvm.kt
@@ -9,7 +9,7 @@ class JoseJwtTest {
 
     @Test
     fun signTest() {
-        val signature = sign("{ \"iss\": \"test\" }", mutableMapOf())
+        val signature = sign("{ \"iss\": \"test\" }", emptyMap())
         assertTrue { signature.startsWith("ey") }
     }