[REFACTOR] 데이터 레이어 다른 계층 참조하지 않도록 코드 분리

app/src/debug/java/com/runnect/runnect/developer/RunnectDeveloperActivity.kt

@@ -17,9 +17,11 @@ import com.runnect.runnect.R
 import com.runnect.runnect.application.ApiMode
 import com.runnect.runnect.application.ApplicationClass
 import com.runnect.runnect.application.PreferenceManager
-import com.runnect.runnect.presentation.mypage.setting.accountinfo.MySettingAccountInfoFragment
 import com.runnect.runnect.util.custom.toast.RunnectToast
-import com.runnect.runnect.util.preference.LoginStatus
+import com.runnect.runnect.util.preference.AuthUtil.getAccessToken
+import com.runnect.runnect.util.preference.AuthUtil.getNewToken
+import com.runnect.runnect.util.preference.AuthUtil.saveToken
+import com.runnect.runnect.util.preference.StatusType.LoginStatus
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -44,8 +46,8 @@ class RunnectDeveloperActivity : AppCompatActivity(R.layout.activity_runnect_dev
 
         private fun initUserInfo() {
             val ctx: Context = context ?: return
-            val accessToken = PreferenceManager.getString(ctx, TOKEN_KEY_ACCESS) ?: ""
-            val refreshToken = PreferenceManager.getString(ctx, TOKEN_KEY_REFRESH) ?: ""
+            val accessToken = ctx.getAccessToken()
+            val refreshToken = ctx.getNewToken()
 
             setPreferenceSummary("dev_pref_key_access_token", accessToken)
             setPreferenceSummary("dev_pref_key_refresh_token", refreshToken)
@@ -70,18 +72,11 @@ class RunnectDeveloperActivity : AppCompatActivity(R.layout.activity_runnect_dev
 
                     PreferenceManager.apply {
                         setString(ctx, ApplicationClass.API_MODE, selectItem)
-                        setString(
-                            ctx,
-                            MySettingAccountInfoFragment.TOKEN_KEY_ACCESS,
-                            LoginStatus.NONE.value
-                        )
-                        setString(
-                            ctx,
-                            MySettingAccountInfoFragment.TOKEN_KEY_REFRESH,
-                            LoginStatus.NONE.value
-                        )
                     }
-
+                    ctx.saveToken(
+                        accessToken = LoginStatus.NONE.value,
+                        refreshToken = LoginStatus.NONE.value
+                    )
                     destroyApp(ctx)
                     true
                 }
@@ -184,8 +179,6 @@ class RunnectDeveloperActivity : AppCompatActivity(R.layout.activity_runnect_dev
 
         companion object {
             private const val CLIPBOARD_LABEL = "keyword"
-            const val TOKEN_KEY_ACCESS = "access"
-            const val TOKEN_KEY_REFRESH = "refresh"
         }
     }
 }

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

@@ -1,10 +1,13 @@
 package com.runnect.runnect.data.service
 
+import android.content.Context
 import com.runnect.runnect.application.ApplicationClass
-import com.runnect.runnect.application.PreferenceManager
 import com.runnect.runnect.data.dto.response.ResponseGetRefreshToken
 import com.runnect.runnect.data.dto.response.base.BaseResponse
-import com.runnect.runnect.util.preference.LoginStatus
+import com.runnect.runnect.util.preference.AuthUtil.getAccessToken
+import com.runnect.runnect.util.preference.AuthUtil.getNewToken
+import com.runnect.runnect.util.preference.AuthUtil.saveToken
+import com.runnect.runnect.util.preference.StatusType.LoginStatus
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.decodeFromString
@@ -17,6 +20,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class AuthInterceptor @Inject constructor(
+    private val context: Context,
     private val json: Json
 ) : Interceptor {
     // access Header 에 보내고 이때 401(토큰 만료) 뜨면 액세스 재발급 요청
@@ -37,7 +41,7 @@ class AuthInterceptor @Inject constructor(
                 handleTokenExpired(chain, originalRequest, headerRequest)
             } catch (t: Throwable) {
                 Timber.e("Exception: ${t.message}")
-                saveToken(
+                context.saveToken(
                     accessToken = LoginStatus.EXPIRED.value,
                     refreshToken = LoginStatus.EXPIRED.value
                 )
@@ -50,34 +54,15 @@ class AuthInterceptor @Inject constructor(
 
     private fun Request.newAuthTokenBuilder() =
         runBlocking(Dispatchers.IO) {
-            val accessToken = getAccessToken()
-            val refreshToken = getNewToken()
+            val accessToken = context.getAccessToken()
+            val refreshToken = context.getNewToken()
             newBuilder().apply {
                 addHeader(ACCESS_TOKEN, accessToken)
                 addHeader(REFRESH_TOKEN, refreshToken)
             }
         }
 
 
-    private fun getAccessToken(): String {
-        return PreferenceManager.getString(
-            ApplicationClass.appContext,
-            TOKEN_KEY_ACCESS
-        ) ?: ""
-    }
-
-    private fun getNewToken(): String {
-        return PreferenceManager.getString(
-            ApplicationClass.appContext,
-            TOKEN_KEY_REFRESH
-        ) ?: ""
-    }
-
-    private fun saveToken(accessToken: String, refreshToken: String) {
-        PreferenceManager.setString(ApplicationClass.appContext, TOKEN_KEY_ACCESS, accessToken)
-        PreferenceManager.setString(ApplicationClass.appContext, TOKEN_KEY_REFRESH, refreshToken)
-    }
-
     private fun handleTokenExpired(
         chain: Interceptor.Chain,
         originalRequest: Request,
@@ -87,13 +72,13 @@ class AuthInterceptor @Inject constructor(
         return if (refreshTokenResponse.isSuccessful) {
             handleGetRefreshTokenSuccess(refreshTokenResponse, originalRequest, chain)
         } else {
-            handleGetRefreshTokenFailure(refreshTokenResponse, headerRequest, chain)
+            handleGetNewTokenFailure(refreshTokenResponse, headerRequest, chain)
         }
     }
 
     private fun getNewToken(originalRequest: Request, chain: Interceptor.Chain): Response {
         val baseUrl = ApplicationClass.getBaseUrl()
-        val refreshToken = getNewToken()
+        val refreshToken = context.getNewToken()
         val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody())
             .url("$baseUrl/api/auth/getNewToken")
             .addHeader(REFRESH_TOKEN, refreshToken)
@@ -113,21 +98,24 @@ class AuthInterceptor @Inject constructor(
             )
             responseToken.data?.data?.let {
                 Timber.e("New Refresh Token Success: ${it.refreshToken}")
-                saveToken(it.accessToken, it.refreshToken)
+                context.saveToken(it.accessToken, it.refreshToken)
             }
         }
 
         val newRequest = originalRequest.newAuthTokenBuilder().build()
         return chain.proceed(newRequest)
     }
 
-    private fun handleGetRefreshTokenFailure(
+    private fun handleGetNewTokenFailure(
         refreshTokenResponse: Response,
         headerRequest: Request,
         chain: Interceptor.Chain
     ): Response {
         Timber.e("New Refresh Token Failure: ${refreshTokenResponse.code}")
-        saveToken(accessToken = LoginStatus.EXPIRED.value, refreshToken = LoginStatus.EXPIRED.value)
+        context.saveToken(
+            accessToken = LoginStatus.EXPIRED.value,
+            refreshToken = LoginStatus.EXPIRED.value
+        )
         return chain.proceed(headerRequest)
     }
 
@@ -136,9 +124,6 @@ class AuthInterceptor @Inject constructor(
         private const val ACCESS_TOKEN = "accessToken"
         private const val CODE_TOKEN_EXPIRED = 401
         private const val REFRESH_TOKEN = "refreshToken"
-
-        const val TOKEN_KEY_ACCESS = "access"
-        const val TOKEN_KEY_REFRESH = "refresh"
     }
 
 }

app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt

@@ -11,8 +11,6 @@ import com.google.firebase.remoteconfig.ktx.remoteConfig
 import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
 import com.runnect.runnect.BuildConfig.REMOTE_KEY_APP_VERSION
 import com.runnect.runnect.R
-import com.runnect.runnect.application.ApplicationClass
-import com.runnect.runnect.application.PreferenceManager
 import com.runnect.runnect.binding.BindingActivity
 import com.runnect.runnect.databinding.ActivityMainBinding
 import com.runnect.runnect.presentation.coursemain.CourseMainFragment
@@ -23,7 +21,8 @@ import com.runnect.runnect.presentation.storage.StorageScrapFragment
 import com.runnect.runnect.util.analytics.Analytics
 import com.runnect.runnect.util.analytics.EventName
 import com.runnect.runnect.util.analytics.EventName.EVENT_VIEW_HOME
-import com.runnect.runnect.util.preference.LoginStatus
+import com.runnect.runnect.util.preference.AuthUtil.getAccessToken
+import com.runnect.runnect.util.preference.StatusType.LoginStatus
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
@@ -45,7 +44,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
     }
 
     private fun checkVisitorMode() {
-        val accessToken = PreferenceManager.getString(ApplicationClass.appContext, TOKEN_KEY_ACCESS)
+        val accessToken = applicationContext.getAccessToken()
         val loginStatus = LoginStatus.getLoginStatus(accessToken)
         isVisitorMode = loginStatus == LoginStatus.VISITOR
     }
@@ -164,7 +163,6 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         const val DEFAULT_VERSION = "0.0.0"
 
         const val EXTRA_FRAGMENT_REPLACEMENT_DIRECTION = "fragmentReplacementDirection"
-        const val TOKEN_KEY_ACCESS = "access"
 
         var isVisitorMode = false
         var discoverFragment: DiscoverFragment? = null

app/src/main/java/com/runnect/runnect/presentation/login/GiveNicknameActivity.kt

@@ -7,13 +7,13 @@ import android.view.MotionEvent
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import com.runnect.runnect.R
-import com.runnect.runnect.application.PreferenceManager
 import com.runnect.runnect.binding.BindingActivity
 import com.runnect.runnect.databinding.ActivityGiveNicknameBinding
 import com.runnect.runnect.presentation.MainActivity
 import com.runnect.runnect.presentation.state.UiState
 import com.runnect.runnect.util.extension.hideKeyboard
 import com.runnect.runnect.util.extension.showToast
+import com.runnect.runnect.util.preference.AuthUtil.saveToken
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -35,15 +35,9 @@ class GiveNicknameActivity :
     }
 
     private fun saveSignTokenInfo() {
-        PreferenceManager.setString(
-            applicationContext,
-            TOKEN_KEY_ACCESS,
-            intent.getStringExtra("access")
-        )
-        PreferenceManager.setString(
-            applicationContext,
-            TOKEN_KEY_REFRESH,
-            intent.getStringExtra("refresh")
+        applicationContext.saveToken(
+            accessToken = intent.getStringExtra("access") ?: "",
+            refreshToken = intent.getStringExtra("refresh") ?: ""
         )
     }
 
@@ -113,9 +107,5 @@ class GiveNicknameActivity :
         return super.dispatchTouchEvent(ev)
     }
 
-    companion object {
-        const val TOKEN_KEY_ACCESS = "access"
-        const val TOKEN_KEY_REFRESH = "refresh"
-    }
 }
 

app/src/main/java/com/runnect/runnect/presentation/login/LoginActivity.kt

@@ -7,7 +7,6 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import com.runnect.runnect.R
-import com.runnect.runnect.application.PreferenceManager
 import com.runnect.runnect.binding.BindingActivity
 import com.runnect.runnect.databinding.ActivityLoginBinding
 import com.runnect.runnect.presentation.MainActivity
@@ -16,22 +15,24 @@ import com.runnect.runnect.util.analytics.Analytics
 import com.runnect.runnect.util.analytics.EventName.EVENT_CLICK_VISITOR
 import com.runnect.runnect.util.analytics.EventName.EVENT_VIEW_SOCIAL_LOGIN
 import com.runnect.runnect.util.extension.showToast
-import com.runnect.runnect.util.preference.LoginStatus
+import com.runnect.runnect.util.preference.AuthUtil.getAccessToken
+import com.runnect.runnect.util.preference.AuthUtil.saveToken
+import com.runnect.runnect.util.preference.StatusType.LoginStatus
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
 @AndroidEntryPoint
 class LoginActivity :
-    BindingActivity<ActivityLoginBinding>(com.runnect.runnect.R.layout.activity_login) {
-    lateinit var socialLogin: SocialLogin
-    lateinit var googleLogin: GoogleLogin
-    lateinit var kakaoLogin: KakaoLogin
+    BindingActivity<ActivityLoginBinding>(R.layout.activity_login) {
+    private lateinit var socialLogin: SocialLogin
+    private lateinit var googleLogin: GoogleLogin
+    private lateinit var kakaoLogin: KakaoLogin
     private val viewModel: LoginViewModel by viewModels()
 
     //자동 로그인
     override fun onStart() {
         super.onStart()
-        val accessToken = PreferenceManager.getString(applicationContext, TOKEN_KEY_ACCESS)
+        val accessToken = applicationContext.getAccessToken()
 
         when (LoginStatus.getLoginStatus(accessToken)) {
             LoginStatus.EXPIRED -> {
@@ -77,15 +78,9 @@ class LoginActivity :
             }
             btnVisitorMode.setOnClickListener {
                 Analytics.logClickedItemEvent(EVENT_CLICK_VISITOR)
-                PreferenceManager.setString(
-                    context = applicationContext,
-                    key = TOKEN_KEY_ACCESS,
-                    value = LoginStatus.VISITOR.value
-                )
-                PreferenceManager.setString(
-                    context = applicationContext,
-                    key = TOKEN_KEY_REFRESH,
-                    value = LoginStatus.VISITOR.value
+                applicationContext.saveToken(
+                    accessToken = LoginStatus.VISITOR.value,
+                    refreshToken = LoginStatus.VISITOR.value
                 )
                 moveToMain()
             }
@@ -134,16 +129,12 @@ class LoginActivity :
 
 
     private fun saveSignTokenInfo() {
-        PreferenceManager.setString(
-            context = applicationContext,
-            key = TOKEN_KEY_ACCESS,
-            value = viewModel.loginResult.value?.accessToken
-        )
-        PreferenceManager.setString(
-            context = applicationContext,
-            key = TOKEN_KEY_REFRESH,
-            value = viewModel.loginResult.value?.refreshToken
-        )
+        viewModel.loginResult.value?.let { loginResult ->
+            applicationContext.saveToken(
+                accessToken = loginResult.accessToken,
+                refreshToken = loginResult.refreshToken
+            )
+        }
         Timber.d("ACCESS TOKEN: ${viewModel.loginResult.value?.accessToken}")
         Timber.d("REFRESH TOKEN: ${viewModel.loginResult.value?.refreshToken}")
     }
@@ -167,9 +158,6 @@ class LoginActivity :
         const val GOOGLE_SIGN = "GOOGLE"
         const val KAKAO_SIGN = "KAKAO"
 
-        const val TOKEN_KEY_ACCESS = "access"
-        const val TOKEN_KEY_REFRESH = "refresh"
-
         const val EXTRA_ACCESS_TOKEN = "access"
         const val EXTRA_REFRESH_TOKEN = "refresh"
 

app/src/main/java/com/runnect/runnect/presentation/mypage/setting/accountinfo/MySettingAccountInfoFragment.kt

@@ -11,7 +11,6 @@ import androidx.fragment.app.commit
 import androidx.fragment.app.replace
 import androidx.fragment.app.viewModels
 import com.runnect.runnect.R
-import com.runnect.runnect.application.PreferenceManager
 import com.runnect.runnect.binding.BindingFragment
 import com.runnect.runnect.databinding.FragmentMySettingAccountInfoBinding
 import com.runnect.runnect.presentation.login.LoginActivity
@@ -25,7 +24,8 @@ import com.runnect.runnect.util.analytics.EventName.EVENT_VIEW_SUCCESS_WITHDRAW
 import com.runnect.runnect.util.extension.setCustomDialog
 import com.runnect.runnect.util.extension.setDialogButtonClickListener
 import com.runnect.runnect.util.extension.showToast
-import com.runnect.runnect.util.preference.LoginStatus
+import com.runnect.runnect.util.preference.AuthUtil.saveToken
+import com.runnect.runnect.util.preference.StatusType.LoginStatus
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.android.synthetic.main.custom_dialog_delete.btn_delete_yes
 import timber.log.Timber
@@ -111,8 +111,10 @@ class MySettingAccountInfoFragment :
     }
 
     private fun moveToLogin() {
-        PreferenceManager.setString(requireContext(), TOKEN_KEY_ACCESS, LoginStatus.NONE.value)
-        PreferenceManager.setString(requireContext(), TOKEN_KEY_REFRESH, LoginStatus.NONE.value)
+        requireActivity().applicationContext?.saveToken(
+            accessToken = LoginStatus.NONE.value,
+            refreshToken = LoginStatus.NONE.value
+        )
         val intent = Intent(requireActivity(), LoginActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
         startActivity(intent)
@@ -168,7 +170,5 @@ class MySettingAccountInfoFragment :
         const val DESCRIPTION_WITHDRAWAL = "정말로 탈퇴하시겟어요?"
         const val DESCRIPTION_WITHDRAWAL_YES = "네"
         const val DESCRIPTION_WITHDRAWAL_NO = "아니오"
-        const val TOKEN_KEY_ACCESS = "access"
-        const val TOKEN_KEY_REFRESH = "refresh"
     }
 }