Add JWT SecretKey in production env

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

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/auth/AuthService.kt b/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/auth/AuthService.kt
@@ -4,8 +4,8 @@ interface AuthService {
     /**
      * 사용자가 전달한 토큰을 가지고 사용자의 카카오 유저 아이디를 반환하는 메소드입니다.
      *
-     * @param accessToken 사용자가 클라이언트에서 발급받은 토큰입니다.
+     * @param userToken 사용자가 클라이언트에서 발급받은 토큰입니다.
      * @return 사용자의 카카오 유저 아이디. 반환 값이 없거나 유효하지 않은 토큰인 경우 null을 반환합니다.
      */
-    fun verifyKaKao(accessToken: String): String
+    fun verifyKaKao(userToken: String): String
 }
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
@@ -13,10 +13,10 @@ class KakaoOAuthService(
 ) : AuthService {
 
     private val KAKAO_USERINFO_REQUEST_URL = "https://kapi.kakao.com/v2/user/me"
-    override fun verifyKaKao(accessToken: String): String {
+    override fun verifyKaKao(userToken: String): String {
         val headers = HttpHeaders()
         headers.contentType = MediaType.APPLICATION_FORM_URLENCODED
-        headers.setBearerAuth(accessToken)
+        headers.setBearerAuth(userToken)
 
         val request = HttpEntity(
             null,
@@ -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: