refactor/#67: 인증 관련된 Repository, API, UseCase 수정

jinukeu · jinukeu · commit 6e2612a50d17 · 2025-03-05T23:05:55.000+09:00
인증 관련 클래스들을 리팩토링하여,
인증 여부에 따라 분리되어있던 API와 Repository를 통합했습니다.
관련 UseCase의 의존성도 수정했습니다.
diff --git a/core/data-api/src/main/java/com/yapp/dataapi/AuthRepository.kt b/core/data-api/src/main/java/com/yapp/dataapi/AuthRepository.kt
@@ -3,8 +3,15 @@ package com.yapp.dataapi
 import com.yapp.model.SignUpInfo
 import com.yapp.model.SignUpResult
 
-interface UnAuthorizedUserRepository {
+interface AuthRepository {
     suspend fun signUp(
         request: SignUpInfo,
     ): SignUpResult
+
+    suspend fun clearTokens()
+
+    suspend fun login(
+        email : String,
+        password : String
+    )
 }
diff --git a/core/data-api/src/main/java/com/yapp/dataapi/LoginRepository.kt b/core/data-api/src/main/java/com/yapp/dataapi/LoginRepository.kt
diff --git a/core/data-api/src/main/java/com/yapp/dataapi/UserRepository.kt b/core/data-api/src/main/java/com/yapp/dataapi/UserRepository.kt
@@ -2,8 +2,7 @@ package com.yapp.dataapi
 
 import com.yapp.model.UserInfo
 
-interface AuthorizedUserRepository {
-    suspend fun clearTokens()
+interface UserRepository {
     suspend fun deleteAccount()
     suspend fun getUserProfile(): UserInfo
 }
diff --git a/core/data/src/main/java/com/yapp/core/data/data/di/RepositoryModule.kt b/core/data/src/main/java/com/yapp/core/data/data/di/RepositoryModule.kt
@@ -1,15 +1,13 @@
 package com.yapp.core.data.data.di
 
 import com.yapp.core.data.data.repository.AlarmRepositoryImpl
-import com.yapp.core.data.data.repository.AuthorizedUserRepositoryImpl
+import com.yapp.core.data.data.repository.UserRepositoryImpl
 import com.yapp.core.data.data.repository.ConfigRepositoryImpl
-import com.yapp.core.data.data.repository.LoginRepositoryImpl
-import com.yapp.core.data.data.repository.UnAuthorizedUserRepositoryImpl
+import com.yapp.core.data.data.repository.AuthRepositoryImpl
 import com.yapp.dataapi.AlarmRepository
-import com.yapp.dataapi.AuthorizedUserRepository
+import com.yapp.dataapi.UserRepository
 import com.yapp.dataapi.ConfigRepository
-import com.yapp.dataapi.LoginRepository
-import com.yapp.dataapi.UnAuthorizedUserRepository
+import com.yapp.dataapi.AuthRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -20,25 +18,20 @@ import dagger.hilt.components.SingletonComponent
 internal abstract class RepositoryModule {
 
     @Binds
-    abstract fun bindUnAuthorizedUserRepositoryImpl(
-        repositoryImpl: UnAuthorizedUserRepositoryImpl,
-    ): UnAuthorizedUserRepository
+    abstract fun bindAuthRepositoryImpl(
+        repositoryImpl: AuthRepositoryImpl,
+    ): AuthRepository
 
     @Binds
-    abstract fun bindAuthorizedUserRepositoryImpl(
-        repositoryImpl: AuthorizedUserRepositoryImpl,
-    ): AuthorizedUserRepository
+    abstract fun bindUserRepositoryImpl(
+        repositoryImpl: UserRepositoryImpl,
+    ): UserRepository
 
     @Binds
     abstract fun bindConfigRepositoryImpl(
         repositoryImpl: ConfigRepositoryImpl,
     ): ConfigRepository
 
-    @Binds
-    abstract fun bindLoginRepositoryImpl(
-        repositoryImpl: LoginRepositoryImpl,
-    ): LoginRepository
-
     @Binds
     abstract fun bindAlarmRepositoryImpl(
         repositoryImpl: AlarmRepositoryImpl,
diff --git a/core/data/src/main/java/com/yapp/core/data/data/repository/AuthRepositoryImpl.kt b/core/data/src/main/java/com/yapp/core/data/data/repository/AuthRepositoryImpl.kt
@@ -7,10 +7,13 @@ import androidx.datastore.core.DataStore
 import com.google.firebase.messaging.FirebaseMessaging
 import com.yapp.core.data.PositionConfigs
 import com.yapp.core.data.local.SecurityPreferences
-import com.yapp.core.data.remote.api.UnAuthorizedUserApi
+import com.yapp.core.data.remote.api.AlarmApi
+import com.yapp.core.data.remote.api.AuthApi
+import com.yapp.core.data.remote.model.request.FcmTokenRequest
+import com.yapp.core.data.remote.model.request.LoginRequest
 import com.yapp.core.data.remote.model.request.toData
 import com.yapp.core.data.remote.model.response.toModel
-import com.yapp.dataapi.UnAuthorizedUserRepository
+import com.yapp.dataapi.AuthRepository
 import com.yapp.model.SignUpInfo
 import com.yapp.model.SignUpResult
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -19,12 +22,13 @@ import kotlinx.coroutines.tasks.await
 import javax.inject.Inject
 import kotlin.jvm.optionals.getOrNull
 
-internal class UnAuthorizedUserRepositoryImpl @Inject constructor(
+internal class AuthRepositoryImpl @Inject constructor(
     @ApplicationContext private val context: Context,
-    private val api: UnAuthorizedUserApi,
+    private val authApi: AuthApi,
+    private val alarmApi: AlarmApi,
     private val securityPreferences: SecurityPreferences,
     private val dataStore: DataStore<PositionConfigs>,
-): UnAuthorizedUserRepository {
+) : AuthRepository {
 
     override suspend fun signUp(request: SignUpInfo): SignUpResult {
         val positionConfigs = dataStore.data.firstOrNull() ?: PositionConfigs.getDefaultInstance()
@@ -37,7 +41,7 @@ internal class UnAuthorizedUserRepositoryImpl @Inject constructor(
             true // Android 12 이하에서는 자동 허용
         }
 
-        val response = api.signUp(
+        val response = authApi.signUp(
             request.toData(
                 positionConfigs = positionConfigs,
                 fcmToken = fcmToken,
@@ -52,4 +56,20 @@ internal class UnAuthorizedUserRepositoryImpl @Inject constructor(
 
         return response.toModel()
     }
+
+    override suspend fun login(email: String, password: String) {
+        val response = authApi.login(LoginRequest(email = email, password = password))
+        securityPreferences.setAccessToken(response.accessToken)
+        securityPreferences.setRefreshToken(response.refreshToken)
+        val fcmToken = FirebaseMessaging.getInstance().token.await()
+        alarmApi.putFcmToken(
+            FcmTokenRequest(
+                fcmToken = fcmToken
+            )
+        )
+    }
+
+    override suspend fun clearTokens() {
+        securityPreferences.clearAll()
+    }
 }
diff --git a/core/data/src/main/java/com/yapp/core/data/data/repository/AuthorizedUserRepositoryImpl.kt b/core/data/src/main/java/com/yapp/core/data/data/repository/AuthorizedUserRepositoryImpl.kt
diff --git a/core/data/src/main/java/com/yapp/core/data/data/repository/LoginRepositoryImpl.kt b/core/data/src/main/java/com/yapp/core/data/data/repository/LoginRepositoryImpl.kt
diff --git a/core/data/src/main/java/com/yapp/core/data/data/repository/UserRepositoryImpl.kt b/core/data/src/main/java/com/yapp/core/data/data/repository/UserRepositoryImpl.kt
@@ -0,0 +1,20 @@
+package com.yapp.core.data.data.repository
+
+import com.yapp.core.data.local.SecurityPreferences
+import com.yapp.core.data.remote.api.UserApi
+import com.yapp.dataapi.UserRepository
+import com.yapp.model.UserInfo
+import javax.inject.Inject
+
+internal class UserRepositoryImpl @Inject constructor(
+    private val userApi: UserApi,
+    private val securityPreferences: SecurityPreferences,
+): UserRepository {
+
+    override suspend fun deleteAccount() {
+        userApi.deleteUser()
+        securityPreferences.clearAll()
+    }
+
+    override suspend fun getUserProfile(): UserInfo = userApi.getUserProfile().toModel()
+}
diff --git a/core/data/src/main/java/com/yapp/core/data/remote/api/AuthApi.kt b/core/data/src/main/java/com/yapp/core/data/remote/api/AuthApi.kt
@@ -8,7 +8,7 @@ import retrofit2.http.Body
 import retrofit2.http.POST
 import java.util.Optional
 
-internal interface UnAuthorizedUserApi {
+internal interface AuthApi {
     @POST("v1/auth/sign-up")
     suspend fun signUp(
         @Body request: SignUpRequest,
diff --git a/core/data/src/main/java/com/yapp/core/data/remote/api/UserApi.kt b/core/data/src/main/java/com/yapp/core/data/remote/api/UserApi.kt
@@ -4,7 +4,7 @@ import com.yapp.core.data.remote.model.response.UserProfileResponse
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 
-interface AuthorizedUserApi {
+interface UserApi {
     @GET("v1/users/profile")
     suspend fun getUserProfile() : UserProfileResponse
 
diff --git a/core/data/src/main/java/com/yapp/core/data/remote/di/ApiModule.kt b/core/data/src/main/java/com/yapp/core/data/remote/di/ApiModule.kt
@@ -2,8 +2,8 @@ package com.yapp.core.data.remote.di
 
 import com.yapp.core.data.remote.api.AlarmApi
 import com.yapp.core.data.remote.api.ConfigApi
-import com.yapp.core.data.remote.api.UnAuthorizedUserApi
-import com.yapp.core.data.remote.api.AuthorizedUserApi
+import com.yapp.core.data.remote.api.AuthApi
+import com.yapp.core.data.remote.api.UserApi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -17,8 +17,8 @@ internal object ApiModule {
 
     @Singleton
     @Provides
-    fun provideUnAuthorizedUserApi(retrofit: Retrofit): UnAuthorizedUserApi {
-        return retrofit.create(UnAuthorizedUserApi::class.java)
+    fun provideUnAuthApi(retrofit: Retrofit): AuthApi {
+        return retrofit.create(AuthApi::class.java)
     }
 
     @Singleton
@@ -35,7 +35,7 @@ internal object ApiModule {
 
     @Singleton
     @Provides
-    fun provideAuthorizedApi(@AuthRetrofit retrofit: Retrofit): AuthorizedUserApi {
-        return retrofit.create(AuthorizedUserApi::class.java)
+    fun provideUserApi(@AuthRetrofit retrofit: Retrofit): UserApi {
+        return retrofit.create(UserApi::class.java)
     }
 }
diff --git a/core/domain/src/main/java/com/yapp/domain/DeleteAccountUseCase.kt b/core/domain/src/main/java/com/yapp/domain/DeleteAccountUseCase.kt
@@ -1,13 +1,12 @@
 package com.yapp.domain
 
-import com.yapp.dataapi.AuthorizedUserRepository
+import com.yapp.dataapi.UserRepository
 import javax.inject.Inject
 
 class DeleteAccountUseCase @Inject constructor(
-    private val authorizedUserRepository: AuthorizedUserRepository,
+    private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke() = runCatchingIgnoreCancelled {
-        authorizedUserRepository.deleteAccount()
-        authorizedUserRepository.clearTokens()
+        userRepository.deleteAccount()
     }
 }
diff --git a/core/domain/src/main/java/com/yapp/domain/GetUserProfileUseCase.kt b/core/domain/src/main/java/com/yapp/domain/GetUserProfileUseCase.kt
@@ -1,13 +1,13 @@
 package com.yapp.domain
 
-import com.yapp.dataapi.AuthorizedUserRepository
+import com.yapp.dataapi.UserRepository
 import javax.inject.Inject
 
 class GetUserProfileUseCase @Inject constructor(
-    private val authorizedUserRepository: AuthorizedUserRepository,
+    private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke() = runCatchingIgnoreCancelled {
-        authorizedUserRepository.getUserProfile()
+        userRepository.getUserProfile()
     }
 }
 
diff --git a/core/domain/src/main/java/com/yapp/domain/LoginUseCase.kt b/core/domain/src/main/java/com/yapp/domain/LoginUseCase.kt
@@ -1,12 +1,12 @@
 package com.yapp.domain
 
-import com.yapp.dataapi.LoginRepository
+import com.yapp.dataapi.AuthRepository
 import javax.inject.Inject
 
 class LoginUseCase @Inject constructor(
-    private val loginRepository: LoginRepository
+    private val authRepository: AuthRepository,
 ) {
-    suspend operator fun invoke(email : String, password : String) = runCatchingIgnoreCancelled {
-        loginRepository.login(email,password)
+    suspend operator fun invoke(email: String, password: String) = runCatchingIgnoreCancelled {
+        authRepository.login(email = email, password = password)
     }
 }
diff --git a/core/domain/src/main/java/com/yapp/domain/LogoutUseCase.kt b/core/domain/src/main/java/com/yapp/domain/LogoutUseCase.kt
@@ -1,15 +1,15 @@
 package com.yapp.domain
 
 import com.yapp.dataapi.AlarmRepository
-import com.yapp.dataapi.AuthorizedUserRepository
+import com.yapp.dataapi.AuthRepository
 import javax.inject.Inject
 
 class LogoutUseCase @Inject constructor(
-    private val authorizedUserRepository: AuthorizedUserRepository,
     private val alarmRepository: AlarmRepository,
+    private val authRepository: AuthRepository,
 ) {
     suspend operator fun invoke() = runCatchingIgnoreCancelled {
         alarmRepository.updateFcmToken("")
-        authorizedUserRepository.clearTokens()
+        authRepository.clearTokens()
     }
 }
diff --git a/core/domain/src/main/java/com/yapp/domain/SignUpUseCase.kt b/core/domain/src/main/java/com/yapp/domain/SignUpUseCase.kt
@@ -1,13 +1,13 @@
 package com.yapp.domain
 
-import com.yapp.dataapi.UnAuthorizedUserRepository
+import com.yapp.dataapi.AuthRepository
 import com.yapp.model.SignUpInfo
 import javax.inject.Inject
 
 class SignUpUseCase @Inject constructor(
-    private val unAuthorizedUserRepository: UnAuthorizedUserRepository,
+    private val authRepository: AuthRepository,
 ) {
     suspend operator fun invoke(param: SignUpInfo) = runCatchingIgnoreCancelled {
-        unAuthorizedUserRepository.signUp(param)
+        authRepository.signUp(param)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@ package com.yapp.dataapi`
`2`	`2`
`3`	`3`	`import com.yapp.model.UserInfo`
`4`	`4`
`5`		`-interface AuthorizedUserRepository {`
`6`		`- suspend fun clearTokens()`
	`5`	`+interface UserRepository {`
`7`	`6`	`suspend fun deleteAccount()`
`8`	`7`	`suspend fun getUserProfile(): UserInfo`
`9`	`8`	`}`