Merge pull request #88 from YAPP-Github/release/1.0.2

[Release/1.0.2] (main)

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -38,13 +38,17 @@ fun MainNavHost(
                         popUpTo<Route.Splash> { inclusive = true }
                     }
                 },
-                navigateToHome = {
-                    navigator.navController.navigate(Route.Home) {
-                        popUpTo(navigator.navController.graph.startDestinationId) {
-                            inclusive = true
-                        }
+                navigateToTermsAgreement = {
+                    navigator.navController.navigate(Route.TermsAgreement) {
+                        popUpTo<Route.Splash> { inclusive = true }
                     }
                 },
+                navigateToOnboarding = {
+                    navigator.navController.navigate(Route.OnBoarding()) {
+                        popUpTo<Route.Splash> { inclusive = true }
+                    }
+                },
+                navigateToHome = navigator::navigateToHomeAndClearStack,
             )
         }
 
@@ -56,13 +60,7 @@ fun MainNavHost(
 
         composable<Route.Login> {
             LoginScreenContainer(
-                navigateToHome = {
-                    navigator.navController.navigate(Route.Home) {
-                        popUpTo(navigator.navController.graph.startDestinationId) {
-                            inclusive = true
-                        }
-                    }
-                },
+                navigateToHome = navigator::navigateToHomeAndClearStack,
                 navigateToTermsAgreement = { navigator.navController.navigate(Route.TermsAgreement) },
             )
         }
@@ -192,13 +190,7 @@ fun MainNavHost(
 
             OnBoardingScreenContainer(
                 onBoardingViewModel = viewModel,
-                navigateToHome = {
-                    navigator.navController.navigate(Route.Home) {
-                        popUpTo(navigator.navController.graph.startDestinationId) {
-                            inclusive = true
-                        }
-                    }
-                },
+                navigateToHome = navigator::navigateToHomeAndClearStack,
                 navigateToBack = {
                     if (navigator.navController.previousBackStackEntry != null) {
                         navigator.navController.popBackStack()

app/src/main/java/com/threegap/bitnagil/MainNavigator.kt

@@ -9,6 +9,13 @@ class MainNavigator(
     val navController: NavHostController,
 ) {
     val startDestination = Route.Splash
+
+    internal fun navigateToHomeAndClearStack() =
+        navController.navigate(Route.Home) {
+            popUpTo(0) {
+                inclusive = true
+            }
+        }
 }
 
 @Composable

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt

@@ -5,6 +5,7 @@ import android.app.Activity
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
@@ -53,11 +54,12 @@ fun HomeNavHost(
             bottomBar = {
                 HomeBottomNavigationBar(navController = navigator.navController)
             },
-            content = { _ ->
+            contentWindowInsets = WindowInsets(0.dp, 0.dp, 0.dp, 0.dp),
+            content = { innerPadding ->
                 NavHost(
                     navController = navigator.navController,
                     startDestination = navigator.startDestination,
-                    modifier = modifier,
+                    modifier = modifier.padding(innerPadding),
                 ) {
                     composable(HomeRoute.Home.route) {
                         HomeScreenContainer(

core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStore.kt

@@ -5,14 +5,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface AuthTokenDataStore {
     val tokenFlow: Flow<AuthToken>
-
-    suspend fun hasToken(): Boolean
-
     suspend fun updateAuthToken(accessToken: String, refreshToken: String)
-
     suspend fun updateAccessToken(accessToken: String)
-
     suspend fun updateRefreshToken(refreshToken: String)
-
     suspend fun clearAuthToken()
 }

core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStoreImpl.kt

@@ -3,24 +3,12 @@ package com.threegap.bitnagil.datastore.auth.storage
 import androidx.datastore.core.DataStore
 import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.firstOrNull
 
 class AuthTokenDataStoreImpl(
     private val dataStore: DataStore<AuthToken>,
 ) : AuthTokenDataStore {
     override val tokenFlow: Flow<AuthToken> = dataStore.data
 
-    override suspend fun hasToken(): Boolean {
-        return try {
-            val currentToken = dataStore.data.firstOrNull()
-            currentToken?.let {
-                !it.accessToken.isNullOrEmpty() && !it.refreshToken.isNullOrEmpty()
-            } ?: false
-        } catch (e: Exception) {
-            false
-        }
-    }
-
     override suspend fun updateAuthToken(accessToken: String, refreshToken: String) {
         try {
             dataStore.updateData {
@@ -58,8 +46,4 @@ class AuthTokenDataStoreImpl(
             throw e
         }
     }
-
-    companion object {
-        private const val TAG = "AuthTokenDataStore"
-    }
 }

core/network/src/main/java/com/threegap/bitnagil/network/auth/TokenAuthenticator.kt

@@ -19,6 +19,7 @@ class TokenAuthenticator(
     private val authMutex = Mutex()
 
     override fun authenticate(route: Route?, response: Response): Request? {
+        if (response.request.header(AUTO_LOGIN_HEADER) != null) return null
         if (!shouldRetry(response)) return null
 
         val currentToken = runBlocking { tokenProvider.getAccessToken() }
@@ -82,6 +83,7 @@ class TokenAuthenticator(
     private fun buildRequestWithToken(originalRequest: Request, token: String): Request {
         return originalRequest.newBuilder()
             .header(AUTHORIZATION, "$TOKEN_PREFIX $token")
+            .removeHeader(AUTO_LOGIN_HEADER)
             .build()
     }
 
@@ -96,5 +98,6 @@ class TokenAuthenticator(
         private const val AUTHORIZATION = "Authorization"
         private const val TOKEN_PREFIX = "Bearer"
         private const val SUCCESS_CODE = "CO000"
+        private const val AUTO_LOGIN_HEADER = "Auto-Login"
     }
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasource/AuthLocalDataSource.kt

@@ -1,9 +1,7 @@
 package com.threegap.bitnagil.data.auth.datasource
 
 interface AuthLocalDataSource {
-    suspend fun hasToken(): Boolean
-
+    suspend fun getRefreshToken(): String?
     suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit>
-
     suspend fun clearAuthToken(): Result<Unit>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasource/AuthRemoteDataSource.kt

@@ -6,10 +6,8 @@ import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 
 interface AuthRemoteDataSource {
     suspend fun login(socialAccessToken: String, loginRequestDto: LoginRequestDto): Result<LoginResponseDto>
-
     suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit>
-
     suspend fun logout(): Result<Unit>
-
     suspend fun withdrawal(): Result<Unit>
+    suspend fun reissueToken(refreshToken: String): Result<LoginResponseDto>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthLocalDataSourceImpl.kt

@@ -2,13 +2,17 @@ package com.threegap.bitnagil.data.auth.datasourceimpl
 
 import com.threegap.bitnagil.data.auth.datasource.AuthLocalDataSource
 import com.threegap.bitnagil.datastore.auth.storage.AuthTokenDataStore
+import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
 
 class AuthLocalDataSourceImpl @Inject constructor(
     private val authTokenDataStore: AuthTokenDataStore,
 ) : AuthLocalDataSource {
 
-    override suspend fun hasToken(): Boolean = authTokenDataStore.hasToken()
+    override suspend fun getRefreshToken(): String? =
+        runCatching {
+            authTokenDataStore.tokenFlow.firstOrNull()?.refreshToken
+        }.getOrNull()
 
     override suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit> =
         runCatching {

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -31,4 +31,9 @@ class AuthRemoteDataSourceImpl @Inject constructor(
         safeUnitApiCall {
             authService.postWithdrawal()
         }
+
+    override suspend fun reissueToken(refreshToken: String): Result<LoginResponseDto> =
+        safeApiCall {
+            authService.postReissueToken(refreshToken)
+        }
 }