#10 refactor: 코드 리뷰 반영

Team-Going · Dec 5, 2024 · ed7a37a · ed7a37a
1 parent 5200430
commit ed7a37a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,6 +5,6 @@ object Versions {
     const val SPRING_BOOT = "3.2.5"
     const val SPRING_DEPENDENCY_MANAGEMENT = "1.1.5"
     const val MYSQL = "8.0.33"
-    const val JJWT = "0.12.5"
+    const val JJWT = "0.12.6"
     const val JDK = 17
-}
+}
diff --git a/support/jwt/src/main/kotlin/org/doorip/support/jwt/JwtSecretKey.kt b/support/jwt/src/main/kotlin/org/doorip/support/jwt/JwtSecretKey.kt
@@ -6,6 +6,7 @@ import java.security.Key
 class JwtSecretKey(
     private val secret: String,
 ) : SignatureKey {
+
     override val key: Key by lazy {
         Keys.hmacShaKeyFor(secret.toByteArray())
     }

diff --git a/support/jwt/src/main/kotlin/org/doorip/support/jwt/RSAPublicKey.kt b/support/jwt/src/main/kotlin/org/doorip/support/jwt/RSAPublicKey.kt
@@ -11,19 +11,24 @@ class RSAPublicKey(
     private val e: String,
     private val type: String,
 ) : SignatureKey {
-    override val key: Key by lazy {
-        val decoder = Base64.getUrlDecoder()
 
-        val nBytes = decoder.decode(n)
-        val eBytes = decoder.decode(e)
+    override val key: Key? by lazy {
+        try {
+            val decoder = Base64.getUrlDecoder()
 
-        val n = BigInteger(1, nBytes)
-        val e = BigInteger(1, eBytes)
+            val nBytes = decoder.decode(n)
+            val eBytes = decoder.decode(e)
 
-        val rsaPublicKeySpec = RSAPublicKeySpec(n, e)
+            val n = BigInteger(1, nBytes)
+            val e = BigInteger(1, eBytes)
 
-        val keyFactory = KeyFactory.getInstance(type)
+            val rsaPublicKeySpec = RSAPublicKeySpec(n, e)
 
-        keyFactory.generatePublic(rsaPublicKeySpec)
+            val keyFactory = KeyFactory.getInstance(type)
+
+            keyFactory.generatePublic(rsaPublicKeySpec)
+        } catch (e: Exception) {
+            null
+        }
     }
 }
diff --git a/support/jwt/src/main/kotlin/org/doorip/support/jwt/SignatureKey.kt b/support/jwt/src/main/kotlin/org/doorip/support/jwt/SignatureKey.kt
@@ -3,5 +3,5 @@ package org.doorip.support.jwt
 import java.security.Key
 
 interface SignatureKey {
-    val key: Key
+    val key: Key?
 }