feat: network module 을 사용한 401 refresh 방식 수정

android/app/src/main/java/com/zzang/chongdae/auth/source/AuthRemoteDataSourceImpl.kt

@@ -6,13 +6,12 @@ import com.zzang.chongdae.auth.dto.response.MemberResponse
 import com.zzang.chongdae.common.handler.DataError
 import com.zzang.chongdae.common.handler.Result
 import com.zzang.chongdae.data.remote.util.safeApiCall
-import com.zzang.chongdae.di.annotations.AuthApiServiceQualifier
 import javax.inject.Inject
 
 class AuthRemoteDataSourceImpl
     @Inject
     constructor(
-        @AuthApiServiceQualifier private val service: AuthApiService,
+        private val service: AuthApiService,
     ) : AuthRemoteDataSource {
         override suspend fun saveLogin(tokensRequest: TokensRequest): Result<MemberResponse, DataError.Network> {
             return safeApiCall { service.postLogin(tokensRequest) }

android/app/src/main/java/com/zzang/chongdae/data/remote/interceptor/TokenAuthenticator.kt

@@ -0,0 +1,43 @@
+package com.zzang.chongdae.data.remote.interceptor
+
+import com.zzang.chongdae.common.handler.Result
+import com.zzang.chongdae.domain.usecase.auth.RefreshTokenUseCase
+import dagger.Lazy
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import javax.inject.Inject
+
+class TokenAuthenticator
+    @Inject
+    constructor(
+        private val refreshTokenUseCase: Lazy<RefreshTokenUseCase>,
+    ) : Authenticator {
+        override fun authenticate(
+            route: Route?,
+            response: Response,
+        ): Request? {
+            if (response.request.header(AUTHORIZATION_HEADER) != null) {
+                return null
+            }
+
+            val newToken =
+                runBlocking {
+                    when (val result = refreshTokenUseCase.get()()) {
+                        is Result.Success -> result.data
+                        else -> null
+                    }
+                } ?: return null
+
+            return response.request.newBuilder()
+                .header(AUTHORIZATION_HEADER, "$TOKEN_PREFIX$newToken")
+                .build()
+        }
+
+        companion object {
+            private const val AUTHORIZATION_HEADER = "Authorization"
+            private const val TOKEN_PREFIX = "Bearer "
+        }
+    }

android/app/src/main/java/com/zzang/chongdae/data/remote/source/CommentRemoteDataSourceImpl.kt

@@ -9,13 +9,12 @@ import com.zzang.chongdae.data.remote.dto.response.comment.CommentsResponse
 import com.zzang.chongdae.data.remote.dto.response.comment.UpdatedStatusResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.comment.CommentRemoteDataSource
-import com.zzang.chongdae.di.annotations.CommentDetailApiServiceQualifier
 import javax.inject.Inject
 
 class CommentRemoteDataSourceImpl
     @Inject
     constructor(
-        @CommentDetailApiServiceQualifier private val service: CommentApiService,
+        private val service: CommentApiService,
     ) : CommentRemoteDataSource {
         override suspend fun saveComment(commentRequest: CommentRequest): Result<Unit, DataError.Network> =
             safeApiCall {

android/app/src/main/java/com/zzang/chongdae/data/remote/source/CommentRoomsDataSourceImpl.kt

@@ -6,13 +6,12 @@ import com.zzang.chongdae.data.remote.api.CommentApiService
 import com.zzang.chongdae.data.remote.dto.response.commentroom.CommentRoomsResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.CommentRoomsDataSource
-import com.zzang.chongdae.di.annotations.CommentRoomsApiServiceQualifier
 import javax.inject.Inject
 
 class CommentRoomsDataSourceImpl
     @Inject
     constructor(
-        @CommentRoomsApiServiceQualifier private val commentApiService: CommentApiService,
+        private val commentApiService: CommentApiService,
     ) : CommentRoomsDataSource {
         override suspend fun fetchCommentRooms(): Result<CommentRoomsResponse, DataError.Network> {
             return safeApiCall { commentApiService.getCommentRooms() }

android/app/src/main/java/com/zzang/chongdae/data/remote/source/OfferingDetailDataSourceImpl.kt

@@ -8,15 +8,13 @@ import com.zzang.chongdae.data.remote.dto.request.ParticipationRequest
 import com.zzang.chongdae.data.remote.dto.response.offering.OfferingDetailResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.OfferingDetailDataSource
-import com.zzang.chongdae.di.annotations.OfferingApiServiceQualifier
-import com.zzang.chongdae.di.annotations.ParticipantApiServiceQualifier
 import javax.inject.Inject
 
 class OfferingDetailDataSourceImpl
     @Inject
     constructor(
-        @OfferingApiServiceQualifier private val offeringApiService: OfferingApiService,
-        @ParticipantApiServiceQualifier private val participationApiService: ParticipationApiService,
+        private val offeringApiService: OfferingApiService,
+        private val participationApiService: ParticipationApiService,
     ) : OfferingDetailDataSource {
         override suspend fun fetchOfferingDetail(offeringId: Long): Result<OfferingDetailResponse, DataError.Network> =
             safeApiCall { offeringApiService.getOfferingDetail(offeringId) }

android/app/src/main/java/com/zzang/chongdae/data/remote/source/OfferingRemoteDataSourceImpl.kt

@@ -13,14 +13,13 @@ import com.zzang.chongdae.data.remote.dto.response.offering.RemoteOffering
 import com.zzang.chongdae.data.remote.mapper.toProductUrlRequest
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.offering.OfferingRemoteDataSource
-import com.zzang.chongdae.di.annotations.OfferingApiServiceQualifier
 import okhttp3.MultipartBody
 import javax.inject.Inject
 
 class OfferingRemoteDataSourceImpl
     @Inject
     constructor(
-        @OfferingApiServiceQualifier private val service: OfferingApiService,
+        private val service: OfferingApiService,
     ) : OfferingRemoteDataSource {
         override suspend fun fetchOffering(offeringId: Long): Result<RemoteOffering, DataError.Network> =
             safeApiCall { service.getOffering(offeringId) }

android/app/src/main/java/com/zzang/chongdae/data/remote/source/ParticipantRemoteDataSourceImpl.kt

@@ -6,13 +6,12 @@ import com.zzang.chongdae.data.remote.api.ParticipationApiService
 import com.zzang.chongdae.data.remote.dto.response.participants.ParticipantsResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.ParticipantRemoteDataSource
-import com.zzang.chongdae.di.annotations.ParticipantApiServiceQualifier
 import javax.inject.Inject
 
 class ParticipantRemoteDataSourceImpl
     @Inject
     constructor(
-        @ParticipantApiServiceQualifier private val service: ParticipationApiService,
+        private val service: ParticipationApiService,
     ) : ParticipantRemoteDataSource {
         override suspend fun fetchParticipants(offeringId: Long): Result<ParticipantsResponse, DataError.Network> =
             safeApiCall {

android/app/src/main/java/com/zzang/chongdae/di/annotations/AuthQualifier.kt

@@ -9,7 +9,3 @@ annotation class AuthRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class AuthDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AuthApiServiceQualifier

android/app/src/main/java/com/zzang/chongdae/di/annotations/CommentDetailQualifier.kt

@@ -9,7 +9,3 @@ annotation class CommentDetailRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class CommentDetailDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class CommentDetailApiServiceQualifier

android/app/src/main/java/com/zzang/chongdae/di/annotations/OfferingDetailQualifier.kt

@@ -9,7 +9,3 @@ annotation class OfferingDetailRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OfferingDetailDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class OfferingDetailApiServiceQualifier

android/app/src/main/java/com/zzang/chongdae/di/annotations/OfferingQualifier.kt

@@ -14,10 +14,6 @@ annotation class OfferingRemoteDataSourceQualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OfferingLocalDataSourceQualifier
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class OfferingApiServiceQualifier
-
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OfferingDaoQualifier

android/app/src/main/java/com/zzang/chongdae/di/annotations/ParticipantQualifier.kt

@@ -9,7 +9,3 @@ annotation class ParticipantRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class ParticipantDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class ParticipantApiServiceQualifier

android/app/src/main/java/com/zzang/chongdae/di/module/AuthDependencyModule.kt

@@ -1,17 +1,13 @@
 package com.zzang.chongdae.di.module
 
-import com.zzang.chongdae.auth.api.AuthApiService
 import com.zzang.chongdae.auth.repository.AuthRepository
 import com.zzang.chongdae.auth.repository.AuthRepositoryImpl
 import com.zzang.chongdae.auth.source.AuthRemoteDataSource
 import com.zzang.chongdae.auth.source.AuthRemoteDataSourceImpl
-import com.zzang.chongdae.data.remote.api.NetworkManager
-import com.zzang.chongdae.di.annotations.AuthApiServiceQualifier
 import com.zzang.chongdae.di.annotations.AuthDataSourceQualifier
 import com.zzang.chongdae.di.annotations.AuthRepositoryQualifier
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
@@ -28,13 +24,4 @@ abstract class AuthDependencyModule {
     @Singleton
     @AuthDataSourceQualifier
     abstract fun provideAuthDataSource(impl: AuthRemoteDataSourceImpl): AuthRemoteDataSource
-
-    companion object {
-        @Provides
-        @Singleton
-        @AuthApiServiceQualifier
-        fun provideAuthApiService(): AuthApiService {
-            return NetworkManager.authService()
-        }
-    }
 }

android/app/src/main/java/com/zzang/chongdae/di/module/CommentDetailDependencyModule.kt

@@ -1,17 +1,13 @@
 package com.zzang.chongdae.di.module
 
-import com.zzang.chongdae.data.remote.api.CommentApiService
-import com.zzang.chongdae.data.remote.api.NetworkManager
 import com.zzang.chongdae.data.remote.source.CommentRemoteDataSourceImpl
 import com.zzang.chongdae.data.repository.CommentDetailRepositoryImpl
 import com.zzang.chongdae.data.source.comment.CommentRemoteDataSource
-import com.zzang.chongdae.di.annotations.CommentDetailApiServiceQualifier
 import com.zzang.chongdae.di.annotations.CommentDetailDataSourceQualifier
 import com.zzang.chongdae.di.annotations.CommentDetailRepositoryQualifier
 import com.zzang.chongdae.domain.repository.CommentDetailRepository
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
@@ -28,13 +24,4 @@ abstract class CommentDetailDependencyModule {
     @Singleton
     @CommentDetailDataSourceQualifier
     abstract fun provideCommentDetailDataSource(impl: CommentRemoteDataSourceImpl): CommentRemoteDataSource
-
-    companion object {
-        @Provides
-        @Singleton
-        @CommentDetailApiServiceQualifier
-        fun provideCommentDetailApiService(): CommentApiService {
-            return NetworkManager.commentService()
-        }
-    }
 }

android/app/src/main/java/com/zzang/chongdae/di/module/CommentRoomsDependencyModule.kt

@@ -1,17 +1,13 @@
 package com.zzang.chongdae.di.module
 
-import com.zzang.chongdae.data.remote.api.CommentApiService
-import com.zzang.chongdae.data.remote.api.NetworkManager
 import com.zzang.chongdae.data.remote.source.CommentRoomsDataSourceImpl
 import com.zzang.chongdae.data.repository.CommentRoomsRepositoryImpl
 import com.zzang.chongdae.data.source.CommentRoomsDataSource
-import com.zzang.chongdae.di.annotations.CommentRoomsApiServiceQualifier
 import com.zzang.chongdae.di.annotations.CommentRoomsDataSourceQualifier
 import com.zzang.chongdae.di.annotations.CommentRoomsRepositoryQualifier
 import com.zzang.chongdae.domain.repository.CommentRoomsRepository
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
@@ -28,13 +24,4 @@ abstract class CommentRoomsDependencyModule {
     @Singleton
     @CommentRoomsDataSourceQualifier
     abstract fun provideCommentRoomsDataSource(impl: CommentRoomsDataSourceImpl): CommentRoomsDataSource
-
-    companion object {
-        @Provides
-        @Singleton
-        @CommentRoomsApiServiceQualifier
-        fun provideCommentRoomsService(): CommentApiService {
-            return NetworkManager.commentService()
-        }
-    }
 }