fix(auth): 미사용 인증 의존성과 경로를 제거한다

This commit is contained in:
2026-10-13 18:35:21 +09:00
parent fef491ea93
commit 8830f364f5
7 changed files with 24 additions and 119 deletions
@@ -15,8 +15,6 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
import kr.co.vividnext.sodalive.common.Utils import kr.co.vividnext.sodalive.common.Utils
import kr.co.vividnext.sodalive.extensions.moneyFormat import kr.co.vividnext.sodalive.extensions.moneyFormat
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
import kr.co.vividnext.sodalive.report.ReportRepository import kr.co.vividnext.sodalive.report.ReportRepository
import kr.co.vividnext.sodalive.report.ReportRequest import kr.co.vividnext.sodalive.report.ReportRequest
import kr.co.vividnext.sodalive.report.ReportType import kr.co.vividnext.sodalive.report.ReportType
@@ -25,7 +23,6 @@ import kr.co.vividnext.sodalive.user.UserRepository
class AudioContentDetailViewModel( class AudioContentDetailViewModel(
private val repository: AudioContentRepository, private val repository: AudioContentRepository,
private val userRepository: UserRepository, private val userRepository: UserRepository,
private val authRepository: AuthRepository,
private val reportRepository: ReportRepository, private val reportRepository: ReportRepository,
private val commentRepository: AudioContentCommentRepository private val commentRepository: AudioContentCommentRepository
) : BaseViewModel() { ) : BaseViewModel() {
@@ -196,40 +193,6 @@ class AudioContentDetailViewModel(
) )
} }
fun authVerify(audioContentId: Long, request: AuthVerifyRequest) {
if (!isLoading.value!!) {
isLoading.value = true
}
compositeDisposable.add(
authRepository.verify(request, "Bearer ${SharedPreferenceManager.token}")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
if (it.success) {
getAudioContentDetail(audioContentId)
} else {
if (it.message != null) {
_toastLiveData.postValue(it.message)
} else {
_toastLiveData.postValue(
getString(R.string.common_error_unknown)
)
}
isLoading.value = false
}
},
{
isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData.postValue(getString(R.string.common_error_unknown))
}
)
)
}
fun registerComment(audioContentId: Long, comment: String, isSecret: Boolean) { fun registerComment(audioContentId: Long, comment: String, isSecret: Boolean) {
if (!isLoading.value!!) { if (!isLoading.value!!) {
isLoading.value = true isLoading.value = true
@@ -131,8 +131,6 @@ import kr.co.vividnext.sodalive.mypage.MyPageViewModel
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListApi import kr.co.vividnext.sodalive.mypage.alarm.AlarmListApi
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListRepository import kr.co.vividnext.sodalive.mypage.alarm.AlarmListRepository
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListViewModel import kr.co.vividnext.sodalive.mypage.alarm.AlarmListViewModel
import kr.co.vividnext.sodalive.mypage.auth.AuthApi
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
import kr.co.vividnext.sodalive.mypage.block.BlockMemberViewModel import kr.co.vividnext.sodalive.mypage.block.BlockMemberViewModel
import kr.co.vividnext.sodalive.mypage.can.CanApi import kr.co.vividnext.sodalive.mypage.can.CanApi
import kr.co.vividnext.sodalive.mypage.can.CanRepository import kr.co.vividnext.sodalive.mypage.can.CanRepository
@@ -329,7 +327,6 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
single { ApiBuilder().build(get(), AlarmListApi::class.java) } single { ApiBuilder().build(get(), AlarmListApi::class.java) }
single { ApiBuilder().build(get(), CanApi::class.java) } single { ApiBuilder().build(get(), CanApi::class.java) }
single { ApiBuilder().build(get(), CanTempApi::class.java) } single { ApiBuilder().build(get(), CanTempApi::class.java) }
single { ApiBuilder().build(get(), AuthApi::class.java) }
single { ApiBuilder().build(get(), UserApi::class.java) } single { ApiBuilder().build(get(), UserApi::class.java) }
single { ApiBuilder().build(get(), UserEventApi::class.java) } single { ApiBuilder().build(get(), UserEventApi::class.java) }
single { ApiBuilder().build(get(), MenuApi::class.java) } single { ApiBuilder().build(get(), MenuApi::class.java) }
@@ -390,7 +387,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
viewModel { MainViewModel(get(), get(), get(), get(), get()) } viewModel { MainViewModel(get(), get(), get(), get(), get()) }
viewModel { MainV2ViewModel(get(), get(), get(), get(), get()) } viewModel { MainV2ViewModel(get(), get(), get(), get(), get()) }
viewModel { LiveViewModel(get(), get(), get(), get(), get()) } viewModel { LiveViewModel(get(), get(), get(), get(), get()) }
viewModel { MyPageViewModel(get(), get(), get()) } viewModel { MyPageViewModel(get(), get()) }
viewModel { CanStatusViewModel(get()) } viewModel { CanStatusViewModel(get()) }
viewModel { CanChargePgViewModel(get()) } viewModel { CanChargePgViewModel(get()) }
viewModel { CanPaymentViewModel(get()) } viewModel { CanPaymentViewModel(get()) }
@@ -436,7 +433,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
viewModel { AudioContentUploadViewModel(get()) } viewModel { AudioContentUploadViewModel(get()) }
viewModel { AudioContentModifyViewModel(get()) } viewModel { AudioContentModifyViewModel(get()) }
viewModel { AudioContentThemeViewModel(get()) } viewModel { AudioContentThemeViewModel(get()) }
viewModel { AudioContentDetailViewModel(get(), get(), get(), get(), get()) } viewModel { AudioContentDetailViewModel(get(), get(), get(), get()) }
viewModel { AudioContentCommentListViewModel(get()) } viewModel { AudioContentCommentListViewModel(get()) }
viewModel { AudioContentCommentReplyViewModel(get()) } viewModel { AudioContentCommentReplyViewModel(get()) }
viewModel { FollowingCreatorViewModel(get(), get()) } viewModel { FollowingCreatorViewModel(get(), get()) }
@@ -521,7 +518,6 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
factory { V2vRepository(get()) } factory { V2vRepository(get()) }
factory { EventRepository(get()) } factory { EventRepository(get()) }
factory { LiveRecommendRepository(get()) } factory { LiveRecommendRepository(get()) }
factory { AuthRepository(get()) }
factory { CanRepository(get()) } factory { CanRepository(get()) }
factory { CanPaymentTempRepository(get()) } factory { CanPaymentTempRepository(get()) }
factory { LiveTagRepository(get()) } factory { LiveTagRepository(get()) }
@@ -9,16 +9,12 @@ import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.base.BaseViewModel import kr.co.vividnext.sodalive.base.BaseViewModel
import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.ToastMessage import kr.co.vividnext.sodalive.common.ToastMessage
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
import kr.co.vividnext.sodalive.settings.ContentType
import kr.co.vividnext.sodalive.settings.notice.NoticeItem import kr.co.vividnext.sodalive.settings.notice.NoticeItem
import kr.co.vividnext.sodalive.settings.notice.NoticeRepository import kr.co.vividnext.sodalive.settings.notice.NoticeRepository
import kr.co.vividnext.sodalive.user.UserRepository import kr.co.vividnext.sodalive.user.UserRepository
class MyPageViewModel( class MyPageViewModel(
private val userRepository: UserRepository, private val userRepository: UserRepository,
private val authRepository: AuthRepository,
private val noticeRepository: NoticeRepository private val noticeRepository: NoticeRepository
) : BaseViewModel() { ) : BaseViewModel() {
private val _toastLiveData = MutableLiveData<ToastMessage?>() private val _toastLiveData = MutableLiveData<ToastMessage?>()
@@ -72,48 +68,6 @@ class MyPageViewModel(
) )
} }
fun authVerify(request: AuthVerifyRequest, onSuccess: () -> Unit) {
if (!_isLoading.value!!) {
_isLoading.value = true
}
compositeDisposable.add(
authRepository.verify(request, "Bearer ${SharedPreferenceManager.token}")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
if (it.success && it.data != null) {
SharedPreferenceManager.contentPreference = if (it.data.gender == 0) {
ContentType.FEMALE.ordinal
} else {
ContentType.MALE.ordinal
}
onSuccess()
} else {
_toastLiveData.postValue(
if (it.message != null) {
ToastMessage(message = it.message)
} else {
ToastMessage(resId = R.string.common_error_unknown)
}
)
_isLoading.value = false
}
},
{
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData.postValue(
ToastMessage(resId = R.string.common_error_unknown)
)
}
)
)
}
fun getLatestNotice() { fun getLatestNotice() {
compositeDisposable.add( compositeDisposable.add(
noticeRepository.getLatestNotice() noticeRepository.getLatestNotice()
@@ -1,15 +0,0 @@
package kr.co.vividnext.sodalive.mypage.auth
import io.reactivex.rxjava3.core.Single
import kr.co.vividnext.sodalive.common.ApiResponse
import retrofit2.http.Body
import retrofit2.http.Header
import retrofit2.http.POST
interface AuthApi {
@POST("/auth")
fun verify(
@Body request: AuthVerifyRequest,
@Header("Authorization") authHeader: String
): Single<ApiResponse<AuthResponse>>
}
@@ -1,5 +0,0 @@
package kr.co.vividnext.sodalive.mypage.auth
class AuthRepository(private val api: AuthApi) {
fun verify(request: AuthVerifyRequest, token: String) = api.verify(request, token)
}
@@ -1,10 +0,0 @@
package kr.co.vividnext.sodalive.mypage.auth
import androidx.annotation.Keep
import com.google.gson.annotations.SerializedName
@Keep
data class AuthVerifyRequest(
@SerializedName("receipt_id")
val receiptId: String
)
@@ -78,6 +78,28 @@ class MainV2LoginGuardSourceTest {
} }
} }
@Test
fun `마이 페이지와 오디오 상세 생성 경로는 미사용 인증 의존성을 갖지 않는다`() {
val legacyAuth = Regex("\\b(AuthApi|AuthRepository|AuthVerifyRequest|authVerify)\\b")
listOf(
"mypage/MyPageViewModel.kt",
"audio_content/detail/AudioContentDetailViewModel.kt",
"di/AppDI.kt"
).forEach { path ->
val source = projectFile("app/src/main/java/kr/co/vividnext/sodalive/$path").readText()
assertFalse(path, legacyAuth.containsMatchIn(source))
}
}
@Test
fun `미사용 인증 전용 파일은 제거하고 공용 응답은 유지한다`() {
val authDirectory = projectFile("app/src/main/java/kr/co/vividnext/sodalive/mypage/auth")
listOf("AuthApi.kt", "AuthRepository.kt", "AuthVerifyRequest.kt").forEach { name ->
assertFalse(name, File(authDirectory, name).exists())
}
assertTrue(File(authDirectory, "AuthResponse.kt").isFile)
}
private fun projectFile(relativePath: String): File { private fun projectFile(relativePath: String): File {
val candidates = listOf(File(relativePath), File("../$relativePath")) val candidates = listOf(File(relativePath), File("../$relativePath"))
return candidates.firstOrNull { it.exists() } return candidates.firstOrNull { it.exists() }