[Fix/#871] 마이페이지 오류 수정

app/src/main/AndroidManifest.xml

@@ -93,10 +93,6 @@
             android:name=".feature.mypage.signOut.SignOutActivity"
             android:exported="false"
             android:theme="@style/Theme.SOPT" />
-        <activity
-            android:name=".feature.mypage.soptamp.nickName.ChangeNickNameActivity"
-            android:exported="false"
-            android:theme="@style/Theme.SOPT" />
         <activity
             android:name=".feature.mypage.soptamp.sentence.AdjustSentenceActivity"
             android:exported="false"

core/authimpl/src/main/java/org/sopt/official/auth/impl/api/AuthService.kt

@@ -26,7 +26,6 @@ package org.sopt.official.auth.impl.api
 
 import org.sopt.official.auth.impl.model.request.AuthRequest
 import org.sopt.official.auth.impl.model.response.LogOutRequest
-import org.sopt.official.auth.impl.model.response.LogOutResponse
 import org.sopt.official.network.model.response.AuthResponse
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -41,5 +40,5 @@ interface AuthService {
     suspend fun withdraw()
 
     @HTTP(method = "DELETE", path = "user/logout", hasBody = true)
-    suspend fun logOut(@Body body: LogOutRequest): LogOutResponse
+    suspend fun logOut(@Body body: LogOutRequest)
 }

core/authimpl/src/main/java/org/sopt/official/auth/impl/remote/DefaultRemoteAuthDataSource.kt

@@ -27,7 +27,6 @@ package org.sopt.official.auth.impl.remote
 import javax.inject.Inject
 import org.sopt.official.auth.impl.api.AuthService
 import org.sopt.official.auth.impl.model.response.LogOutRequest
-import org.sopt.official.auth.impl.model.response.LogOutResponse
 import org.sopt.official.auth.impl.source.RemoteAuthDataSource
 import org.sopt.official.common.di.Auth
 import org.sopt.official.network.model.request.RefreshRequest
@@ -46,7 +45,7 @@ class DefaultRemoteAuthDataSource @Inject constructor(
         authService.withdraw()
     }
 
-    override suspend fun logout(request: LogOutRequest): LogOutResponse {
-        return authService.logOut(request)
+    override suspend fun logout(request: LogOutRequest) {
+        authService.logOut(request)
     }
 }

core/authimpl/src/main/java/org/sopt/official/auth/impl/repository/AuthRepositoryImpl.kt

@@ -54,7 +54,7 @@ class AuthRepositoryImpl @Inject constructor(
         remoteAuthDataSource.withdraw()
     }
 
-    override suspend fun logout(pushToken: String): Result<Unit> = runCatching {
+    override suspend fun logout(pushToken: String) = runCatching {
         remoteAuthDataSource.logout(
             LogOutRequest(
                 platform = "Android",

core/authimpl/src/main/java/org/sopt/official/auth/impl/source/RemoteAuthDataSource.kt

@@ -25,12 +25,11 @@
 package org.sopt.official.auth.impl.source
 
 import org.sopt.official.auth.impl.model.response.LogOutRequest
-import org.sopt.official.auth.impl.model.response.LogOutResponse
 import org.sopt.official.network.model.request.RefreshRequest
 import org.sopt.official.network.model.response.AuthResponse
 
 interface RemoteAuthDataSource {
     suspend fun refresh(token: RefreshRequest): AuthResponse
     suspend fun withdraw()
-    suspend fun logout(request: LogOutRequest): LogOutResponse
+    suspend fun logout(request: LogOutRequest)
 }

core/network/src/main/java/org/sopt/official/network/authenticator/SoptAuthenticator.kt

@@ -27,8 +27,6 @@ package org.sopt.official.network.authenticator
 import android.content.Context
 import com.jakewharton.processphoenix.ProcessPhoenix
 import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlinx.coroutines.runBlocking
 import okhttp3.Authenticator
 import okhttp3.Request
@@ -39,6 +37,8 @@ import org.sopt.official.network.model.request.RefreshRequest
 import org.sopt.official.network.persistence.SoptDataStore
 import org.sopt.official.network.service.RefreshService
 import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 class SoptAuthenticator @Inject constructor(
@@ -50,6 +50,7 @@ class SoptAuthenticator @Inject constructor(
     override fun authenticate(route: Route?, response: Response): Request? {
         if (response.code == 401) {
             val refreshToken = dataStore.refreshToken
+            if (refreshToken.isEmpty()) return null
             val newTokens = runCatching {
                 runBlocking {
                     refreshService.refresh(RefreshRequest(refreshToken))

feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneDetail/component/TodayFortuneText.kt

@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

feature/fortune/src/main/res/drawable/ic_checkbox_off.xml

@@ -2,7 +2,7 @@
 <!--
     MIT License
 
-    Copyright (c) 2024 SOPT Makers
+    Copyright (c) 2022-2024 SOPT Makers
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

feature/fortune/src/main/res/drawable/ic_checkbox_on.xml

@@ -2,7 +2,7 @@
 <!--
     MIT License
 
-    Copyright (c) 2024 SOPT Makers
+    Copyright (c) 2023-2024 SOPT Makers
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

feature/mypage/src/main/java/org/sopt/official/feature/mypage/model/MyPageUiModel.kt

@@ -25,7 +25,9 @@
 package org.sopt.official.feature.mypage.model
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 
+@Stable
 sealed interface MyPageUiModel {
     @Immutable
     data class Header(

feature/mypage/src/main/java/org/sopt/official/feature/mypage/model/MyPageUiState.kt

@@ -24,11 +24,23 @@
  */
 package org.sopt.official.feature.mypage.model
 
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import org.sopt.official.auth.model.UserActiveState
 import org.sopt.official.feature.mypage.mypage.MyPageAction
 
+@Stable
 sealed interface MyPageUiState {
+
+    @Immutable
     data object UnInitialized : MyPageUiState
-    data class User(val activeState: UserActiveState) : MyPageUiState
-    data class Dialog(val action: MyPageAction) : MyPageUiState
+
+    @Immutable
+    data class Authenticated(
+        val activeState: UserActiveState,
+        val action: MyPageAction? = null
+    ) : MyPageUiState
+
+    @Immutable
+    data object UnAuthenticated : MyPageUiState
 }

feature/mypage/src/main/java/org/sopt/official/feature/mypage/mypage/MyPageActivity.kt

@@ -41,7 +41,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -51,7 +50,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
-import com.jakewharton.processphoenix.ProcessPhoenix
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.collections.immutable.persistentListOf
 import org.sopt.official.auth.model.UserActiveState
@@ -84,8 +82,7 @@ class MyPageActivity : AppCompatActivity() {
                 val context = LocalContext.current
                 val lifecycleOwner = LocalLifecycleOwner.current
 
-                val isAuthenticated by viewModel.userActiveState.collectAsStateWithLifecycle(initialValue = false)
-                val dialogState by viewModel.dialogState.collectAsStateWithLifecycle()
+                val state by viewModel.state.collectAsStateWithLifecycle()
                 val scrollState = rememberScrollState()
 
                 val serviceSectionItems = remember {
@@ -156,34 +153,25 @@ class MyPageActivity : AppCompatActivity() {
                         MyPageUiModel.MyPageItem(
                             title = "로그인",
                             onItemClick = {
-                                onBackPressedDispatcher.onBackPressed()
+                                startActivity(navigatorProvider.getAuthActivityIntent())
                             }
                         )
                     )
                 }
 
                 LaunchedEffect(Unit) {
                     args?.userActiveState?.let {
-                        viewModel.setUserActiveState(MyPageUiState.User(it))
+                        viewModel.setUserActiveState(it)
                     }
                 }
 
                 LaunchedEffect(viewModel.finish, lifecycleOwner) {
                     viewModel.finish.flowWithLifecycle(lifecycle = lifecycleOwner.lifecycle)
                         .collect {
-                            ProcessPhoenix.triggerRebirth(context, navigatorProvider.getAuthActivityIntent())
+                            startActivity(navigatorProvider.getAuthActivityIntent())
                         }
                 }
 
-                if (dialogState is MyPageUiState.Dialog) {
-                    ShowMyPageDialog(
-                        action = (dialogState as MyPageUiState.Dialog).action,
-                        onDismissRequest = viewModel::onDismiss,
-                        onClearSoptampClick = viewModel::resetSoptamp,
-                        onLogoutClick = viewModel::logOut
-                    )
-                }
-
                 Scaffold(modifier = Modifier
                     .background(SoptTheme.colors.background)
                     .fillMaxSize(),
@@ -204,14 +192,45 @@ class MyPageActivity : AppCompatActivity() {
                         Spacer(modifier = Modifier.height(20.dp))
                         MyPageSection(items = serviceSectionItems)
                         Spacer(modifier = Modifier.height(16.dp))
-                        if (isAuthenticated) {
-                            MyPageSection(items = notificationSectionItems)
-                            Spacer(modifier = Modifier.height(16.dp))
-                            MyPageSection(items = soptampSectionItems)
-                            Spacer(modifier = Modifier.height(16.dp))
-                            MyPageSection(items = etcSectionItems)
-                        } else {
-                            MyPageSection(items = etcLoginSectionItems)
+                        when (state) {
+                            is MyPageUiState.Authenticated -> {
+                                when ((state as MyPageUiState.Authenticated).action) {
+                                    MyPageAction.CLEAR_SOPTAMP -> {
+                                        MyPageDialog(
+                                            onDismissRequest = viewModel::onDismiss,
+                                            title = "미션을 초기화 하실건가요?",
+                                            subTitle = "사진, 메모가 삭제되고\n전체 미션이 미완료상태로 초기화됩니다.",
+                                            negativeText = "취소",
+                                            positiveText = "초기화",
+                                            onPositiveButtonClick = viewModel::resetSoptamp
+                                        )
+                                    }
+
+                                    MyPageAction.LOGOUT -> {
+                                        MyPageDialog(
+                                            onDismissRequest = viewModel::onDismiss,
+                                            title = "로그아웃",
+                                            subTitle = "정말 로그아웃을 하실 건가요?",
+                                            negativeText = "취소",
+                                            positiveText = "로그아웃",
+                                            onPositiveButtonClick = viewModel::logOut
+                                        )
+                                    }
+
+                                    else -> {}
+                                }
+                                MyPageSection(items = notificationSectionItems)
+                                Spacer(modifier = Modifier.height(16.dp))
+                                MyPageSection(items = soptampSectionItems)
+                                Spacer(modifier = Modifier.height(16.dp))
+                                MyPageSection(items = etcSectionItems)
+                            }
+
+                            is MyPageUiState.UnAuthenticated -> {
+                                MyPageSection(items = etcLoginSectionItems)
+                            }
+
+                            is MyPageUiState.UnInitialized -> {}
                         }
                         Spacer(modifier = Modifier.height(32.dp))
                     }
@@ -231,35 +250,3 @@ class MyPageActivity : AppCompatActivity() {
         }
     }
 }
-
-@Composable
-private fun ShowMyPageDialog(
-    action: MyPageAction,
-    onDismissRequest: () -> Unit,
-    onClearSoptampClick: () -> Unit,
-    onLogoutClick: () -> Unit
-) {
-    when (action) {
-        MyPageAction.CLEAR_SOPTAMP -> {
-            MyPageDialog(
-                onDismissRequest = onDismissRequest,
-                title = "미션을 초기화 하실건가요?",
-                subTitle = "사진, 메모가 삭제되고\n전체 미션이 미완료상태로 초기화됩니다.",
-                negativeText = "취소",
-                positiveText = "초기화",
-                onPositiveButtonClick = onClearSoptampClick
-            )
-        }
-
-        MyPageAction.LOGOUT -> {
-            MyPageDialog(
-                onDismissRequest = onDismissRequest,
-                title = "로그아웃",
-                subTitle = "정말 로그아웃을 하실 건가요?",
-                negativeText = "취소",
-                positiveText = "로그아웃",
-                onPositiveButtonClick = onLogoutClick
-            )
-        }
-    }
-}

feature/mypage/src/main/java/org/sopt/official/feature/mypage/mypage/MyPageViewModel.kt

@@ -32,9 +32,8 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.filterIsInstance
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import org.sopt.official.auth.model.UserActiveState
@@ -54,18 +53,15 @@ class MyPageViewModel @Inject constructor(
     private val stampRepository: StampRepository,
 ) : ViewModel() {
 
-    private val _userActiveState = MutableStateFlow<MyPageUiState>(MyPageUiState.UnInitialized)
-    val userActiveState = _userActiveState.filterIsInstance<MyPageUiState.User>()
-        .map { it.activeState != UserActiveState.UNAUTHENTICATED }
-
-    private val _dialogState: MutableStateFlow<MyPageUiState> = MutableStateFlow(MyPageUiState.UnInitialized)
-    val dialogState: StateFlow<MyPageUiState> = _dialogState.asStateFlow()
+    private val _state: MutableStateFlow<MyPageUiState> = MutableStateFlow(MyPageUiState.UnInitialized)
+    val state: StateFlow<MyPageUiState> = _state.asStateFlow()
 
     private val _finish = Channel<Unit>()
     val finish = _finish.receiveAsFlow()
 
-    fun setUserActiveState(new: MyPageUiState) {
-        _userActiveState.value = new
+    fun setUserActiveState(activeState: UserActiveState) {
+        if (activeState == UserActiveState.UNAUTHENTICATED) _state.value = MyPageUiState.UnAuthenticated
+        else _state.value = MyPageUiState.Authenticated(activeState)
     }
 
     fun logOut() {
@@ -87,16 +83,20 @@ class MyPageViewModel @Inject constructor(
     fun resetSoptamp() {
         viewModelScope.launch {
             stampRepository.deleteAllStamps()
+                .onSuccess { onDismiss() }
                 .onFailure { Timber.e(it) }
         }
     }
 
     fun showDialogState(action: MyPageAction) {
-        _dialogState.tryEmit(MyPageUiState.Dialog(action))
+        _state.update { currentState ->
+            (currentState as MyPageUiState.Authenticated).copy(action = action)
+        }
     }
 
     fun onDismiss() {
-        _dialogState.tryEmit(MyPageUiState.UnInitialized)
+        _state.update { currentState ->
+            (currentState as MyPageUiState.Authenticated).copy(action = null)
+        }
     }
-
 }