Skip to content

Commit 3a7a767

Browse files
committed
[refactor] #344 LoginService V2 명칭 변경
* 리팩토링 완료로 인해 V2 -> V1으로 변경
1 parent 5c31c0e commit 3a7a767

6 files changed

Lines changed: 27 additions & 27 deletions

File tree

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package com.runnect.runnect.data.service
22

3-
import com.runnect.runnect.data.dto.response.ResponseGetRefreshToken
4-
import retrofit2.http.*
3+
import com.runnect.runnect.data.dto.request.RequestPostLogin
4+
import com.runnect.runnect.data.dto.response.ResponsePostLogin
5+
import retrofit2.http.Body
6+
import retrofit2.http.POST
57

68
interface LoginService {
79

8-
//토큰 재발급
9-
@GET("/api/auth/getNewToken")
10-
suspend fun getNewToken(): ResponseGetRefreshToken
10+
//로그인
11+
@POST("/api/auth")
12+
suspend fun postLogin(
13+
@Body request: RequestPostLogin
14+
): Result<ResponsePostLogin>
1115
}

app/src/main/java/com/runnect/runnect/data/service/TokenAuthenticator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TokenAuthenticator(val context: Context) : Authenticator {
4949

5050
private suspend fun callRefreshTokenApi(): Boolean {
5151
runCatching {
52-
createRefreshService()!!.create(LoginService::class.java).getNewToken()
52+
createRefreshService()!!.create(TokenService::class.java).getNewToken()
5353
}.onSuccess {
5454
Timber.tag("test").d("callRefresh-onSuccess")
5555
PreferenceManager.setString(context, TOKEN_KEY_ACCESS, it.data.accessToken)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.runnect.runnect.data.service
2+
3+
import com.runnect.runnect.data.dto.response.ResponseGetRefreshToken
4+
import retrofit2.http.*
5+
6+
interface TokenService {
7+
8+
//토큰 재발급
9+
@GET("/api/auth/getNewToken")
10+
suspend fun getNewToken(): ResponseGetRefreshToken
11+
}

app/src/main/java/com/runnect/runnect/data/service/v2/LoginV2Service.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

app/src/main/java/com/runnect/runnect/data/source/remote/RemoteLoginDataSource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package com.runnect.runnect.data.source.remote
22

33
import com.runnect.runnect.data.dto.request.RequestPostLogin
44
import com.runnect.runnect.data.dto.response.ResponsePostLogin
5-
import com.runnect.runnect.data.service.v2.LoginV2Service
5+
import com.runnect.runnect.data.service.LoginService
66
import javax.inject.Inject
77

88
class RemoteLoginDataSource @Inject constructor(
9-
private val loginV2Service: LoginV2Service
9+
private val loginService: LoginService
1010
) {
1111
suspend fun postLogin(
1212
requestPostLogin: RequestPostLogin
13-
): Result<ResponsePostLogin> = loginV2Service.postLogin(requestPostLogin)
13+
): Result<ResponsePostLogin> = loginService.postLogin(requestPostLogin)
1414
}

app/src/main/java/com/runnect/runnect/di/ServiceModule.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.google.firebase.firestore.ktx.firestore
44
import com.google.firebase.ktx.Firebase
55
import com.runnect.runnect.data.repository.*
66
import com.runnect.runnect.data.service.*
7-
import com.runnect.runnect.data.service.v2.LoginV2Service
7+
import com.runnect.runnect.data.service.LoginService
88
import com.runnect.runnect.data.service.UserService
99
import com.runnect.runnect.data.source.remote.*
1010
import com.runnect.runnect.domain.*
@@ -28,7 +28,7 @@ object ServiceModule {
2828
@Singleton
2929
@Provides
3030
fun providePLoginV2Service(@RetrofitModule.RetrofitV2 retrofitV2: Retrofit) =
31-
retrofitV2.create(LoginV2Service::class.java)
31+
retrofitV2.create(LoginService::class.java)
3232

3333
@Singleton
3434
@Provides
@@ -39,7 +39,7 @@ object ServiceModule {
3939
@Singleton
4040
@Provides
4141
fun provideLoginService(@RetrofitModule.Runnect runnectRetrofit: Retrofit) =
42-
runnectRetrofit.create(LoginService::class.java)
42+
runnectRetrofit.create(TokenService::class.java)
4343

4444
@Singleton
4545
@Provides

0 commit comments

Comments
 (0)