Merge pull request #692 from Team-WSS/feat/657

refactor: 소셜로그인(+토큰 관리) 재구현

Author: s9hn

app/build.gradle.kts

@@ -41,10 +41,6 @@ android {
             isDebuggable = true
             applicationIdSuffix = ".debug"
 
-            buildConfigs(rootDir) {
-                string(name = "BASE_URL", key = "debug.base.url")
-            }
-
             manifestPlaceholders {
                 "appName" to "@string/app_name_debug"
                 "appIcon" to "@mipmap/ic_wss_logo_debug"
@@ -61,10 +57,6 @@ android {
                 "proguard-rules.pro",
             )
 
-            buildConfigs(rootDir) {
-                string(name = "BASE_URL", key = "release.base.url")
-            }
-
             manifestPlaceholders {
                 "appName" to "@string/app_name"
                 "appIcon" to "@mipmap/ic_wss_logo"
@@ -84,6 +76,14 @@ dependencies {
     // 프로젝트 의존성
     implementation(projects.core.resource)
     implementation(projects.core.designsystem)
+    implementation(projects.core.common)
+    implementation(projects.core.auth)
+    implementation(projects.core.authKakao)
+    implementation(projects.core.network)
+    implementation(projects.core.datastore)
+
+    implementation(projects.feature.signin)
+    implementation(projects.data.account)
 
     // AndroidX 및 Jetpack 기본 라이브러리
     implementation(libs.androidx.core.ktx)

app/src/main/java/com/into/websoso/WebsosoApp.kt

@@ -2,16 +2,34 @@ package com.into.websoso
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.lifecycle.ProcessLifecycleOwner
 import com.into.websoso.BuildConfig.KAKAO_APP_KEY
+import com.into.websoso.core.auth.AuthSessionManager
+import com.into.websoso.core.common.navigator.NavigatorProvider
+import com.into.websoso.core.common.util.collectWithLifecycle
 import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
 
 @HiltAndroidApp
 class WebsosoApp : Application() {
+    @Inject
+    lateinit var sessionManager: AuthSessionManager
+
+    @Inject
+    lateinit var navigatorProvider: NavigatorProvider
+
     override fun onCreate() {
         super.onCreate()
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
 
+        subscribeSessionState()
         KakaoSdk.init(this, KAKAO_APP_KEY)
     }
+
+    private fun subscribeSessionState() {
+        sessionManager.sessionExpired.collectWithLifecycle(ProcessLifecycleOwner.get()) {
+            navigatorProvider.navigateToLoginActivity(::startActivity)
+        }
+    }
 }

app/src/main/java/com/into/websoso/core/common/util/navigator/WebsosoNavigator.kt

@@ -0,0 +1,44 @@
+package com.into.websoso.core.common.util.navigator
+
+import android.content.Context
+import android.content.Intent
+import com.into.websoso.core.common.navigator.NavigatorProvider
+import com.into.websoso.ui.login.LoginActivity
+import com.into.websoso.ui.main.MainActivity
+import com.into.websoso.ui.onboarding.OnboardingActivity
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Inject
+import javax.inject.Singleton
+
+internal class WebsosoNavigator
+    @Inject
+    constructor(
+        @ApplicationContext private val context: Context,
+    ) : NavigatorProvider {
+        override fun navigateToLoginActivity(startActivity: (Intent) -> Unit) {
+            val intent = LoginActivity.getIntent(context)
+            startActivity(intent)
+        }
+
+        override fun navigateToMainActivity(startActivity: (Intent) -> Unit) {
+            val intent = MainActivity.getIntent(context, true)
+            startActivity(intent)
+        }
+
+        override fun navigateToOnboardingActivity(startActivity: (Intent) -> Unit) {
+            val intent = OnboardingActivity.getIntent(context)
+            startActivity(intent)
+        }
+    }
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface NavigatorModule {
+    @Binds
+    @Singleton
+    fun bindWebsosoNavigator(websosoNavigator: WebsosoNavigator): NavigatorProvider
+}

app/src/main/java/com/into/websoso/core/common/util/sessionManager/WebsosoAuthSessionManager.kt

@@ -0,0 +1,31 @@
+package com.into.websoso.core.common.util.sessionManager
+
+import com.into.websoso.core.auth.AuthSessionManager
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+internal class WebsosoAuthSessionManager
+    @Inject
+    constructor() : AuthSessionManager {
+        private val _sessionExpired = MutableSharedFlow<Unit>(replay = 1, extraBufferCapacity = 1)
+        override val sessionExpired: SharedFlow<Unit> get() = _sessionExpired.asSharedFlow()
+
+        override suspend fun onSessionExpired() {
+            _sessionExpired.emit(Unit)
+        }
+    }
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface WebsosoAuthSessionManagerModule {
+    @Binds
+    @Singleton
+    fun bindWebsosoAuthSessionManager(websosoAuthSessionManager: WebsosoAuthSessionManager): AuthSessionManager
+}

app/src/main/java/com/into/websoso/data/authenticator/WebsosoAuthenticator.kt

@@ -1,7 +1,5 @@
 package com.into.websoso.data.di
 
-import com.into.websoso.data.qualifier.Secured
-import com.into.websoso.data.qualifier.Unsecured
 import com.into.websoso.data.remote.api.AuthApi
 import com.into.websoso.data.remote.api.AvatarApi
 import com.into.websoso.data.remote.api.FeedApi
@@ -24,61 +22,41 @@ import javax.inject.Singleton
 object ApiModule {
     @Provides
     @Singleton
-    fun provideAuthApi(
-        @Unsecured retrofit: Retrofit,
-    ): AuthApi = retrofit.create(AuthApi::class.java)
+    fun provideAuthApi(retrofit: Retrofit): AuthApi = retrofit.create(AuthApi::class.java)
 
     @Provides
     @Singleton
-    fun provideNovelApi(
-        @Secured retrofit: Retrofit,
-    ): NovelApi = retrofit.create(NovelApi::class.java)
+    fun provideNovelApi(retrofit: Retrofit): NovelApi = retrofit.create(NovelApi::class.java)
 
     @Provides
     @Singleton
-    fun provideUserNovelApi(
-        @Secured retrofit: Retrofit,
-    ): UserNovelApi = retrofit.create(UserNovelApi::class.java)
+    fun provideUserNovelApi(retrofit: Retrofit): UserNovelApi = retrofit.create(UserNovelApi::class.java)
 
     @Provides
     @Singleton
-    fun provideNotificationApi(
-        @Secured retrofit: Retrofit,
-    ): NotificationApi = retrofit.create(NotificationApi::class.java)
+    fun provideNotificationApi(retrofit: Retrofit): NotificationApi = retrofit.create(NotificationApi::class.java)
 
     @Provides
     @Singleton
-    fun provideFeedApi(
-        @Secured retrofit: Retrofit,
-    ): FeedApi = retrofit.create(FeedApi::class.java)
+    fun provideFeedApi(retrofit: Retrofit): FeedApi = retrofit.create(FeedApi::class.java)
 
     @Provides
     @Singleton
-    fun provideUserApi(
-        @Secured retrofit: Retrofit,
-    ): UserApi = retrofit.create(UserApi::class.java)
+    fun provideUserApi(retrofit: Retrofit): UserApi = retrofit.create(UserApi::class.java)
 
     @Provides
     @Singleton
-    fun provideKeywordApi(
-        @Secured retrofit: Retrofit,
-    ): KeywordApi = retrofit.create(KeywordApi::class.java)
+    fun provideKeywordApi(retrofit: Retrofit): KeywordApi = retrofit.create(KeywordApi::class.java)
 
     @Provides
     @Singleton
-    fun provideAvatarApi(
-        @Secured retrofit: Retrofit,
-    ): AvatarApi = retrofit.create(AvatarApi::class.java)
+    fun provideAvatarApi(retrofit: Retrofit): AvatarApi = retrofit.create(AvatarApi::class.java)
 
     @Provides
     @Singleton
-    fun provideVersionApi(
-        @Secured retrofit: Retrofit,
-    ): VersionApi = retrofit.create(VersionApi::class.java)
+    fun provideVersionApi(retrofit: Retrofit): VersionApi = retrofit.create(VersionApi::class.java)
 
     @Provides
     @Singleton
-    fun providePushMessageApi(
-        @Secured retrofit: Retrofit,
-    ): PushMessageApi = retrofit.create(PushMessageApi::class.java)
+    fun providePushMessageApi(retrofit: Retrofit): PushMessageApi = retrofit.create(PushMessageApi::class.java)
 }