[Feature] 구글 자동 로그인을 구현 한다.

core/remote/src/main/java/com/benenfeldt/remote/api/TokenService.kt

@@ -0,0 +1,10 @@
+package com.benenfeldt.remote.api
+
+import com.benenfeldt.remote.dto.BaseResponse
+import com.benenfeldt.remote.dto.TokenInformationResponse
+import retrofit2.http.GET
+
+interface TokenService {
+    @GET("/api/v1/token")
+    suspend fun getTokenInformation(): Result<BaseResponse<TokenInformationResponse>>
+}

core/remote/src/main/java/com/benenfeldt/remote/di/ApiModule.kt

@@ -1,6 +1,7 @@
 package com.benenfeldt.remote.di
 
 import com.benenfeldt.remote.api.StudyService
+import com.benenfeldt.remote.api.TokenService
 import com.benenfeldt.remote.api.UserPublicService
 import com.benenfeldt.remote.api.UserService
 import com.benenfeldt.remote.api.WeeklyService
@@ -56,4 +57,12 @@ object ApiModule {
     ): WeeklyService {
         return retrofit.create(WeeklyService::class.java)
     }
+
+    @Singleton
+    @Provides
+    fun provideTokenService(
+        @NeedAuthRetrofit retrofit: Retrofit,
+    ): TokenService {
+        return retrofit.create(TokenService::class.java)
+    }
 }

core/remote/src/main/java/com/benenfeldt/remote/di/NetworkModule.kt

@@ -3,6 +3,7 @@ package com.benenfeldt.remote.di
 import android.util.Log
 import com.benenfeldt.remote.BuildConfig
 import com.benenfeldt.remote.token.AccessTokenInterceptor
+import com.benenfeldt.remote.token.HY2Authenticator
 import com.benenfeldt.remote.token.NeedAuthClient
 import com.benenfeldt.remote.token.NeedAuthRetrofit
 import com.benenfeldt.remote.token.PublicClient
@@ -70,10 +71,12 @@ object NetworkModule {
     fun provideAuthOkHttpClient(
         accessTokenInterceptor: AccessTokenInterceptor,
         httpLoggingInterceptor: HttpLoggingInterceptor,
+        hY2Authenticator: HY2Authenticator,
     ): OkHttpClient {
         return OkHttpClient.Builder()
             .addInterceptor(accessTokenInterceptor)
             .addInterceptor(httpLoggingInterceptor)
+            .authenticator(hY2Authenticator)
             .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
             .writeTimeout(WRITE_TIMEOUT, TimeUnit.SECONDS)
             .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)

core/remote/src/main/java/com/benenfeldt/remote/dto/TokenInformationResponse.kt

@@ -0,0 +1,9 @@
+package com.benenfeldt.remote.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TokenInformationResponse(
+    val role: String,
+    val validToken: Boolean,
+)

core/remote/src/main/java/com/benenfeldt/remote/dto/UserSignUpResponse.kt

@@ -1,11 +1,14 @@
 package com.benenfeldt.remote.dto
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class UserSignUpResponse(
     val id: Int,
     val department: String,
     val nickname: String,
-    val username: String,
+    @SerialName("username")
+    val email: String,
+    val accessToken: String,
 )

core/remote/src/main/java/com/benenfeldt/remote/mapper/TokenInformationMapper.kt

@@ -0,0 +1,12 @@
+package com.benenfeldt.remote.mapper
+
+import com.benenfeldt.remote.dto.TokenInformationResponse
+import com.benenfeldt.remote.token.TokenInformation
+import com.benenfeldt.remote.token.TokenRole
+
+fun TokenInformationResponse.toTokenInformation(): TokenInformation {
+    return TokenInformation(
+        role = TokenRole.valueOf(role),
+        isValidToken = validToken,
+    )
+}

core/remote/src/main/java/com/benenfeldt/remote/token/AuthCallback.kt

@@ -0,0 +1,5 @@
+package com.benenfeldt.remote.token
+
+interface AuthCallback {
+    fun onAuthRequired()
+}

core/remote/src/main/java/com/benenfeldt/remote/token/DefaultJwtManager.kt

@@ -30,22 +30,6 @@ class DefaultJwtManager
             }.firstOrNull()
         }
 
