[FEAT/#109] 로그아웃/회원탈퇴 구현

app/src/main/java/com/haphap/app/core/designsystem/component/modal/HapHapDialog.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.haphap.app.R
 import com.haphap.app.core.designsystem.component.button.HapHapBasicButton
 import com.haphap.app.core.designsystem.theme.HapHapTheme
@@ -31,6 +32,7 @@ import com.haphap.app.core.designsystem.type.ButtonType
  * @param content 다이얼로그 본문에 표시할 안내 문구
  * @param onDismiss 다이얼로그 바깥 영역 또는 "취소" 버튼 클릭 시 호출되는 콜백
  * @param onConfirmClick "확인" 버튼 클릭 시 호출되는 콜백
+ * @param showIcon 다이얼로그에 아이콘이 있는 지 설정하는 변수
  */
 
 @Composable
@@ -39,27 +41,37 @@ fun HapHapDialog(
     onDismiss: () -> Unit,
     onConfirmClick: () -> Unit,
     modifier: Modifier = Modifier,
+    showIcon: Boolean = false,
 ) {
     Dialog (
         onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
     ) {
         Column(
             modifier = modifier
+                .padding(horizontal = 31.dp)
                 .fillMaxWidth()
                 .background(
                     color = HapHapTheme.colors.white,
                     shape = RoundedCornerShape(16.dp),
                 )
-                .padding(start = 20.dp, top = 16.dp, end = 20.dp, bottom = 21.dp),
+                .padding(
+                    start = 19.dp,
+                    top = 16.dp,
+                    end = 19.dp,
+                    bottom = if (showIcon) 21.dp else 16.dp,
+                ),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Icon(
-                imageVector = ImageVector.vectorResource(id = R.drawable.ic_alert_53),
-                contentDescription = null,
-                tint = HapHapTheme.colors.gray200,
-            )
+            if (showIcon) {
+                Icon(
+                    imageVector = ImageVector.vectorResource(id = R.drawable.ic_alert_53),
+                    contentDescription = null,
+                    tint = HapHapTheme.colors.gray200,
+                )
 
-            Spacer(modifier = Modifier.height(8.dp))
+                Spacer(modifier = Modifier.height(8.dp))
+            }
 
             Text(
                 text = content,
@@ -72,7 +84,7 @@ fun HapHapDialog(
 
             Row(
                 modifier = modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(11.dp),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 HapHapBasicButton(
                     text = "취소",
@@ -98,9 +110,10 @@ fun HapHapDialog(
 private fun HapHapDialogPreview() {
     HapHapTheme {
         HapHapDialog(
-            content = "이전에 등록한 결과가 있습니다.\n결과를 변경할까요?",
+            content = "로그아웃 하시겠습니까?",
             onDismiss = {},
             onConfirmClick = {},
+            showIcon = false,
         )
     }
 }

app/src/main/java/com/haphap/app/core/designsystem/theme/Color.kt

@@ -22,6 +22,8 @@ val Sub300 = Color(0xFFC3D9FF)
 val Sub400 = Color(0xFF041B50)
 val Yellow = Color(0xFFFEE500)
 
+val SubRed = Color(0xFFFF7D7D)
+
 val Gray50 = Color(0xFFFAFBFB)
 val Gray100 = Color(0xFFF3F4F7)
 val Gray200 = Color(0xFFD2D6DB)
@@ -46,6 +48,7 @@ data class HapHapColors(
     val sub300: Color,
     val sub400: Color,
     val yellow: Color,
+    val subred: Color,
     val gray50: Color,
     val gray100: Color,
     val gray200: Color,
@@ -69,6 +72,7 @@ val defaultHapHapColors = HapHapColors(
     sub300 = Sub300,
     sub400 = Sub400,
     yellow = Yellow,
+    subred = SubRed,
     gray50 = Gray50,
     gray100 = Gray100,
     gray200 = Gray200,
@@ -98,6 +102,7 @@ private fun ColorPreview() {
                 HapHapTheme.colors.sub300,
                 HapHapTheme.colors.sub400,
                 HapHapTheme.colors.yellow,
+                HapHapTheme.colors.subred,
 
                 HapHapTheme.colors.gray50,
                 HapHapTheme.colors.gray100,

app/src/main/java/com/haphap/app/core/extensions/StringExt.kt

@@ -1,5 +1,6 @@
 package com.haphap.app.core.extensions
 
+import java.text.BreakIterator
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -17,4 +18,24 @@ fun String.toTimeFormat(pattern: String = "HH:mm"): String {
     return runCatching {
         LocalDateTime.parse(this).format(DateTimeFormatter.ofPattern(pattern))
     }.getOrDefault("")
+}
+
+/**
+ * 사람이 보는 글자(grapheme cluster) 단위로 길이를 센다.
+ *
+ * [CharSequence.length]는 UTF-16 Char 개수를 세기 때문에 이모지 하나가 2개 이상으로 세어지는 반면,
+ * 이 함수는 "😀", "👍🏻", "👨‍👩‍👧" 같은 이모지도 1글자로 센다.
+ *
+ * @receiver 길이를 셀 문자열
+ * @return 글자 수
+ */
+fun CharSequence.graphemeLength(): Int {
+    val iterator = BreakIterator.getCharacterInstance().apply { setText(this@graphemeLength.toString()) }
+
+    var count = 0
+    while (iterator.next() != BreakIterator.DONE) {
+        count++
+    }
+
+    return count
 }

app/src/main/java/com/haphap/app/data/local/datasource/api/LocalFcmDataSource.kt

@@ -3,4 +3,5 @@ package com.haphap.app.data.local.datasource.api
 interface LocalFcmDataSource {
     suspend fun getFcmToken(): String?
     suspend fun setFcmToken(fcmToken: String)
+    suspend fun clearFcmToken()
 }

app/src/main/java/com/haphap/app/data/local/datasource/impl/LocalFcmDataSourceImpl.kt

@@ -24,6 +24,12 @@ class LocalFcmDataSourceImpl @Inject constructor(
         }
     }
 
+    override suspend fun clearFcmToken() {
+        dataStore.edit { prefs ->
+            prefs.remove(FCM_TOKEN)
+        }
+    }
+
     companion object {
         private val FCM_TOKEN = stringPreferencesKey("FCM_TOKEN")
     }

app/src/main/java/com/haphap/app/data/mapper/auth/AuthMapper.kt

@@ -8,4 +8,5 @@ fun KakaoLoginResponseDto.toModel(): KakaoLoginModel = KakaoLoginModel(
     refreshToken = refreshToken,
     name = name,
     anonymousName = anonymousName,
+    isNewUser = isNewUser,
 )

app/src/main/java/com/haphap/app/data/model/auth/KakaoLoginModel.kt

@@ -5,4 +5,5 @@ data class KakaoLoginModel(
     val refreshToken: String,
     val name: String,
     val anonymousName: String,
+    val isNewUser: Boolean,
 )

app/src/main/java/com/haphap/app/data/remote/datasource/api/mypage/MyPageDataSource.kt

@@ -1,8 +1,13 @@
 package com.haphap.app.data.remote.datasource.api.mypage
 
 import com.haphap.app.data.remote.dto.BaseResponse
+import com.haphap.app.data.remote.dto.mypage.LeaveRequestDto
+import com.haphap.app.data.remote.dto.mypage.LogoutRequestDto
 import com.haphap.app.data.remote.dto.mypage.MyPageResponseDto
+import retrofit2.Response
 
 interface MyPageDataSource{
     suspend fun getMyPage(): BaseResponse<MyPageResponseDto>
+    suspend fun deleteMember(requestDto: LeaveRequestDto): Response<Unit>
+    suspend fun postLogout(requestDto: LogoutRequestDto): Response<Unit>
 }

app/src/main/java/com/haphap/app/data/remote/datasource/impl/mypage/MyPageDataSourceImpl.kt

@@ -2,14 +2,23 @@ package com.haphap.app.data.remote.datasource.impl.mypage
 
 import com.haphap.app.data.remote.datasource.api.mypage.MyPageDataSource
 import com.haphap.app.data.remote.dto.BaseResponse
+import com.haphap.app.data.remote.dto.mypage.LeaveRequestDto
+import com.haphap.app.data.remote.dto.mypage.LogoutRequestDto
 import com.haphap.app.data.remote.dto.mypage.MyPageResponseDto
 import com.haphap.app.data.remote.service.MyPageService
 import jakarta.inject.Inject
+import retrofit2.Response
 
 class MyPageDataSourceImpl @Inject constructor(
     private val myPageService: MyPageService,
 ) : MyPageDataSource {
     override suspend fun getMyPage(): BaseResponse<MyPageResponseDto> {
         return myPageService.getMyPage()
     }
+
+    override suspend fun deleteMember(requestDto: LeaveRequestDto): Response<Unit> =
+        myPageService.deleteMember(requestDto)
+
+    override suspend fun postLogout(requestDto: LogoutRequestDto): Response<Unit> =
+        myPageService.logout(requestDto)
 }

app/src/main/java/com/haphap/app/data/remote/dto/auth/KakaoLoginResponseDto.kt

@@ -13,4 +13,6 @@ data class KakaoLoginResponseDto(
     val name: String,
     @SerialName("anonymousName")
     val anonymousName: String,
+    @SerialName("isNewUser")
+    val isNewUser: Boolean = false,
 )

app/src/main/java/com/haphap/app/data/remote/dto/mypage/LeaveRequestDto.kt

@@ -0,0 +1,12 @@
+package com.haphap.app.data.remote.dto.mypage
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LeaveRequestDto(
+    @SerialName("reason")
+    val reason: String,
+    @SerialName("etcReason")
+    val etcReason: String? = null,
+)

app/src/main/java/com/haphap/app/data/remote/dto/mypage/LogoutRequestDto.kt

@@ -0,0 +1,10 @@
+package com.haphap.app.data.remote.dto.mypage
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LogoutRequestDto(
+    @SerialName("deviceId")
+    val deviceId: String,
+)

app/src/main/java/com/haphap/app/data/remote/service/MyPageService.kt

@@ -1,10 +1,22 @@
 package com.haphap.app.data.remote.service
 
 import com.haphap.app.data.remote.dto.BaseResponse
+import com.haphap.app.data.remote.dto.mypage.LeaveRequestDto
+import com.haphap.app.data.remote.dto.mypage.LogoutRequestDto
 import com.haphap.app.data.remote.dto.mypage.MyPageResponseDto
+import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.HTTP
+import retrofit2.http.POST
 
 interface MyPageService {
     @GET("api/v1/members/me")
     suspend fun getMyPage(): BaseResponse<MyPageResponseDto>
+
+    @HTTP(method = "DELETE", path = "api/v1/members/me", hasBody = true)
+    suspend fun deleteMember(@Body request: LeaveRequestDto): Response<Unit>
+
+    @POST("api/v1/auth/logout")
+    suspend fun logout(@Body request: LogoutRequestDto): Response<Unit>
 }

app/src/main/java/com/haphap/app/data/repository/api/auth/AuthRepository.kt

@@ -1,7 +1,6 @@
 package com.haphap.app.data.repository.api.auth
 
 import com.haphap.app.data.model.auth.KakaoLoginModel
-import com.haphap.app.data.remote.dto.auth.KakaoLoginRequestDto
 
 interface AuthRepository {
     suspend fun postKakaoLogin(accessToken: String): Result<KakaoLoginModel>

app/src/main/java/com/haphap/app/data/repository/api/mypage/MyPageRepository.kt

@@ -4,4 +4,6 @@ import com.haphap.app.data.model.mypage.MyPageModel
 
 interface MyPageRepository {
     suspend fun getMyPage(): Result<MyPageModel>
+    suspend fun deleteMember(reason: String, etcReason: String?): Result<Unit>
+    suspend fun postLogout(): Result<Unit>
 }

app/src/main/java/com/haphap/app/data/repository/impl/mypage/MyPageRepositoryImpl.kt

@@ -1,19 +1,58 @@
 package com.haphap.app.data.repository.impl.mypage
 
+import com.haphap.app.core.fcm.FirebaseMessagingManager
 import com.haphap.app.core.util.suspendRunCatching
+import com.haphap.app.data.local.datasource.api.LocalFcmDataSource
+import com.haphap.app.data.local.datasource.api.LocalTokenDataSource
 import com.haphap.app.data.mapper.mypage.toModel
 import com.haphap.app.data.model.mypage.MyPageModel
 import com.haphap.app.data.remote.datasource.api.mypage.MyPageDataSource
 import com.haphap.app.data.remote.dto.checkData
+import com.haphap.app.data.remote.dto.mypage.LeaveRequestDto
+import com.haphap.app.data.remote.dto.mypage.LogoutRequestDto
 import com.haphap.app.data.repository.api.mypage.MyPageRepository
 import jakarta.inject.Inject
+import retrofit2.HttpException
+import timber.log.Timber
 
 class MyPageRepositoryImpl @Inject constructor(
     private val myPageDataSource: MyPageDataSource,
+    private val localTokenDataSource: LocalTokenDataSource,
+    private val localFcmDataSource: LocalFcmDataSource,
+    private val firebaseMessagingManager: FirebaseMessagingManager,
 ): MyPageRepository {
     override suspend fun getMyPage(): Result<MyPageModel> =
         suspendRunCatching {
             val response = myPageDataSource.getMyPage().checkData()
             response.toModel()
         }
+
+    override suspend fun deleteMember(reason: String, etcReason: String?): Result<Unit> =
+        suspendRunCatching {
+            val response = myPageDataSource.deleteMember(
+                LeaveRequestDto(reason = reason, etcReason = etcReason),
+            )
+
+            if (!response.isSuccessful && response.code() != 404) throw HttpException(response)
+
+            localTokenDataSource.clearTokens()
+        }
+
+    override suspend fun postLogout(): Result<Unit> =
+        suspendRunCatching {
+            val accessToken = localTokenDataSource.getAccessToken()
+
+            if (!accessToken.isNullOrBlank()) {
+                val deviceId = firebaseMessagingManager.getInstallationId()
+
+                if (deviceId != null) {
+                    val response = myPageDataSource.postLogout(LogoutRequestDto(deviceId))
+                    if (!response.isSuccessful && response.code() != 401) throw HttpException(response)
+                } else {
+                    Timber.w("Installation id is null. Skip remote logout")
+                }
+            }
+
+            localTokenDataSource.clearTokens()
+        }
 }

app/src/main/java/com/haphap/app/presentation/auth/login/LoginContract.kt

@@ -10,6 +10,7 @@ sealed interface LoginContract {
 
     sealed class SideEffect {
         data class NavigateToSignUpComplete(val userName: String) : SideEffect()
+        data object NavigateToHome : SideEffect()
     }
 }
 

app/src/main/java/com/haphap/app/presentation/auth/login/LoginScreen.kt

@@ -36,11 +36,13 @@ import com.haphap.app.R
 import com.haphap.app.core.designsystem.component.circular_progress_indicator.HapHapCircularProgressIndicator
 import com.haphap.app.core.designsystem.theme.HapHapTheme
 import com.haphap.app.core.extensions.noRippleClickable
+import com.haphap.app.presentation.auth.login.LoginContract.SideEffect.NavigateToHome
 import com.haphap.app.presentation.auth.login.LoginContract.SideEffect.NavigateToSignUpComplete
 
 @Composable
 fun LoginRoute(
     navigateToSignUpComplete: (userName: String) -> Unit,
+    navigateToHome: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: LoginViewModel = hiltViewModel(),
 ) {
@@ -56,6 +58,8 @@ fun LoginRoute(
                     is NavigateToSignUpComplete -> {
                         navigateToSignUpComplete(sideEffect.userName)
                     }
+
+                    is NavigateToHome -> navigateToHome()
                 }
             }
         }