[FIX/#124] 토큰 재발급 기능 DI 연결

Team-Going · Jan 15, 2024 · 55e5f8e · 55e5f8e
1 parent ee3d292
commit 55e5f8e
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 9 deletions.
diff --git a/app/src/main/java/com/going/doorip/di/DataSourceModule.kt b/app/src/main/java/com/going/doorip/di/DataSourceModule.kt
@@ -8,6 +8,7 @@ import com.going.data.datasource.ProfileDataSource
 import com.going.data.datasource.SettingDataSource
 import com.going.data.datasource.TendencyDataSource
 import com.going.data.datasource.TodoDataSource
+import com.going.data.datasource.TokenReissueDataSource
 import com.going.data.datasourceImpl.AuthDataSourceImpl
 import com.going.data.datasourceImpl.DashBoardDataSourceImpl
 import com.going.data.datasourceImpl.EnterTripDataSourceImpl
@@ -16,6 +17,7 @@ import com.going.data.datasourceImpl.ProfileDataSourceImpl
 import com.going.data.datasourceImpl.SettingDataSourceImpl
 import com.going.data.datasourceImpl.TendencyDataSourceImpl
 import com.going.data.datasourceImpl.TodoDataSourceImpl
+import com.going.data.datasourceImpl.TokenReissueDataSourceImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -66,4 +68,8 @@ object DataSourceModule {
     fun provideEnterTripDataSource(enterTripDataSourceImpl: EnterTripDataSourceImpl): EnterTripDataSource =
         enterTripDataSourceImpl
 
+    @Provides
+    @Singleton
+    fun provideTokenReissueDataSource(tokenReissueDataSourceImpl: TokenReissueDataSourceImpl): TokenReissueDataSource =
+        tokenReissueDataSourceImpl
 }
diff --git a/app/src/main/java/com/going/doorip/di/RepositoryModule.kt b/app/src/main/java/com/going/doorip/di/RepositoryModule.kt
@@ -8,6 +8,7 @@ import com.going.data.repositoryImpl.ProfileRepositoryImpl
 import com.going.data.repositoryImpl.SettingRepositoryImpl
 import com.going.data.repositoryImpl.TendencyRepositoryImpl
 import com.going.data.repositoryImpl.TodoRepositoryImpl
+import com.going.data.repositoryImpl.TokenReissueRepositoryImpl
 import com.going.data.repositoryImpl.TokenRepositoryImpl
 import com.going.domain.repository.AuthRepository
 import com.going.domain.repository.DashBoardRepository
@@ -17,6 +18,7 @@ import com.going.domain.repository.ProfileRepository
 import com.going.domain.repository.SettingRepository
 import com.going.domain.repository.TendencyRepository
 import com.going.domain.repository.TodoRepository
+import com.going.domain.repository.TokenReissueRepository
 import com.going.domain.repository.TokenRepository
 import dagger.Module
 import dagger.Provides
@@ -73,4 +75,8 @@ object RepositoryModule {
     fun provideProfileRepository(profileRepositoryImpl: ProfileRepositoryImpl): ProfileRepository =
         profileRepositoryImpl
 
+    @Provides
+    @Singleton
+    fun provideTokenReissueRepository(tokenReissueRepositoryImpl: TokenReissueRepositoryImpl): TokenReissueRepository =
+        tokenReissueRepositoryImpl
 }
diff --git a/app/src/main/java/com/going/doorip/di/RetrofitModule.kt b/app/src/main/java/com/going/doorip/di/RetrofitModule.kt
@@ -3,6 +3,7 @@ package com.going.doorip.di
 import com.going.data.interceptor.AuthInterceptor
 import com.going.doorip.BuildConfig.BASE_URL
 import com.going.doorip.di.qualifier.JWT
+import com.going.doorip.di.qualifier.REISSUE
 import com.going.ui.extension.isJsonArray
 import com.going.ui.extension.isJsonObject
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
@@ -63,6 +64,7 @@ object RetrofitModule {
 
     @Provides
     @Singleton
+    @JWT
     fun provideJWTOkHttpClient(
         loggingInterceptor: Interceptor,
         @JWT authInterceptor: Interceptor,
@@ -73,8 +75,30 @@ object RetrofitModule {
 
     @Provides
     @Singleton
+    @REISSUE
+    fun provideReissueOkHttpClient(
+        loggingInterceptor: Interceptor,
+    ): OkHttpClient = OkHttpClient.Builder()
+        .addInterceptor(loggingInterceptor)
+        .build()
+
+    @Provides
+    @Singleton
+    @JWT
     fun provideJWTRetrofit(
-        client: OkHttpClient,
+        @JWT client: OkHttpClient,
+        factory: Converter.Factory,
+    ): Retrofit = Retrofit.Builder()
+        .baseUrl(BASE_URL)
+        .client(client)
+        .addConverterFactory(factory)
+        .build()
+
+    @Provides
+    @Singleton
+    @REISSUE
+    fun provideReissueRetrofit(
+        @REISSUE client: OkHttpClient,
         factory: Converter.Factory,
     ): Retrofit = Retrofit.Builder()
         .baseUrl(BASE_URL)

diff --git a/app/src/main/java/com/going/doorip/di/ServiceModule.kt b/app/src/main/java/com/going/doorip/di/ServiceModule.kt
@@ -8,6 +8,9 @@ import com.going.data.service.ProfileService
 import com.going.data.service.SettingService
 import com.going.data.service.TendencyService
 import com.going.data.service.TodoService
+import com.going.data.service.TokenReissueService
+import com.going.doorip.di.qualifier.JWT
+import com.going.doorip.di.qualifier.REISSUE
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -21,42 +24,46 @@ object ServiceModule {
 
     @Provides
     @Singleton
-    fun provideMockService(retrofit: Retrofit): MockService =
+    fun provideMockService(@JWT retrofit: Retrofit): MockService =
         retrofit.create(MockService::class.java)
 
     @Provides
     @Singleton
-    fun provideAuthService(retrofit: Retrofit): AuthService =
+    fun provideAuthService(@JWT retrofit: Retrofit): AuthService =
         retrofit.create(AuthService::class.java)
 
     @Provides
     @Singleton
-    fun provideSettingService(retrofit: Retrofit): SettingService =
+    fun provideSettingService(@JWT retrofit: Retrofit): SettingService =
         retrofit.create(SettingService::class.java)
 
     @Provides
     @Singleton
-    fun provideTodoService(retrofit: Retrofit): TodoService =
+    fun provideTodoService(@JWT retrofit: Retrofit): TodoService =
         retrofit.create(TodoService::class.java)
 
     @Provides
     @Singleton
-    fun provideDashBoardService(retrofit: Retrofit): DashBoardService =
+    fun provideDashBoardService(@JWT retrofit: Retrofit): DashBoardService =
         retrofit.create(DashBoardService::class.java)
 
     @Provides
     @Singleton
-    fun provideEnterTripService(retrofit: Retrofit): EnterTripService =
+    fun provideEnterTripService(@JWT retrofit: Retrofit): EnterTripService =
         retrofit.create(EnterTripService::class.java)
 
     @Provides
     @Singleton
-    fun provideTendencyService(retrofit: Retrofit): TendencyService =
+    fun provideTendencyService(@JWT retrofit: Retrofit): TendencyService =
         retrofit.create(TendencyService::class.java)
 
     @Provides
     @Singleton
-    fun provideProfileService(retrofit: Retrofit): ProfileService =
+    fun provideProfileService(@JWT retrofit: Retrofit): ProfileService =
         retrofit.create(ProfileService::class.java)
 
+    @Provides
+    @Singleton
+    fun provideTokenReissueService(@REISSUE retrofit: Retrofit): TokenReissueService =
+        retrofit.create(TokenReissueService::class.java)
 }