-        override suspend fun saveGoogleIdToken(token: String) {
-            dataStore.edit { preferences ->
-                preferences[googleIdTokenKey] = token
-            }
-
-            dataStore.data.map { preferences ->
-                preferences[googleIdTokenKey]
-            }.firstOrNull()
-        }
-
-        override suspend fun getGoogleIdToken(): String? {
-            return dataStore.data.map { preferences ->
-                preferences[googleIdTokenKey]
-            }.firstOrNull()
-        }
-
         override suspend fun clearAllTokens() {
             dataStore.edit { preferences ->
                 preferences.remove(accessJwtKey)
@@ -56,6 +40,5 @@ class DefaultJwtManager
             private const val ACCESS_JWT_KEY_NAME = "access_jwt"
             private const val GOOGLE_ID_TOKEN_KEY_NAME = "google_id_token"
             val accessJwtKey = stringPreferencesKey(ACCESS_JWT_KEY_NAME)
-            val googleIdTokenKey = stringPreferencesKey(GOOGLE_ID_TOKEN_KEY_NAME)
         }
     }

core/remote/src/main/java/com/benenfeldt/remote/token/HY2Authenticator.kt

@@ -0,0 +1,29 @@
+package com.benenfeldt.remote.token
+
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import javax.inject.Inject
+
+class HY2Authenticator
+    @Inject
+    constructor(
+        private val authCallback: AuthCallback,
+        private val jwtManager: JwtManager,
+    ) : Authenticator {
+        override fun authenticate(
+            route: Route?,
+            response: Response,
+        ): Request? {
+            if (response.code == 401) {
+                runBlocking { jwtManager.clearAllTokens() }
+                authCallback.onAuthRequired()
+
+                // null을 반환하여 현재 요청을 중단
+                return null
+            }
+            return null
+        }
+    }

core/remote/src/main/java/com/benenfeldt/remote/token/JwtManager.kt

@@ -5,9 +5,5 @@ interface JwtManager {
 
     suspend fun getAccessJwt(): String?
 
-    suspend fun saveGoogleIdToken(token: String)
-
-    suspend fun getGoogleIdToken(): String?
-
     suspend fun clearAllTokens()
 }

core/remote/src/main/java/com/benenfeldt/remote/token/TokenInformation.kt

@@ -0,0 +1,6 @@
+package com.benenfeldt.remote.token
+
+data class TokenInformation(
+    val role: TokenRole,
+    val isValidToken: Boolean,
+)

core/remote/src/main/java/com/benenfeldt/remote/token/TokenRole.kt

@@ -0,0 +1,15 @@
+package com.benenfeldt.remote.token
+
+/**
+ * USER - 구글 로그인을 마치고, 회원가입을 한 유저
+ *
+ * GUEST - 구글 로그인을 했지만, 회원가입을 하지 않은 유저
+ *
+ * ADMIN - 관리자 계정, 하지만 앱으로 로그인 하는 경우는 없음
+ * */
+
+enum class TokenRole {
+    USER,
+    GUEST,
+    ADMIN,
+}

core/remote/src/main/java/com/benenfeldt/remote/token/TokenValidator.kt

@@ -0,0 +1,17 @@
+package com.benenfeldt.remote.token
+
+import com.benenfeldt.remote.api.TokenService
+import com.benenfeldt.remote.mapper.toResult
+import com.benenfeldt.remote.mapper.toTokenInformation
+import javax.inject.Inject
+
+class TokenValidator
+    @Inject
+    constructor(
+        private val tokenService: TokenService,
+    ) {
+        suspend fun validate(): Result<TokenInformation> {
+            return tokenService.getTokenInformation()
+                .toResult { it.data.toTokenInformation() }
+        }
+    }

main-presentation/src/main/java/com/teamhy2/feature/home/HomeScreen.kt

@@ -30,7 +30,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.teamhy2.designsystem.common.HY2CircularLoading
 import com.teamhy2.designsystem.common.HY2Dialog
 import com.teamhy2.designsystem.common.HY2TimePicker
-import com.teamhy2.designsystem.ui.theme.Gray800
 import com.teamhy2.designsystem.ui.theme.HY2Theme
 import com.teamhy2.designsystem.util.compositionlocal.LocalShowSnackBar
 import com.teamhy2.feature.home.component.InitTimerComponent
@@ -84,7 +83,7 @@ fun HomeRoute(
         }
     }
 
-    SetNavigationBarColor(Gray800)
+    SetNavigationBarColor(Color.Black)
 
     when (homeUiState) {
         is HomeUiState.Loading -> {

main-presentation/src/main/java/com/teamhy2/feature/home/component/RunningTimerComponent.kt

@@ -57,6 +57,7 @@ fun RunningTimerComponent(
             HY2Button(
                 text = stringResource(R.string.main_extend_study_room),
                 onClick = onStudyRoomExtendClick,
+                modifier = Modifier.height(52.dp),
             )
             Spacer(modifier = Modifier.height(8.dp))
         }
@@ -66,6 +67,7 @@ fun RunningTimerComponent(
             backgroundColor = Gray600,
             textColor = Gray100,
             onClick = onStudyRoomEndClick,
+            modifier = Modifier.height(52.dp),
         )
     }
 }

