[FEATURE]#205 : 로그인 바디, 토큰 모델이 아닌 SignIn으로 변경

Author: jeongjaino

data-remote/src/main/kotlin/com/bff/wespot/data/remote/source/auth/AuthDataSource.kt

@@ -1,14 +1,14 @@
 package com.bff.wespot.data.remote.source.auth
 
-import com.bff.wespot.data.remote.model.auth.request.KakaoAuthTokenDto
+import com.bff.wespot.data.remote.model.auth.request.SignInDto
 import com.bff.wespot.data.remote.model.auth.request.SignUpDto
 import com.bff.wespot.data.remote.model.auth.response.AuthTokenDto
 import com.bff.wespot.data.remote.model.auth.response.SchoolListDto
 import com.bff.wespot.model.auth.request.RevokeReasonListDto
 
 interface AuthDataSource {
     suspend fun getSchoolList(search: String, cursorId: Int?): Result<SchoolListDto>
-    suspend fun sendKakaoToken(token: KakaoAuthTokenDto): Result<Any>
+    suspend fun signIn(signIn: SignInDto): Result<Any>
     suspend fun signUp(signUp: SignUpDto): Result<AuthTokenDto>
     suspend fun revoke(revokeReasonList: RevokeReasonListDto): Result<Unit>
 }

data-remote/src/main/kotlin/com/bff/wespot/data/remote/source/auth/AuthDataSourceImpl.kt

@@ -1,7 +1,7 @@
 package com.bff.wespot.data.remote.source.auth
 
 import com.bff.wespot.data.remote.extensions.invalidateBearerTokens
-import com.bff.wespot.data.remote.model.auth.request.KakaoAuthTokenDto
+import com.bff.wespot.data.remote.model.auth.request.SignInDto
 import com.bff.wespot.data.remote.model.auth.request.SignUpDto
 import com.bff.wespot.data.remote.model.auth.response.AuthTokenDto
 import com.bff.wespot.data.remote.model.auth.response.SchoolListDto
@@ -27,13 +27,13 @@ class AuthDataSourceImpl @Inject constructor(
             }
         }
 
-    override suspend fun sendKakaoToken(token: KakaoAuthTokenDto): Result<Any> {
+    override suspend fun signIn(signIn: SignInDto): Result<Any> {
         val client = httpClient.safeRequest<Any> {
             url {
                 method = HttpMethod.Post
                 path("api/v1/auth/login")
             }
-            setBody(token)
+            setBody(signIn)
         }
         httpClient.invalidateBearerTokens()
         return client

data/src/main/kotlin/com/bff/wespot/data/repository/auth/AuthRepositoryImpl.kt

@@ -7,8 +7,8 @@ import com.bff.wespot.data.remote.model.auth.response.SignUpTokenDto
 import com.bff.wespot.data.remote.source.auth.AuthDataSource
 import com.bff.wespot.domain.repository.auth.AuthRepository
 import com.bff.wespot.domain.util.DataStoreKey
-import com.bff.wespot.model.auth.request.KakaoAuthToken
 import com.bff.wespot.model.auth.request.RevokeReasonListDto
+import com.bff.wespot.model.auth.request.SignIn
 import com.bff.wespot.model.auth.request.SignUp
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
@@ -17,9 +17,11 @@ class AuthRepositoryImpl @Inject constructor(
     private val authDataSource: AuthDataSource,
     private val dataStore: WeSpotDataStore
 ) : AuthRepository {
-    override suspend fun sendKakaoToken(token: KakaoAuthToken): Result<Any> =
-        authDataSource
-            .sendKakaoToken(token.toDto(dataStore.getString(DataStoreKey.PUSH_TOKEN).first()))
+    override suspend fun signIn(signIn: SignIn): Result<Any> {
+        val fcmToken = dataStore.getString(DataStoreKey.PUSH_TOKEN).first()
+        val signInDto = signIn.toDto(fcmToken)
+        return authDataSource
+            .signIn(signInDto)
             .mapCatching {
                 when (it) {
                     is AuthTokenDto -> {
@@ -33,6 +35,7 @@ class AuthRepositoryImpl @Inject constructor(
                     else -> throw IllegalArgumentException("Unknown token type")
                 }
             }
+    }
 
     override suspend fun signUp(signUp: SignUp): Boolean {
         val response =  authDataSource

domain/src/main/kotlin/com/bff/wespot/domain/repository/auth/AuthRepository.kt

@@ -1,10 +1,10 @@
 package com.bff.wespot.domain.repository.auth
 
-import com.bff.wespot.model.auth.request.KakaoAuthToken
+import com.bff.wespot.model.auth.request.SignIn
 import com.bff.wespot.model.auth.request.SignUp
 
 interface AuthRepository {
-    suspend fun sendKakaoToken(token: KakaoAuthToken): Result<Any>
+    suspend fun signIn(signIn: SignIn): Result<Any>
     suspend fun signUp(signUp: SignUp): Boolean
     suspend fun revoke(revokeReasonList: List<String>): Result<Unit>
 }

domain/src/main/kotlin/com/bff/wespot/domain/usecase/KakaoLoginUseCase.kt

@@ -4,7 +4,7 @@ import com.bff.wespot.domain.repository.DataStoreRepository
 import com.bff.wespot.domain.repository.auth.AuthRepository
 import com.bff.wespot.domain.repository.firebase.messaging.MessagingRepository
 import com.bff.wespot.domain.util.DataStoreKey
-import com.bff.wespot.model.auth.request.KakaoAuthToken
+import com.bff.wespot.model.auth.request.SignIn
 import com.bff.wespot.model.auth.response.AuthToken
 import com.bff.wespot.model.auth.response.SignUpToken
 import com.bff.wespot.model.constants.LoginState
@@ -15,11 +15,11 @@ class KakaoLoginUseCase @Inject constructor(
     private val authRepository: AuthRepository,
     private val dataStoreRepository: DataStoreRepository,
 ) {
-    suspend operator fun invoke(result: KakaoAuthToken): Result<LoginState> {
+    suspend operator fun invoke(signIn: SignIn): Result<LoginState> {
         val token = messagingRepository.getFcmToken()
         dataStoreRepository.saveString(DataStoreKey.PUSH_TOKEN, token)
 
-        return authRepository.sendKakaoToken(result)
+        return authRepository.signIn(signIn)
             .map {
                 when (it) {
                     is AuthToken -> {