diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index d1a6e3a9..0b767bae 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -30,7 +30,6 @@ import coil.transform.CircleCropTransformation import coil.transform.RoundedCornersTransformation import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.google.gson.Gson import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService import kr.co.vividnext.sodalive.audio_content.PurchaseOption @@ -52,9 +51,7 @@ import kr.co.vividnext.sodalive.explorer.profile.CreatorFollowNotifyFragment import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.extensions.moneyFormat import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentTempActivity import kr.co.vividnext.sodalive.mypage.recent.RecentContentViewModel @@ -118,6 +115,10 @@ class AudioContentDetailActivity : BaseActivity + viewModel.getAudioContentDetail(audioContentId = audioContentId) + } + imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager if (audioContentId <= 0) { @@ -1056,13 +1057,7 @@ class AudioContentDetailActivity : BaseActivity - val bootpayResponse = Gson().fromJson(data, BootpayResponse::class.java) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - runOnUiThread { - viewModel.authVerify(audioContentId = audioContentId, request = request) - } - } + V2AuthFlow.start(this, syncMemberInfo = true) } } else { binding.alert19Bg.visibility = View.GONE diff --git a/app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabFragment.kt index 874283cf..77e97f04 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabFragment.kt @@ -13,7 +13,6 @@ import androidx.media3.common.util.UnstableApi import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.gson.Gson import com.yandex.mobile.ads.banner.BannerAdSize import com.yandex.mobile.ads.common.AdRequest import com.zhpan.bannerview.BaseBannerAdapter @@ -34,11 +33,8 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.databinding.FragmentCharacterTabBinding import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.main.MainActivity -import kr.co.vividnext.sodalive.mypage.MyPageViewModel -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.settings.ContentSettingsActivity -import kr.co.vividnext.sodalive.splash.SplashActivity import org.koin.android.ext.android.inject import kotlin.math.roundToInt @@ -48,7 +44,6 @@ class CharacterTabFragment : BaseFragment( FragmentCharacterTabBinding::inflate ) { private val viewModel: CharacterTabViewModel by inject() - private val myPageViewModel: MyPageViewModel by inject() private lateinit var contentBannerAdapter: CharacterBannerAdapter private lateinit var recentCharacterAdapter: RecentCharacterAdapter @@ -437,29 +432,7 @@ class CharacterTabFragment : BaseFragment( } private fun startAuthFlow() { - Auth.auth(requireActivity(), requireContext()) { json -> - val bootpayResponse = Gson().fromJson( - json, - kr.co.vividnext.sodalive.mypage.auth.BootpayResponse::class.java - ) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - requireActivity().runOnUiThread { - myPageViewModel.authVerify(request) { - startActivity( - Intent( - requireContext(), - SplashActivity::class.java - ).apply { - addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TASK or - Intent.FLAG_ACTIVITY_NEW_TASK - ) - } - ) - requireActivity().finish() - } - } - } + V2AuthFlow.start(requireActivity()) } private fun observeViewModel() { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/chat/original/OriginalTabFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/chat/original/OriginalTabFragment.kt index 8110774c..86a52d41 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/chat/original/OriginalTabFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/chat/original/OriginalTabFragment.kt @@ -10,7 +10,6 @@ import androidx.media3.common.util.UnstableApi import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.gson.Gson import androidx.recyclerview.widget.ConcatAdapter import kr.co.vividnext.sodalive.BuildConfig import kr.co.vividnext.sodalive.R @@ -24,11 +23,7 @@ import kr.co.vividnext.sodalive.common.YandexInlineBannerHeaderAdapter import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.main.MainActivity -import kr.co.vividnext.sodalive.mypage.MyPageViewModel -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse -import kr.co.vividnext.sodalive.splash.SplashActivity +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import org.koin.android.ext.android.inject @OptIn(UnstableApi::class) @@ -36,7 +31,6 @@ class OriginalTabFragment : BaseFragment(FragmentOriginalTabBinding::inflate) { private val viewModel: OriginalWorkViewModel by inject() - private val myPageViewModel: MyPageViewModel by inject() private lateinit var adapter: OriginalWorkListAdapter private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter @@ -158,28 +152,6 @@ class OriginalTabFragment : } private fun startAuthFlow() { - Auth.auth(requireActivity(), requireContext()) { json -> - val bootpayResponse = Gson().fromJson( - json, - BootpayResponse::class.java - ) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - requireActivity().runOnUiThread { - myPageViewModel.authVerify(request) { - startActivity( - Intent( - requireContext(), - SplashActivity::class.java - ).apply { - addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TASK or - Intent.FLAG_ACTIVITY_NEW_TASK - ) - } - ) - requireActivity().finish() - } - } - } + V2AuthFlow.start(requireActivity()) } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt index e8af0302..80f1be1d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt @@ -19,7 +19,6 @@ import androidx.media3.common.util.UnstableApi import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.gson.Gson import com.zhpan.bannerview.BaseBannerAdapter import com.zhpan.indicator.enums.IndicatorSlideMode import com.zhpan.indicator.enums.IndicatorStyle @@ -53,10 +52,7 @@ import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog import kr.co.vividnext.sodalive.main.MainActivity -import kr.co.vividnext.sodalive.mypage.MyPageViewModel -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity import kr.co.vividnext.sodalive.search.SearchActivity import kr.co.vividnext.sodalive.settings.ContentSettingsActivity @@ -64,7 +60,6 @@ import kr.co.vividnext.sodalive.settings.event.EventDetailActivity import kr.co.vividnext.sodalive.settings.language.LanguageManager import kr.co.vividnext.sodalive.settings.language.LocaleHelper import kr.co.vividnext.sodalive.settings.notification.MemberRole -import kr.co.vividnext.sodalive.splash.SplashActivity import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity import org.koin.android.ext.android.inject import java.text.SimpleDateFormat @@ -78,7 +73,6 @@ import kotlinx.coroutines.launch class HomeFragment : BaseFragment(FragmentHomeBinding::inflate) { private val viewModel: HomeViewModel by inject() private val liveViewModel: LiveViewModel by inject() - private val myPageViewModel: MyPageViewModel by inject() private lateinit var loadingDialog: LoadingDialog @@ -1368,29 +1362,7 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl } private fun startAuthFlow() { - Auth.auth(requireActivity(), requireContext()) { json -> - val bootpayResponse = Gson().fromJson( - json, - BootpayResponse::class.java - ) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - requireActivity().runOnUiThread { - myPageViewModel.authVerify(request) { - startActivity( - Intent( - requireContext(), - SplashActivity::class.java - ).apply { - addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TASK or - Intent.FLAG_ACTIVITY_NEW_TASK - ) - } - ) - requireActivity().finish() - } - } - } + V2AuthFlow.start(requireActivity()) } private fun onCharacterClick(characterId: Long) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index cf2a2c44..5aa88f86 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -21,7 +21,6 @@ import androidx.media3.common.util.UnstableApi import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.gson.Gson import com.yandex.mobile.ads.banner.BannerAdSize import com.yandex.mobile.ads.common.AdRequest import com.zhpan.bannerview.BaseBannerAdapter @@ -61,17 +60,13 @@ import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog import kr.co.vividnext.sodalive.live.room.update.LiveRoomEditActivity import kr.co.vividnext.sodalive.main.MainActivity import kr.co.vividnext.sodalive.message.MessageActivity -import kr.co.vividnext.sodalive.mypage.MyPageViewModel -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity import kr.co.vividnext.sodalive.search.SearchActivity import kr.co.vividnext.sodalive.settings.ContentSettingsActivity import kr.co.vividnext.sodalive.settings.language.LanguageManager import kr.co.vividnext.sodalive.settings.language.LocaleHelper import kr.co.vividnext.sodalive.settings.notification.MemberRole -import kr.co.vividnext.sodalive.splash.SplashActivity import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity import org.koin.android.ext.android.inject import java.text.SimpleDateFormat @@ -85,7 +80,6 @@ import kotlin.math.roundToInt @UnstableApi class LiveFragment : BaseFragment(FragmentLiveBinding::inflate) { private val viewModel: LiveViewModel by inject() - private val myPageViewModel: MyPageViewModel by inject() private lateinit var liveNowAdapter: LiveNowAdapter private lateinit var liveReservationAdapter: LiveReservationAdapter @@ -911,29 +905,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl } private fun startAuthFlow() { - Auth.auth(requireActivity(), requireContext()) { json -> - val bootpayResponse = Gson().fromJson( - json, - BootpayResponse::class.java - ) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - requireActivity().runOnUiThread { - myPageViewModel.authVerify(request) { - startActivity( - Intent( - requireContext(), - SplashActivity::class.java - ).apply { - addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TASK or - Intent.FLAG_ACTIVITY_NEW_TASK - ) - } - ) - requireActivity().finish() - } - } - } + V2AuthFlow.start(requireActivity()) } @UnstableApi diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt index 347323f5..50119472 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt @@ -10,7 +10,6 @@ import androidx.media3.common.util.UnstableApi import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.gson.Gson import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService @@ -27,14 +26,10 @@ import kr.co.vividnext.sodalive.live.room.LiveRoomActivity import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog -import kr.co.vividnext.sodalive.mypage.MyPageViewModel -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.settings.ContentSettingsActivity import kr.co.vividnext.sodalive.settings.language.LanguageManager import kr.co.vividnext.sodalive.settings.language.LocaleHelper -import kr.co.vividnext.sodalive.splash.SplashActivity import kr.co.vividnext.sodalive.user.login.LoginActivity import org.koin.android.ext.android.inject import java.text.SimpleDateFormat @@ -47,7 +42,6 @@ class LiveNowAllActivity : BaseActivity( ActivityLiveNowAllBinding::inflate ) { private val viewModel: LiveViewModel by inject() - private val myPageViewModel: MyPageViewModel by inject() private lateinit var adapter: LiveNowAllAdapter private lateinit var loadingDialog: LoadingDialog @@ -163,29 +157,7 @@ class LiveNowAllActivity : BaseActivity( } private fun startAuthFlow() { - Auth.auth(this, applicationContext) { json -> - val bootpayResponse = Gson().fromJson( - json, - BootpayResponse::class.java - ) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - runOnUiThread { - myPageViewModel.authVerify(request) { - startActivity( - Intent( - applicationContext, - SplashActivity::class.java - ).apply { - addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TASK or - Intent.FLAG_ACTIVITY_NEW_TASK - ) - } - ) - finish() - } - } - } + V2AuthFlow.start(this) } private fun enterLiveRoom(roomId: Long) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt index 5230563b..b5a136fb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt @@ -14,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import coil.load import coil.transform.CircleCropTransformation -import com.google.gson.Gson import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.box.AudioContentBoxActivity import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity @@ -29,9 +28,7 @@ import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.extensions.moneyFormat import kr.co.vividnext.sodalive.main.MainActivity import kr.co.vividnext.sodalive.mypage.alarm.AlarmListActivity -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.mypage.block.BlockMemberActivity import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity import kr.co.vividnext.sodalive.mypage.can.coupon.CanCouponActivity @@ -49,7 +46,6 @@ import kr.co.vividnext.sodalive.settings.language.LanguageManager import kr.co.vividnext.sodalive.settings.notice.NoticeActivity import kr.co.vividnext.sodalive.settings.notice.NoticeDetailActivity import kr.co.vividnext.sodalive.settings.notification.MemberRole -import kr.co.vividnext.sodalive.splash.SplashActivity import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity import kr.co.vividnext.sodalive.v2.gift.GiftInboxActivity import kr.co.vividnext.sodalive.v2.gift.GiftInboxEntryPolicy @@ -488,29 +484,7 @@ class MyPageFragment : BaseFragment(FragmentMyBinding::inflat } private fun showAuthDialog() { - Auth.auth(requireActivity(), requireContext()) { json -> - val bootpayResponse = Gson().fromJson( - json, - BootpayResponse::class.java - ) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - requireActivity().runOnUiThread { - viewModel.authVerify(request) { - startActivity( - Intent( - requireContext(), - SplashActivity::class.java - ).apply { - addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TASK or - Intent.FLAG_ACTIVITY_NEW_TASK - ) - } - ) - requireActivity().finish() - } - } - } + V2AuthFlow.start(requireActivity()) } private fun showLoginActivity() { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/access/V2AccessGuard.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/access/V2AccessGuard.kt index 0f7c0554..6cdf9274 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/access/V2AccessGuard.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/access/V2AccessGuard.kt @@ -3,18 +3,12 @@ package kr.co.vividnext.sodalive.v2.access import android.app.Activity import android.content.Intent import androidx.fragment.app.Fragment -import com.google.gson.Gson import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.common.Constants -import kr.co.vividnext.sodalive.mypage.MyPageViewModel -import kr.co.vividnext.sodalive.mypage.auth.Auth -import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest -import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse +import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow import kr.co.vividnext.sodalive.settings.ContentSettingsActivity -import kr.co.vividnext.sodalive.splash.SplashActivity import kr.co.vividnext.sodalive.user.login.LoginActivity import kr.co.vividnext.sodalive.v2.components.modal.V2ModalDialog -import org.koin.android.ext.android.get class V2AccessGuard( private val policy: AccessPolicy = AccessPolicy(), @@ -90,23 +84,7 @@ class V2AccessGuard( } private fun startAuthFlow(activity: Activity) { - val myPageViewModel: MyPageViewModel = activity.get() - Auth.auth(activity, activity) { json -> - val bootpayResponse = Gson().fromJson(json, BootpayResponse::class.java) - val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId) - activity.runOnUiThread { - if (activity.isFinishing || activity.isDestroyed) return@runOnUiThread - myPageViewModel.authVerify(request) { - if (activity.isFinishing || activity.isDestroyed) return@authVerify - activity.startActivity( - Intent(activity, SplashActivity::class.java).apply { - addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) - } - ) - activity.finish() - } - } - } + V2AuthFlow.start(activity) } private fun startContentSettings(activity: Activity) { diff --git a/app/src/test/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivitySourceTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivitySourceTest.kt index b8a43520..3661a183 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivitySourceTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivitySourceTest.kt @@ -2,12 +2,25 @@ package kr.co.vividnext.sodalive.audio_content.detail +import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import java.io.File class AudioContentDetailActivitySourceTest { + @Test + fun `인증 완료 후 상세 재조회는 실패 종료 callback 없이 현재 화면을 유지한다`() { + val source = projectFile( + "app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt" + ).readText() + val listener = source + .substringAfter("supportFragmentManager.setFragmentResultListener(V2AuthFlow.AUDIO_AUTH_COMPLETED, this) { _, _ ->") + .substringBefore("\n }") + + assertEquals("viewModel.getAudioContentDetail(audioContentId = audioContentId)", listener.trim()) + } + @Test fun `긴 설명을 펼치면 말줄임을 제거한다`() { val observer = expandDetailObserver() diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/main/MainV2LoginGuardSourceTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/main/MainV2LoginGuardSourceTest.kt index fb0cf2c0..4a959482 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/main/MainV2LoginGuardSourceTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/main/MainV2LoginGuardSourceTest.kt @@ -1,6 +1,7 @@ package kr.co.vividnext.sodalive.v2.main import org.junit.Assert.assertFalse +import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import java.io.File @@ -15,6 +16,7 @@ class MainV2LoginGuardSourceTest { val mainV2Activity = projectFile( "app/src/main/java/kr/co/vividnext/sodalive/v2/main/MainV2Activity.kt" ).readText() + val flow = projectFile("app/src/main/java/kr/co/vividnext/sodalive/v2/auth/V2AuthFlow.kt").readText() val handleDecisionSource = source.substring( source.indexOf("private fun handleDecision("), source.indexOf("private fun startLoginActivity") @@ -35,13 +37,14 @@ class MainV2LoginGuardSourceTest { assertTrue(source.contains("Intent.FLAG_ACTIVITY_SINGLE_TOP")) assertTrue(source.contains("V2ModalDialog(")) assertFalse(source.contains("SodaDialog(")) - assertTrue(source.contains("Auth.auth(activity, activity)")) - assertTrue(source.contains("Gson().fromJson(json, BootpayResponse::class.java)")) - assertTrue(source.contains("AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)")) - assertTrue(source.contains("myPageViewModel.authVerify(request)")) - assertTrue(source.contains("if (activity.isFinishing || activity.isDestroyed)")) - assertTrue(source.contains("SplashActivity::class.java")) - assertTrue(source.contains("Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK")) + assertTrue(source.contains("V2AuthFlow.start(activity)")) + assertFalse(source.contains("AuthVerifyRequest(")) + assertFalse(source.contains("authVerify(")) + assertTrue(flow.contains("Auth.auth(host, host)")) + assertTrue(flow.contains("validatedReceipt(payload)")) + assertTrue(flow.contains("it.isNotBlank()")) + assertTrue(flow.contains("SplashActivity::class.java")) + assertTrue(flow.contains("Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK")) assertTrue(source.contains("ContentSettingsActivity::class.java")) assertTrue(source.contains("putExtra(Constants.EXTRA_SHOW_SENSITIVE_CONTENT_GUIDE, true)")) assertFalse(source.contains("Auth.auth(activity, activity) {}")) @@ -54,6 +57,27 @@ class MainV2LoginGuardSourceTest { assertTrue(mainV2Activity.contains("ensureV2Access(AccessRequirement.Login)")) } + @Test + fun `여덟 인증 진입점은 공통 흐름을 사용하고 오디오만 회원 동기화를 요청한다`() { + val callers = listOf( + "mypage/MyPageFragment.kt", + "home/HomeFragment.kt", + "live/LiveFragment.kt", + "live/now/all/LiveNowAllActivity.kt", + "chat/original/OriginalTabFragment.kt", + "chat/character/CharacterTabFragment.kt", + "audio_content/detail/AudioContentDetailActivity.kt", + "v2/access/V2AccessGuard.kt" + ) + callers.forEach { path -> + val source = projectFile("app/src/main/java/kr/co/vividnext/sodalive/$path").readText() + assertTrue(path, source.contains("V2AuthFlow.start(")) + assertFalse(path, source.contains("Auth.auth(")) + assertFalse(path, source.contains("authVerify(")) + assertEquals(path, path.startsWith("audio_content/"), source.contains("syncMemberInfo = true")) + } + } + private fun projectFile(relativePath: String): File { val candidates = listOf(File(relativePath), File("../$relativePath")) return candidates.firstOrNull { it.exists() }