main-presentation/src/main/java/com/teamhy2/feature/main/InitialUiState.kt

@@ -9,7 +9,7 @@ interface InitialUiState {
     data object NeedUpdate : InitialUiState
 
     data class Success(
-        val startDestination: String = "",
+        val startDestination: String,
         val urls: Map<UrlName, UrlValue> = emptyMap(),
     ) : InitialUiState
 }

main-presentation/src/main/java/com/teamhy2/feature/main/InitialViewModel.kt

@@ -3,11 +3,18 @@ package com.teamhy2.feature.main
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.benenfeldt.remote.token.JwtManager
+import com.benenfeldt.remote.token.TokenRole
+import com.benenfeldt.remote.token.TokenValidator
 import com.google.firebase.firestore.FirebaseFirestore
+import com.teamhy2.feature.home.navigation.Home
 import com.teamhy2.hongikyeolgong2.notification.NotificationHandler
 import com.teamhy2.onboarding.domain.repository.WebViewRepository
 import com.teamhy2.onboarding.navigation.Onboarding
+import com.teamhy2.onboarding.navigation.SignUp
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -24,6 +31,8 @@ class InitialViewModel
     @Inject
     constructor(
         private val webViewRepository: WebViewRepository,
+        private val jwtManager: JwtManager,
+        private val tokenValidator: TokenValidator,
         val notificationHandler: NotificationHandler,
     ) : ViewModel() {
         private val _initialUiState: MutableStateFlow<InitialUiState> =
@@ -34,40 +43,44 @@ class InitialViewModel
         val errorFlow: SharedFlow<Throwable> = _errorFlow.asSharedFlow()
 
         init {
-            fetchStartDestination()
-            fetchFirebaseUrls()
+            initInitialState()
         }
 
-        private fun fetchStartDestination() {
-            fun setStartDestination(startDestination: String) {
-                if (_initialUiState.value is InitialUiState.Loading) {
-                    _initialUiState.update { InitialUiState.Success(startDestination = startDestination) }
-                    return
-                }
-                if (_initialUiState.value is InitialUiState.Success) {
-                    _initialUiState.update {
-                        (it as InitialUiState.Success).copy(startDestination = startDestination)
-                    }
+        private fun initInitialState() {
+            viewModelScope.launch {
+                val startDestination: Deferred<String> = async { getStartDestination() }
+                val urls: Deferred<Map<String, String>> = async { webViewRepository.fetchFirebaseUrls() }
+
+                _initialUiState.update {
+                    InitialUiState.Success(
+                        startDestination = startDestination.await(),
+                        urls = urls.await(),
+                    )
                 }
             }
-
-            // TODO: 자동 로그인 구현 시 변경
-            setStartDestination(Onboarding.ROUTE)
         }
 
-        private fun fetchFirebaseUrls() {
-            viewModelScope.launch {
-                val urls = webViewRepository.fetchFirebaseUrls()
-                if (_initialUiState.value is InitialUiState.Loading) {
-                    _initialUiState.update { InitialUiState.Success(urls = urls) }
-                    return@launch
-                }
-                if (_initialUiState.value is InitialUiState.Success) {
-                    _initialUiState.update { (it as InitialUiState.Success).copy(urls = urls) }
-                }
+        private suspend fun getStartDestination(): String {
+            jwtManager.getAccessJwt() ?: return resetToken()
+
+            val isValidToken = tokenValidator.validate().getOrNull()
+            if (isValidToken == null) {
+                _errorFlow.emit(Throwable("서버 연결에 이상이 있습니다."))
+                return resetToken()
+            }
+
+            return when (isValidToken.role) {
+                TokenRole.USER -> Home.ROUTE
+                TokenRole.GUEST -> SignUp.ROUTE
+                TokenRole.ADMIN -> resetToken()
             }
         }
 
+        private suspend fun resetToken(): String {
+            jwtManager.clearAllTokens()
+            return Onboarding.ROUTE
+        }
+
         fun getMinVersion(currentVersion: Long) {
             viewModelScope.launch {
                 val firebaseStore = FirebaseFirestore.getInstance()

main-presentation/src/main/java/com/teamhy2/feature/main/MainAuthCallback.kt

@@ -0,0 +1,21 @@
+package com.teamhy2.feature.main
+
+import android.content.Context
+import android.content.Intent
+import com.benenfeldt.remote.token.AuthCallback
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class MainAuthCallback
+    @Inject
+    constructor(
+        @ApplicationContext private val context: Context,
+    ) : AuthCallback {
+        override fun onAuthRequired() {
+            val intent =
+                Intent(context, MainActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                }
+            context.startActivity(intent)
+        }
+    }