Skip to content

Commit 711ee4d

Browse files
committed
[BOOK-78] refactor: RetrofitQualifier 및 Service interface 네이밍 변경
Authorizaion 헤더가 필요없는 API 가 추가 예정이기 때문에, 헤더의 필요 유무로 Service interface 를 구분
1 parent 328ae25 commit 711ee4d

File tree

5 files changed

+31
-32
lines changed

5 files changed

+31
-32
lines changed

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import com.ninecraft.booket.core.data.api.repository.AuthRepository
55
import com.ninecraft.booket.core.data.impl.mapper.toModel
66
import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
77
import com.ninecraft.booket.core.network.request.LoginRequest
8-
import com.ninecraft.booket.core.network.service.BooketService
9-
import com.ninecraft.booket.core.network.service.LoginService
8+
import com.ninecraft.booket.core.network.service.AuthService
9+
import com.ninecraft.booket.core.network.service.NoAuthService
1010
import javax.inject.Inject
1111

1212
private const val KAKAO_PROVIDER_TYPE = "KAKAO"
1313

1414
internal class DefaultAuthRepository @Inject constructor(
15-
private val loginService: LoginService,
16-
private val booketService: BooketService,
15+
private val noAuthService: NoAuthService,
16+
private val authService: AuthService,
1717
private val tokenDatasource: TokenPreferencesDataSource,
1818
) : AuthRepository {
1919
override suspend fun login(accessToken: String) = runSuspendCatching {
20-
loginService.login(
20+
noAuthService.login(
2121
LoginRequest(
2222
providerType = KAKAO_PROVIDER_TYPE,
2323
oauthToken = accessToken,
@@ -26,7 +26,7 @@ internal class DefaultAuthRepository @Inject constructor(
2626
}
2727

2828
override suspend fun logout() = runSuspendCatching {
29-
booketService.logout()
29+
authService.logout()
3030
}
3131

3232
override suspend fun saveTokens(accessToken: String, refreshToken: String) {

core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/NetworkModule.kt

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ninecraft.booket.core.network.di
22

33
import android.util.Log
4-
import com.orhanobut.logger.Logger
54
import dagger.Module
65
import dagger.Provides
76
import dagger.hilt.InstallIn
@@ -14,8 +13,8 @@ import retrofit2.Retrofit
1413
import retrofit2.converter.kotlinx.serialization.asConverterFactory
1514
import com.ninecraft.booket.core.network.BuildConfig
1615
import com.ninecraft.booket.core.network.TokenInterceptor
17-
import com.ninecraft.booket.core.network.service.BooketService
18-
import com.ninecraft.booket.core.network.service.LoginService
16+
import com.ninecraft.booket.core.network.service.AuthService
17+
import com.ninecraft.booket.core.network.service.NoAuthService
1918
import com.orhanobut.logger.AndroidLogAdapter
2019
import com.orhanobut.logger.PrettyFormatStrategy
2120
import retrofit2.create
@@ -53,7 +52,7 @@ internal object NetworkModule {
5352
@Singleton
5453
@Provides
5554
internal fun provideHttpLoggingInterceptor(
56-
networkLogAdapter: AndroidLogAdapter
55+
networkLogAdapter: AndroidLogAdapter,
5756
): HttpLoggingInterceptor {
5857
return HttpLoggingInterceptor { message ->
5958
if (message.isNotBlank()) {
@@ -68,10 +67,10 @@ internal object NetworkModule {
6867
}
6968
}
7069

71-
@TokenOkHttpClient
70+
@AuthOkHttpClient
7271
@Singleton
7372
@Provides
74-
internal fun provideTokenOkHttpClient(
73+
internal fun provideAuthOkHttpClient(
7574
httpLoggingInterceptor: HttpLoggingInterceptor,
7675
tokenInterceptor: TokenInterceptor,
7776
): OkHttpClient {
@@ -84,10 +83,10 @@ internal object NetworkModule {
8483
.build()
8584
}
8685

87-
@DefaultOkHttpClient
86+
@NoAuthOkHttpClient
8887
@Singleton
8988
@Provides
90-
internal fun provideDefaultOkHttpClient(
89+
internal fun provideNoAuthOkHttpClient(
9190
httpLoggingInterceptor: HttpLoggingInterceptor,
9291
): OkHttpClient {
9392
return OkHttpClient.Builder()
@@ -98,11 +97,11 @@ internal object NetworkModule {
9897
.build()
9998
}
10099

101-
@TokenRetrofit
100+
@AuthRetrofit
102101
@Singleton
103102
@Provides
104-
internal fun provideTokenRetrofit(
105-
@TokenOkHttpClient okHttpClient: OkHttpClient,
103+
internal fun provideAuthRetrofit(
104+
@AuthOkHttpClient okHttpClient: OkHttpClient,
106105
): Retrofit {
107106
return Retrofit.Builder()
108107
.baseUrl(BuildConfig.SERVER_BASE_URL)
@@ -111,11 +110,11 @@ internal object NetworkModule {
111110
.build()
112111
}
113112

114-
@DefaultRetrofit
113+
@NoAuthRetrofit
115114
@Singleton
116115
@Provides
117-
internal fun provideDefaultRetrofit(
118-
@DefaultOkHttpClient okHttpClient: OkHttpClient,
116+
internal fun provideNoAuthRetrofit(
117+
@NoAuthOkHttpClient okHttpClient: OkHttpClient,
119118
): Retrofit {
120119
return Retrofit.Builder()
121120
.baseUrl(BuildConfig.SERVER_BASE_URL)
@@ -126,17 +125,17 @@ internal object NetworkModule {
126125

127126
@Singleton
128127
@Provides
129-
internal fun provideBooketService(
130-
@TokenRetrofit retrofit: Retrofit,
131-
): BooketService {
128+
internal fun provideAuthService(
129+
@AuthRetrofit retrofit: Retrofit,
130+
): AuthService {
132131
return retrofit.create()
133132
}
134133

135134
@Singleton
136135
@Provides
137-
internal fun provideLoginService(
138-
@DefaultRetrofit retrofit: Retrofit,
139-
): LoginService {
136+
internal fun provideNoAuthService(
137+
@NoAuthRetrofit retrofit: Retrofit,
138+
): NoAuthService {
140139
return retrofit.create()
141140
}
142141
}

core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/RetrofitQualifier.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import javax.inject.Qualifier
44

55
@Qualifier
66
@Retention(AnnotationRetention.BINARY)
7-
annotation class TokenOkHttpClient
7+
annotation class AuthOkHttpClient
88

99
@Qualifier
1010
@Retention(AnnotationRetention.BINARY)
11-
annotation class DefaultOkHttpClient
11+
annotation class NoAuthOkHttpClient
1212

1313
@Qualifier
1414
@Retention(AnnotationRetention.BINARY)
15-
annotation class TokenRetrofit
15+
annotation class AuthRetrofit
1616

1717
@Qualifier
1818
@Retention(AnnotationRetention.BINARY)
19-
annotation class DefaultRetrofit
19+
annotation class NoAuthRetrofit

core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/BooketService.kt renamed to core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/AuthService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.ninecraft.booket.core.network.service
22

33
import retrofit2.http.POST
44

5-
interface BooketService {
5+
interface AuthService {
66
@POST("api/v1/auth/signout")
77
suspend fun logout()
88
}

core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/LoginService.kt renamed to core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/NoAuthService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.ninecraft.booket.core.network.response.LoginResponse
55
import retrofit2.http.Body
66
import retrofit2.http.POST
77

8-
interface LoginService {
8+
interface NoAuthService {
99
@POST("api/v1/auth/signin")
1010
suspend fun login(@Body loginRequest: LoginRequest): LoginResponse
1111
}

0 commit comments

Comments
 (0)