Add JWT SecretKey in production env

whatever-mentoring · Dec 9, 2023 · b22eba5 · b22eba5
1 parent 4653b1b
commit b22eba5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/auth/jwt/JwtAgentImpl.kt b/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/auth/jwt/JwtAgentImpl.kt
@@ -33,7 +33,7 @@ class JwtAgentImpl(
 
     private fun buildClaims(user: User): Claims {
         val claims = Jwts.claims()
-        claims.setSubject(user.nickname.nickname)
+        claims.setSubject(user.nickname.value)
         claims["id"] = user.id
         return claims
     }

diff --git a/...ore/src/main/kotlin/com/whatever/raisedragon/domain/auth/oauth/kakao/KakaoOAuthService.kt b/...ore/src/main/kotlin/com/whatever/raisedragon/domain/auth/oauth/kakao/KakaoOAuthService.kt
@@ -29,6 +29,6 @@ class KakaoOAuthService(
             KakaoLoginResponse::class.java
         )
 
-        return response.body!!.id!!
+        return response.body?.id!!
     }
 }
diff --git a/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserEntity.kt b/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserEntity.kt
@@ -25,7 +25,10 @@ fun User.fromDto(): UserEntity = UserEntity(
 )
 
 @Embeddable
-data class Nickname(val nickname: String) {
+data class Nickname(
+    @Column(name = "nickname")
+    val value: String
+) {
     companion object {
         fun generateRandomNickname(): Nickname {
             return Nickname("random nickname")

diff --git a/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserService.kt b/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserService.kt
@@ -9,11 +9,9 @@ class UserService(
     private val userRepository: UserRepository,
 ) {
 
-
     @Transactional(readOnly = true)
     fun loadByOAuthPayload(payload: String): User? {
-        val user = userRepository.findByOauthTokenPayload(payload) ?: return null
-        return user.toDto()
+        return userRepository.findByOauthTokenPayload(payload)?.toDto()
     }
 
     fun create(user: User): User {

diff --git a/raisedragon-core/src/main/resources/domain-config/application-prod.yml b/raisedragon-core/src/main/resources/domain-config/application-prod.yml
@@ -1,3 +1,6 @@
+jwt:
+  secret-key: ENC(nFedRKX5zt00VoNk/11zZcZVAtdnl/AHTDJW74urxj103ameypl1NctWnJYl90thp8OS/DIP8B0oHXgvMVJ02TPFiMZes3Kf3/EPG9t/MnUKvjc4iz1HZ+F76oDcvxXheKiioRZkGt1b0g9iyh7PW4CKSo5T/rScgXsg2c+05bg=)
+
 spring:
   config:
     activate: