Merge remote-tracking branch 'origin/dev' into feature/mod-board-piece

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "com.goalpanzi.mission_mate"
         minSdk = 26
         targetSdk = 34
-        versionCode = 4
-        versionName = "1.0.1"
+        versionCode = 5
+        versionName = "1.0.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

core/data/auth/build.gradle.kts

@@ -50,4 +50,5 @@ dependencies {
     implementation(project(":core:domain:auth"))
     implementation(project(":core:network"))
     implementation(project(":core:datastore"))
+    implementation(project(":core:navigation"))
 }

core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/AuthTokenExpirationHandler.kt

@@ -0,0 +1,30 @@
+package com.goalpanzi.mission_mate.core.data.auth
+
+import com.goalpanzi.mission_mate.core.datastore.datasource.AuthDataSource
+import com.goalpanzi.mission_mate.core.datastore.datasource.DefaultDataSource
+import com.goalpanzi.mission_mate.core.datastore.datasource.MissionDataSource
+import com.goalpanzi.mission_mate.core.navigation.NavigationEventHandler
+import com.goalpanzi.mission_mate.core.navigation.di.AuthNavigation
+import com.goalpanzi.mission_mate.core.network.TokenExpirationHandler
+import kotlinx.coroutines.flow.collect
+import javax.inject.Inject
+
+class AuthTokenExpirationHandler @Inject constructor(
+    private val authDataSource: AuthDataSource,
+    private val defaultDataSource: DefaultDataSource,
+    private val missionDataSource: MissionDataSource,
+    @AuthNavigation private val authNavigationEventHandler: NavigationEventHandler
+) : TokenExpirationHandler {
+
+    override suspend fun handleRefreshTokenExpiration() {
+        clearCachedData()
+        authNavigationEventHandler.triggerRouteToNavigate("RouteModel.Login")
+    }
+
+    private suspend fun clearCachedData(){
+        authDataSource.setAccessToken("")
+        authDataSource.setRefreshToken("")
+        defaultDataSource.clearUserData().collect()
+        missionDataSource.clearMissionData().collect()
+    }
+}

core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/di/AuthDataModule.kt

@@ -1,8 +1,10 @@
 package com.goalpanzi.mission_mate.core.data.auth.di
 
+import com.goalpanzi.mission_mate.core.data.auth.AuthTokenExpirationHandler
 import com.goalpanzi.mission_mate.core.data.auth.AuthTokenProvider
 import com.goalpanzi.mission_mate.core.data.auth.repository.AuthRepositoryImpl
 import com.goalpanzi.mission_mate.core.domain.auth.repository.AuthRepository
+import com.goalpanzi.mission_mate.core.network.TokenExpirationHandler
 import com.goalpanzi.mission_mate.core.network.TokenProvider
 import dagger.Binds
 import dagger.Module
@@ -18,4 +20,7 @@ internal abstract class AuthDataModule {
 
     @Binds
     abstract fun bindTokenProvider(impl : AuthTokenProvider) : TokenProvider
+
+    @Binds
+    abstract fun bindTokenExpirationHandler(impl : AuthTokenExpirationHandler) : TokenExpirationHandler
 }

core/data/onboarding/src/main/java/com/goalpanzi/mission_mate/core/data/onboarding/mapper/OnboardingMapper.kt

@@ -22,7 +22,8 @@ fun CreateMissionBody.toRequest() : CreateMissionRequest {
 fun MissionResponse.toModel() : Mission {
     return Mission(
         missionId = missionId,
-        description = description
+        description = description,
+        missionStatus = missionStatus
     )
 }
 

core/domain/onboarding/src/main/java/com/goalpanzi/mission_mate/core/domain/onboarding/model/Mission.kt

@@ -2,5 +2,6 @@ package com.goalpanzi.mission_mate.core.domain.onboarding.model
 
 data class Mission(
     val missionId : Long,
-    val description : String
+    val description : String,
+    val missionStatus : String
 )

core/navigation/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
+    alias(libs.plugins.kotlin.ksp)
+    alias(libs.plugins.hilt.android)
 }
 
 android {
@@ -37,4 +39,7 @@ android {
 
 dependencies {
     implementation(libs.kotlin.serialization.json)
-}
+    implementation(libs.bundles.coroutines)
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.compiler)
+}

