feat: algorithm in initial keys

Author: ybelMekk

src/main/kotlin/no/nav/security/mock/oauth2/token/KeyGenerator.kt

@@ -23,7 +23,7 @@ data class KeyGenerator(
         if (keyGenerator.algorithm != KeyType.RSA.value) {
             return keyGenerator.generateECKey(keyId, algorithm)
         }
-        return keyGenerator.generateRSAKey(keyId)
+        return keyGenerator.generateRSAKey(keyId, algorithm)
     }
 
     private fun KeyPairGenerator.generateECKey(keyId: String, algorithm: JWSAlgorithm): JWK =
@@ -33,6 +33,7 @@ data class KeyGenerator(
                     .privateKey(it.private as ECPrivateKey)
                     .keyUse(KeyUse.SIGNATURE)
                     .keyID(keyId)
+                    .algorithm(algorithm)
                     .build()
             }
 
@@ -44,13 +45,14 @@ data class KeyGenerator(
         }
     }
 
-    private fun KeyPairGenerator.generateRSAKey(keyId: String): JWK =
+    private fun KeyPairGenerator.generateRSAKey(keyId: String, algorithm: JWSAlgorithm): JWK =
         generateKeyPair()
             .let {
                 RSAKey.Builder(it.public as RSAPublicKey)
                     .privateKey(it.private as RSAPrivateKey)
                     .keyUse(KeyUse.SIGNATURE)
                     .keyID(keyId)
+                    .algorithm(algorithm)
                     .build()
             }
 

src/test/kotlin/no/nav/security/mock/oauth2/token/KeyGeneratorTest.kt

@@ -11,6 +11,7 @@ import com.nimbusds.jwt.JWTClaimsSet
 import com.nimbusds.jwt.SignedJWT
 import com.nimbusds.oauth2.sdk.id.Issuer
 import io.kotest.assertions.throwables.shouldNotThrow
+import io.kotest.matchers.collections.shouldBeIn
 import io.kotest.matchers.shouldBe
 import no.nav.security.mock.oauth2.extensions.verifySignatureAndIssuer
 import no.nav.security.mock.oauth2.token.KeyGenerator.Companion.ecAlgorithmFamily
@@ -34,6 +35,7 @@ class KeyGeneratorTest {
             keys.keyID shouldBe keyId
             keys.keyType.toString() shouldBe KeyType.RSA.value
             keys.keyUse.toString() shouldBe "sig"
+            keys.algorithm shouldBeIn rsaAlgorithmFamily
 
             val issuer = Issuer("issuer$index")
             val jwt = jwtWith(issuer.value, keyId, JOSEObjectType.JWT.type, jwsAlgorithm)
@@ -61,6 +63,7 @@ class KeyGeneratorTest {
             keys.keyID shouldBe keyId
             keys.keyType.toString() shouldBe KeyType.EC.value
             keys.keyUse.toString() shouldBe "sig"
+            keys.algorithm shouldBeIn ecAlgorithmFamily
 
             val issuer = Issuer("issuer$index")
             val jwt = jwtWith(issuer.value, keyId, JOSEObjectType.JWT.type, jwsAlgorithm)