Feature/#90 token

app/src/main/java/com/yapp/app/official/navigation/YappNavHost.kt

@@ -39,7 +39,10 @@ fun YappNavHost(
         )
         homeNavGraph(
             navigateNotice = { navigator.navigateNoticeScreen() },
-            navigateSetting = { navigator.navigateSettingScreen() }
+            navigateSetting = { navigator.navigateSettingScreen() },
+            navigateLogin = {navigator.navigateLoginScreen(
+                navOptions = clearBackStackNavOptions
+            )}
         )
         settingNavGraph(
             navigateLogin = {

core/data-api/src/main/java/com/yapp/dataapi/UserRepository.kt

@@ -4,6 +4,7 @@ import com.yapp.model.UserInfo
 import kotlinx.coroutines.flow.Flow
 
 interface UserRepository {
+    suspend fun getUserAccessToken() : String
     suspend fun deleteAccount()
     suspend fun getUserProfile(): Flow<UserInfo>
 }

core/data/src/main/java/com/yapp/core/data/data/repository/AlarmRepositoryImpl.kt

@@ -3,6 +3,7 @@ package com.yapp.core.data.data.repository
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
+import com.yapp.core.data.local.SecurityPreferences
 import com.yapp.core.data.remote.api.AlarmApi
 import com.yapp.core.data.remote.model.request.DeviceAlarmRequest
 import com.yapp.core.data.remote.model.request.FcmTokenRequest
@@ -13,7 +14,8 @@ import javax.inject.Inject
 internal class AlarmRepositoryImpl @Inject constructor(
     @ApplicationContext private val context: Context,
     private val alarmApi: AlarmApi,
-) : AlarmRepository {
+    private val securityPreferences: SecurityPreferences,
+    ) : AlarmRepository {
 
     override suspend fun updateFcmToken(fcmToken: String) {
         alarmApi.putFcmToken(FcmTokenRequest(fcmToken))

core/data/src/main/java/com/yapp/core/data/data/repository/UserRepositoryImpl.kt

@@ -4,13 +4,18 @@ import com.yapp.core.data.local.SecurityPreferences
 import com.yapp.core.data.remote.api.UserApi
 import com.yapp.dataapi.UserRepository
 import com.yapp.model.UserInfo
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 internal class UserRepositoryImpl @Inject constructor(
     private val userApi: UserApi,
     private val securityPreferences: SecurityPreferences,
 ): UserRepository {
+    override suspend fun getUserAccessToken(): String {
+        return runBlocking { securityPreferences.flowAccessToken().firstOrNull() ?: "" }
+    }
 
     override suspend fun deleteAccount() {
         userApi.deleteUser()

core/data/src/main/java/com/yapp/core/data/remote/api/AuthApi.kt

@@ -1,6 +1,7 @@
 package com.yapp.core.data.remote.api
 
 import com.yapp.core.data.remote.model.request.LoginRequest
+import com.yapp.core.data.remote.model.request.ReissueTokenRequest
 import com.yapp.core.data.remote.model.request.SignUpRequest
 import com.yapp.core.data.remote.model.response.LoginResponse
 import com.yapp.core.data.remote.model.response.SignUpResponse
@@ -18,4 +19,9 @@ internal interface AuthApi {
     suspend fun login(
         @Body request : LoginRequest
     ) : LoginResponse
+
+    @POST("v1/auth/reissue-token")
+    suspend fun reissueToken(
+        @Body request: ReissueTokenRequest
+    ): LoginResponse
 }

core/data/src/main/java/com/yapp/core/data/remote/di/NetworkModule.kt

@@ -4,21 +4,22 @@ import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFact
 import com.yapp.core.data.remote.Tag
 import com.yapp.core.data.remote.retrofit.NullOnEmptyConverterFactory
 import com.yapp.core.data.remote.retrofit.ResultCallAdapterFactory
+import com.yapp.core.data.remote.retrofit.TokenAuthenticator
 import com.yapp.core.data.remote.retrofit.TokenInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.json.JSONArray
 import org.json.JSONObject
+import retrofit2.OptionalConverterFactory
 import retrofit2.Retrofit
 import timber.log.Timber
 import javax.inject.Singleton
-import kotlinx.serialization.json.Json
-import retrofit2.OptionalConverterFactory
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -57,10 +58,12 @@ internal object NetworkModule {
     @AuthOkHttpClient
     fun provideAuthOkHttpClient(
         tokenInterceptor: TokenInterceptor,
+        tokenAuthenticator: TokenAuthenticator,
         loggingInterceptor: HttpLoggingInterceptor,
     ): OkHttpClient = OkHttpClient.Builder()
         .addInterceptor(tokenInterceptor)
         .addInterceptor(loggingInterceptor)
+        .authenticator(tokenAuthenticator)
         .build()
 
     @Singleton

core/data/src/main/java/com/yapp/core/data/remote/model/request/ReissueTokenRequest.kt

@@ -0,0 +1,9 @@
+package com.yapp.core.data.remote.model.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ReissueTokenRequest(
+    val accessToken : String,
+    val refreshToken : String
+)

core/data/src/main/java/com/yapp/core/data/remote/retrofit/TokenAuthenticator.kt

@@ -0,0 +1,56 @@
+package com.yapp.core.data.remote.retrofit
+
+import com.yapp.core.data.local.SecurityPreferences
+import com.yapp.core.data.remote.api.AuthApi
+import com.yapp.core.data.remote.model.request.ReissueTokenRequest
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import javax.inject.Inject
+
+internal class TokenAuthenticator @Inject constructor(
+    private val securityPreferences: SecurityPreferences,
+    private val authApi: AuthApi,
+) : Authenticator {
+
+    override fun authenticate(route: Route?, response: Response): Request? {
+        return runBlocking {
+            val accessToken = securityPreferences.flowAccessToken().firstOrNull().orEmpty()
+            val refreshToken = securityPreferences.flowRefreshToken().firstOrNull().orEmpty()
+
+            val request = ReissueTokenRequest(
+                accessToken = accessToken,
+                refreshToken = refreshToken
+            )
+
+            val (newAccessToken, newRefreshToken) = try {
+                val response = authApi.reissueToken(request)
+                securityPreferences.setAccessToken(response.accessToken)
+                securityPreferences.setRefreshToken(response.refreshToken)
+
+                response.accessToken to response.refreshToken
+            } catch (e: Exception) {
+                "" to ""
+            }
+
+            if (newAccessToken.isBlank() || newRefreshToken.isBlank()) {
+                resetToken()
+                return@runBlocking null
+            }
+
+            response.request.newBuilder()
+                .header("Authorization", "Bearer $newAccessToken")
+                .build()
+        }
+    }
+
+    private fun resetToken() {
+        runBlocking {
+            securityPreferences.setAccessToken("")
+            securityPreferences.setRefreshToken("")
+        }
+    }
+}

core/domain/src/main/java/com/yapp/domain/GetUserProfileUseCase.kt

@@ -8,6 +8,7 @@ class GetUserProfileUseCase @Inject constructor(
 ) {
     suspend operator fun invoke() = userRepository.getUserProfile()
 
+    suspend fun getUserAccessToken() = userRepository.getUserAccessToken()
 }
 
 

core/model/src/main/java/com/yapp/model/exceptions/YappExceptions.kt

@@ -14,7 +14,11 @@ enum class YappServerError(val exception: YappException) {
     USR_1102(SignUpPendingException()),
     USR_1103(RecentSignUpRejectedException()),
     USR_1104(LoginBlockedException()),
-    USR_1105(LoginException())
+    USR_1105(LoginException()),
+
+    //토큰 만료
+    TKN_0001(InvalidTokenException()),
+    TKN_0002(InvalidTokenException())
 }
 
 class InternalServerException : YappException()
@@ -27,6 +31,7 @@ class SignUpPendingException : YappException("회원가입 처리가 진행 중
 class RecentSignUpRejectedException : YappException("최근의 회원가입 신청은 거절되었습니다.")
 class LoginBlockedException : YappException("로그인이 불가능한 회원 상태입니다.")
 class LoginException : YappException("로그인에 실패했습니다. 계정 정보를 다시 확인하세요.")
+class InvalidTokenException : YappException("비정상 토큰입니다")
 
 open class YappException(message: String = "") : Exception(message) {
     private var _message: String = message

core/ui/src/main/java/com/yapp/core/ui/component/NoticeItem.kt

@@ -31,6 +31,7 @@ fun NoticeItem(
     noticeInfo: NoticeInfo,
 ) {
     val columModifier = modifier
+        .fillMaxWidth()
         .padding(vertical = 9.dp)
         .then(onClick?.let { Modifier.yappClickable(onClick = it) } ?: Modifier)
 

feature/home/src/main/java/com/yapp/feature/home/HomeContract.kt

@@ -23,5 +23,6 @@ sealed interface HomeIntent {
 sealed interface HomeSideEffect {
     data object NavigateToNotice : HomeSideEffect
     data object NavigateToSetting : HomeSideEffect
+    data object NavigateToLogin : HomeSideEffect
     data class ShowToast(val message: String) : HomeSideEffect
 }

feature/home/src/main/java/com/yapp/feature/home/HomeScreen.kt

@@ -29,6 +29,7 @@ import com.yapp.feature.home.component.ProfileSection
 internal fun HomeRoute(
     navigateToNotice: () -> Unit,
     navigateToSetting: () -> Unit,
+    navigateToLogin: () -> Unit,
     viewModel: HomeViewModel = hiltViewModel(),
 ) {
     LaunchedEffect(Unit) {
@@ -44,6 +45,7 @@ internal fun HomeRoute(
             is HomeSideEffect.ShowToast -> {
                 Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show()
             }
+            HomeSideEffect.NavigateToLogin -> navigateToLogin()
         }
     }
 
@@ -98,6 +100,6 @@ fun HomeScreen(
 @Composable
 private fun HomeScreenPreview() {
     YappTheme {
-        HomeRoute({}, {})
+        HomeRoute({}, {},{})
     }
 }

feature/home/src/main/java/com/yapp/feature/home/HomeViewModel.kt

@@ -9,7 +9,10 @@ import com.yapp.core.ui.mvi.mviIntentStore
 import com.yapp.dataapi.PostsRepository
 import com.yapp.domain.GetUserProfileUseCase
 import com.yapp.model.NoticeType
+import com.yapp.model.exceptions.InvalidTokenException
+import com.yapp.model.exceptions.UserNotFoundForEmailException
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
@@ -39,16 +42,22 @@ class HomeViewModel @Inject constructor(
         when (intent) {
             HomeIntent.ClickMoreButton -> postSideEffect(HomeSideEffect.NavigateToNotice)
             HomeIntent.ClickSettingButton -> postSideEffect(HomeSideEffect.NavigateToSetting)
-            HomeIntent.EnterHomeScreen -> { loadHomeInfo( reduce)
-            }
+            HomeIntent.EnterHomeScreen -> { loadHomeInfo( reduce,postSideEffect)  }
         }
     }
 
     private fun loadHomeInfo(
         reduce: (HomeState.() -> HomeState) -> Unit,
+        postSideEffect: (HomeSideEffect) -> Unit
     ) = viewModelScope.launch {
         reduce { copy(isLoading = true, isUserInfoLoading = true, isNoticesLoading = true) }
         getUserProfileUseCase()
+            .catch { error->
+                when(error) {
+                    is UserNotFoundForEmailException, is InvalidTokenException -> postSideEffect(HomeSideEffect.NavigateToLogin)
+                    else -> throw error
+                }
+            }
             .collectLatest{ userInfo ->
                 reduce {
                     copy(

feature/home/src/main/java/com/yapp/feature/home/navigation/HomeNavigation.kt

@@ -24,12 +24,14 @@ fun NavController.navigateToSetting(navOptions: NavOptions? = null) {
 
 fun NavGraphBuilder.homeNavGraph(
     navigateNotice: () -> Unit,
-    navigateSetting: () -> Unit
+    navigateSetting: () -> Unit,
+    navigateLogin : () -> Unit
 ) {
     composable<HomeRoute> {
         HomeRoute(
             navigateToNotice = navigateNotice,
             navigateToSetting = navigateSetting,
+            navigateToLogin = navigateLogin
         )
     }
 }

feature/login/src/main/java/com/yapp/feature/login/LoginContract.kt

@@ -26,6 +26,7 @@ sealed interface LoginIntent {
     data object ClickNextButton : LoginIntent
     data object ClickTerms : LoginIntent
     data object ClickPersonalPolicy : LoginIntent
+    data object EnterLoginScreen : LoginIntent
 }
 
 sealed interface LoginSideEffect {

feature/login/src/main/java/com/yapp/feature/login/LoginScreen.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -35,6 +36,11 @@ internal fun LoginRoute(
 ) {
     val uiState by viewModel.store.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
+
+    LaunchedEffect(Unit) {
+        viewModel.store.onIntent(LoginIntent.EnterLoginScreen)
+    }
+
     viewModel.store.sideEffects.collectWithLifecycle { effect ->
         when (effect) {
             LoginSideEffect.NavigateToSignUp -> navigateToSignup()

feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.yapp.core.ui.mvi.MviIntentStore
 import com.yapp.core.ui.mvi.mviIntentStore
+import com.yapp.domain.GetUserProfileUseCase
 import com.yapp.domain.LoginUseCase
 import com.yapp.model.Regex
 import com.yapp.model.exceptions.InvalidRequestArgument
@@ -14,7 +15,9 @@ import javax.inject.Inject
 @HiltViewModel
 class LoginViewModel @Inject constructor(
     private val loginUseCase: LoginUseCase,
+    private val getUserProfileUseCase: GetUserProfileUseCase
 ) : ViewModel() {
+
     val store: MviIntentStore<LoginState, LoginIntent, LoginSideEffect> =
         mviIntentStore(
             initialState = LoginState(),
@@ -72,9 +75,9 @@ class LoginViewModel @Inject constructor(
                 }
                 postSideEffect(LoginSideEffect.NavigateToSignUp)
             }
-
             LoginIntent.ClickTerms -> postSideEffect(LoginSideEffect.ShowTerms)
             LoginIntent.ClickPersonalPolicy -> postSideEffect(LoginSideEffect.ShowPersonalPolicy)
+            LoginIntent.EnterLoginScreen -> checkAccessToken(postSideEffect)
         }
     }
 
@@ -119,5 +122,12 @@ class LoginViewModel @Inject constructor(
                 }
         }
     }
+
+    private fun checkAccessToken(postSideEffect: (LoginSideEffect) -> Unit) = viewModelScope.launch {
+        val accessToken = getUserProfileUseCase.getUserAccessToken()
+        if (accessToken.isNotBlank()){
+            postSideEffect(LoginSideEffect.NavigateToHome)
+        }
+    }
 }