core/navigation/src/main/java/com/goalpanzi/mission_mate/core/navigation/AuthNavigationEventHandler.kt

@@ -0,0 +1,16 @@
+package com.goalpanzi.mission_mate.core.navigation
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
+
+class AuthNavigationEventHandler @Inject constructor() : NavigationEventHandler {
+
+    private val _routeToNavigate = MutableSharedFlow<String>()
+    override val routeToNavigate: SharedFlow<String> = _routeToNavigate.asSharedFlow()
+
+    override suspend fun triggerRouteToNavigate(route: String) {
+        _routeToNavigate.emit(route)
+    }
+}

core/navigation/src/main/java/com/goalpanzi/mission_mate/core/navigation/NavigationEventHandler.kt

@@ -0,0 +1,9 @@
+package com.goalpanzi.mission_mate.core.navigation
+
+import kotlinx.coroutines.flow.SharedFlow
+
+interface NavigationEventHandler {
+    val routeToNavigate : SharedFlow<String>
+
+    suspend fun triggerRouteToNavigate(route : String)
+}

core/navigation/src/main/java/com/goalpanzi/mission_mate/core/navigation/di/NavigationModule.kt

@@ -0,0 +1,26 @@
+package com.goalpanzi.mission_mate.core.navigation.di
+
+import com.goalpanzi.mission_mate.core.navigation.AuthNavigationEventHandler
+import com.goalpanzi.mission_mate.core.navigation.NavigationEventHandler
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class AuthNavigation
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class NavigationModule {
+
+    @AuthNavigation
+    @Binds
+    @Singleton
+    abstract fun bindAuthNavigationEventHandler(
+        impl : AuthNavigationEventHandler
+    ) : NavigationEventHandler
+}

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/TokenExpirationHandler.kt

@@ -0,0 +1,5 @@
+package com.goalpanzi.mission_mate.core.network
+
+interface TokenExpirationHandler {
+    suspend fun handleRefreshTokenExpiration()
+}

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/di/NetworkModule.kt

@@ -1,7 +1,8 @@
 package com.goalpanzi.mission_mate.core.network.di
 
 import com.goalpanzi.mission_mate.core.network.BuildConfig
-import com.goalpanzi.mission_mate.core.network.TokenInterceptor
+import com.goalpanzi.mission_mate.core.network.interceptor.TokenInterceptor
+import com.goalpanzi.mission_mate.core.network.interceptor.TokenReissueInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -13,8 +14,25 @@ import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Converter
 import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
+import javax.inject.Qualifier
 import javax.inject.Singleton
 
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class TokenInterceptorHttpClient
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class TokenReissueInterceptorHttpClient
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class TokenRetrofit
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class TokenReissueRetrofit
+
 @Module
 @InstallIn(SingletonComponent::class)
 internal object NetworkModule {
@@ -25,19 +43,32 @@ internal object NetworkModule {
         return HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }
     }
 
+    @TokenInterceptorHttpClient
     @Provides
     @Singleton
