fix: 회원 탈퇴 버그 수정

woowacourse-teams · Oct 7, 2023 · 9b3c43c · 9b3c43c
1 parent 9ddfb40
commit 9b3c43c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/...id/festago/app/src/main/java/com/festago/festago/data/repository/AuthDefaultRepository.kt b/...id/festago/app/src/main/java/com/festago/festago/data/repository/AuthDefaultRepository.kt
@@ -48,7 +48,7 @@ class AuthDefaultRepository @Inject constructor(
 
     override suspend fun deleteAccount(): Result<Unit> = runCatchingResponse {
         socialAuthRepository.deleteAccount()
-        tokenRetrofitService.deleteUserAccount()
+        tokenRetrofitService.deleteUserAccount("Bearer ${tokenLocalDataSource.token}")
     }.onSuccessOrCatch {
         tokenLocalDataSource.token = null
     }

diff --git a/...estago/app/src/main/java/com/festago/festago/data/repository/SocialAuthKakaoRepository.kt b/...estago/app/src/main/java/com/festago/festago/data/repository/SocialAuthKakaoRepository.kt
@@ -3,7 +3,6 @@ package com.festago.festago.data.repository
 import android.content.Context
 import com.festago.festago.presentation.util.loginWithKakao
 import com.festago.festago.repository.SocialAuthRepository
-import com.kakao.sdk.auth.AuthApiClient
 import com.kakao.sdk.auth.TokenManagerProvider
 import com.kakao.sdk.user.UserApiClient
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -13,27 +12,25 @@ import javax.inject.Inject
 class SocialAuthKakaoRepository @Inject constructor(
     @ApplicationContext private val context: Context,
 ) : SocialAuthRepository {
+
     override val socialType: String = SOCIAL_TYPE_KAKAO
 
     override suspend fun getSocialToken(): Result<String> = runCatching {
-        val oAuthToken = TokenManagerProvider.instance.manager.getToken()
+        val tokenManger = TokenManagerProvider.instance.manager
+        val oAuthToken = tokenManger.getToken()
 
         when {
             oAuthToken == null || oAuthToken.refreshTokenExpiresAt < Date() ->
                 UserApiClient.loginWithKakao(context)
 
-            oAuthToken.accessTokenExpiresAt < Date() -> {
-                AuthApiClient.instance.refreshToken { _, throwable ->
-                    if (throwable != null) {
-                        throw throwable
-                    }
+            else -> {
+                UserApiClient.instance.accessTokenInfo { _, throwable ->
+                    if (throwable != null) throw throwable
                 }
             }
         }
 
-        val accessToken = TokenManagerProvider.instance.manager.getToken()?.accessToken
-            ?: throw Exception("Unknown error")
-        accessToken
+        tokenManger.getToken()?.accessToken ?: throw Exception("Unknown error")
     }
 
     override suspend fun signOut(): Result<Unit> {
@@ -42,8 +39,12 @@ class SocialAuthKakaoRepository @Inject constructor(
     }
 
     override suspend fun deleteAccount(): Result<Unit> {
-        UserApiClient.instance.unlink { error ->
-            if (error != null) throw error
+        synchronized(this) {
+            TokenManagerProvider.instance.manager.getToken()?.let {
+                UserApiClient.instance.unlink { error ->
+                    if (error != null) throw error
+                }
+            }
         }
         return Result.success(Unit)
     }

diff --git a/android/festago/app/src/main/java/com/festago/festago/data/service/TokenRetrofitService.kt b/android/festago/app/src/main/java/com/festago/festago/data/service/TokenRetrofitService.kt
@@ -5,6 +5,7 @@ import com.festago.festago.data.dto.OauthTokenResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
+import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface TokenRetrofitService {
@@ -15,5 +16,7 @@ interface TokenRetrofitService {
     ): Response<OauthTokenResponse>
 
     @DELETE("/auth")
-    suspend fun deleteUserAccount(): Response<Unit>
+    suspend fun deleteUserAccount(
+        @Header("authorization") token: String,
+    ): Response<Unit>
 }