[DPMBE-118]이메일 허용 안했을때 발생하는 문제 해결

depromeet · Jul 14, 2023 · da84251 · da84251
2 parents 40bcc23 + 79b1246
commit da84251
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 8 deletions.
diff --git a/...-Api/src/main/kotlin/com/depromeet/whatnow/api/auth/dto/response/OauthUserInfoResponse.kt b/...-Api/src/main/kotlin/com/depromeet/whatnow/api/auth/dto/response/OauthUserInfoResponse.kt
@@ -3,15 +3,14 @@ package com.depromeet.whatnow.api.auth.dto.response
 import com.depromeet.whatnow.api.auth.helper.OauthUserInfoDto
 
 data class OauthUserInfoResponse(
-    val email: String?,
     val profileImage: String,
     val isDefaultImage: Boolean,
     val nickname: String,
 ) {
 
     companion object {
         fun from(oauthUserInfoDto: OauthUserInfoDto): OauthUserInfoResponse {
-            return OauthUserInfoResponse(oauthUserInfoDto.email, oauthUserInfoDto.profileImage, oauthUserInfoDto.isDefaultImage, oauthUserInfoDto.username)
+            return OauthUserInfoResponse(oauthUserInfoDto.profileImage, oauthUserInfoDto.isDefaultImage, oauthUserInfoDto.username)
         }
     }
 }
diff --git a/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/auth/helper/KakaoOauthHelper.kt b/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/auth/helper/KakaoOauthHelper.kt
@@ -41,7 +41,7 @@ class KakaoOauthHelper(
     fun getUserInfo(oauthAccessToken: String): OauthUserInfoDto {
         val response = kakaoInfoClient.kakaoUserInfo(BEARER + oauthAccessToken)
         val kakaoAccount: KakaoInformationResponse.KakaoAccount = response.kakaoAccount
-        return OauthUserInfoDto(response.id, kakaoAccount.profile.profileImageUrl, kakaoAccount.profile.isDefaultImage, kakaoAccount.profile.nickname, kakaoAccount.email, OauthProvider.KAKAO)
+        return OauthUserInfoDto(response.id, kakaoAccount.profile.profileImageUrl, kakaoAccount.profile.isDefaultImage, kakaoAccount.profile.nickname, OauthProvider.KAKAO)
     }
 
     fun getOIDCDecodePayload(token: String): OIDCDecodePayload {

diff --git a/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/auth/helper/OauthUserInfoDto.kt b/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/auth/helper/OauthUserInfoDto.kt
@@ -8,7 +8,6 @@ data class OauthUserInfoDto(
     val profileImage: String,
     val isDefaultImage: Boolean,
     val username: String,
-    val email: String?,
     val oauthProvider: OauthProvider,
 ) {
     fun toOauthInfo(): OauthInfo {

diff --git a/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/config/jwt/JwtOIDCHelper.kt b/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/config/jwt/JwtOIDCHelper.kt
@@ -52,7 +52,6 @@ class JwtOIDCHelper {
             body.issuer,
             body.audience,
             body.subject,
-            body["email", String::class.java],
         )
     }
 

diff --git a/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/config/jwt/OIDCDecodePayload.kt b/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/config/jwt/OIDCDecodePayload.kt
@@ -11,5 +11,4 @@ data class OIDCDecodePayload(
     /** oauth provider account unique id  */
     val sub: String,
 
-    val email: String,
 )
diff --git a/...-Infrastructure/src/main/kotlin/com/depromeet/whatnow/api/dto/KakaoInformationResponse.kt b/...-Infrastructure/src/main/kotlin/com/depromeet/whatnow/api/dto/KakaoInformationResponse.kt
@@ -18,7 +18,6 @@ data class KakaoInformationResponse(
     @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
     data class KakaoAccount(
         val profile: Profile,
-        val email: String?,
     ) {
 
         @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)

diff --git a/Whatnow-Infrastructure/src/test/kotlin/com/depromeet/whatnow/api/KakaoInfoClientTest.kt b/Whatnow-Infrastructure/src/test/kotlin/com/depromeet/whatnow/api/KakaoInfoClientTest.kt
@@ -40,7 +40,6 @@ class KakaoInfoClientTest {
                 ),
         )
         var response = kakaoInfoClient.kakaoUserInfo("accessToken")
-        assertEquals(response.kakaoAccount.email, "sample@sample.com")
         assertEquals(response.kakaoAccount.profile.profileImageUrl, "http://yyy.kakao.com/dn/.../img_640x640.jpg")
         assertEquals(response.kakaoAccount.profile.isDefaultImage, false)
     }