-    fun provideOkhttpClient(
+    fun provideTokenInterceptorHttpClient(
         httpLoggingInterceptor: HttpLoggingInterceptor,
         tokenInterceptor: TokenInterceptor
     ): OkHttpClient {
-
         return OkHttpClient.Builder()
             .addInterceptor(tokenInterceptor)
             .addInterceptor(httpLoggingInterceptor)
             .build()
     }
 
+    @TokenReissueInterceptorHttpClient
+    @Provides
+    @Singleton
+    fun provideTokenReissueInterceptorHttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor,
+        tokenReissueInterceptor: TokenReissueInterceptor
+    ): OkHttpClient {
+        return OkHttpClient.Builder()
+            .addInterceptor(tokenReissueInterceptor)
+            .addInterceptor(httpLoggingInterceptor)
+            .build()
+    }
+
     @Provides
     @Singleton
     fun provideJson(): Json = Json {
@@ -53,10 +84,25 @@ internal object NetworkModule {
         return json.asConverterFactory("application/json".toMediaType())
     }
 
+    @TokenRetrofit
+    @Provides
+    @Singleton
+    fun provideTokenRetrofit(
+        @TokenInterceptorHttpClient okHttpClient: OkHttpClient,
+        converterFactory: Converter.Factory
+    ) : Retrofit {
+        return Retrofit.Builder()
+            .client(okHttpClient)
+            .baseUrl(BuildConfig.BASE_URL)
+            .addConverterFactory(converterFactory)
+            .build()
+    }
+
+    @TokenReissueRetrofit
     @Provides
     @Singleton
-    fun provideRetrofit(
-        okHttpClient: OkHttpClient,
+    fun provideTokenReissueRetrofit(
+        @TokenReissueInterceptorHttpClient okHttpClient: OkHttpClient,
         converterFactory: Converter.Factory
     ) : Retrofit {
         return Retrofit.Builder()
@@ -65,4 +111,4 @@ internal object NetworkModule {
             .addConverterFactory(converterFactory)
             .build()
     }
-}
+}

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/di/ServiceModule.kt

@@ -1,7 +1,5 @@
 package com.goalpanzi.mission_mate.core.network.di
 
-import com.goalpanzi.mission_mate.core.network.BuildConfig
-import com.goalpanzi.mission_mate.core.network.TokenProvider
 import com.goalpanzi.mission_mate.core.network.service.LoginService
 import com.goalpanzi.mission_mate.core.network.service.MissionService
 import com.goalpanzi.mission_mate.core.network.service.OnboardingService
@@ -11,11 +9,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.runBlocking
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Converter
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
@@ -25,56 +18,41 @@ object ServiceModule {
 
     @Provides
     @Singleton
-    fun provideLoginService(retrofit: Retrofit): LoginService {
+    fun provideLoginService(
+        @TokenRetrofit retrofit: Retrofit
+    ): LoginService {
         return retrofit.create(LoginService::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideProfileService(retrofit: Retrofit): ProfileService {
+    fun provideProfileService(
+        @TokenRetrofit retrofit: Retrofit
+    ): ProfileService {
         return retrofit.create(ProfileService::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideOnboardingService(retrofit: Retrofit): OnboardingService {
+    fun provideOnboardingService(
+        @TokenRetrofit retrofit: Retrofit
+    ): OnboardingService {
         return retrofit.create(OnboardingService::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideMissionService(retrofit: Retrofit): MissionService {
+    fun provideMissionService(
+        @TokenRetrofit retrofit: Retrofit)
+    : MissionService {
         return retrofit.create(MissionService::class.java)
     }
 
     @Provides
     @Singleton
     fun provideTokenService(
-        httpLoggingInterceptor: HttpLoggingInterceptor,
-        converterFactory: Converter.Factory,
-        tokenProvider: TokenProvider
-    ): TokenService {
-        val tokenReissueInterceptor = Interceptor { chain ->
-            val newRequest = chain.request().newBuilder().apply {
-                runBlocking {
-                    val token = tokenProvider.getAccessToken()
-                    token?.let {
-                        addHeader("Authorization", "Bearer $it")
-                    }
-                }
-            }
-            chain.proceed(newRequest.build())
-        }
-        val retrofit = Retrofit.Builder()
-            .client(
-                OkHttpClient.Builder()
-                    .addInterceptor(tokenReissueInterceptor)
-                    .addInterceptor(httpLoggingInterceptor)
-                    .build()
-            )
-            .baseUrl(BuildConfig.BASE_URL)
-            .addConverterFactory(converterFactory)
-            .build()
+        @TokenReissueRetrofit retrofit: Retrofit
+    ) : TokenService {
         return retrofit.create(TokenService::class.java)
     }
 }

core/network/src/main/java/com/goalpanzi/mission_mate/core/network/TokenInterceptor.kt → core/network/src/main/java/com/goalpanzi/mission_mate/core/network/interceptor/TokenInterceptor.kt

@@ -1,5 +1,6 @@
-package com.goalpanzi.mission_mate.core.network
+package com.goalpanzi.mission_mate.core.network.interceptor
 
+import com.goalpanzi.mission_mate.core.network.TokenProvider
 import com.goalpanzi.mission_mate.core.network.model.request.TokenReissueRequest
 import com.goalpanzi.mission_mate.core.network.service.TokenService
 import kotlinx.coroutines.CoroutineScope