#86 refactor : Merge Complete

plashdof · Nov 21, 2023 · d8b28d8 · d8b28d8
1 parent 85e0bfa
commit d8b28d8
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/Aos/.idea/deploymentTargetDropDown.xml b/Aos/.idea/deploymentTargetDropDown.xml
diff --git a/Aos/app/src/main/AndroidManifest.xml b/Aos/app/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
         android:name=".app.App"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:usesCleartextTraffic="true"
         android:supportsRtl="true"
         android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Nibobnebob"

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginFragment.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginFragment.kt
@@ -75,7 +75,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding>(R.layout.fragment_login
 
             override fun onSuccess() {
                 val token = NaverIdLoginSDK.getAccessToken().toString()
-                viewModel.naverLogin(token)
+                viewModel.loginNaver(token)
             }
         }
         NaverIdLoginSDK.authenticate(requireContext(), oAuthLoginCallback)

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginViewModel.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/intro/login/LoginViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.avengers.nibobnebob.app.DataStoreManager
 import com.avengers.nibobnebob.data.model.ApiState
-import com.avengers.nibobnebob.data.repository.LoginRepository
+import com.avengers.nibobnebob.data.repository.IntroRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -25,7 +25,7 @@ sealed class LoginEvent {
 
 @HiltViewModel
 class LoginViewModel @Inject constructor(
-    private val loginRepository: LoginRepository,
+    private val introRepository: IntroRepository,
     private val dataStoreManager: DataStoreManager
 ) : ViewModel() {
     private val TAG = "LoginViewModelDebug"
@@ -65,16 +65,20 @@ class LoginViewModel @Inject constructor(
         autoLogin.value = newState
     }
 
-    fun postCommonLogin(){
+    fun loginCommon(){
         //TODO : 일반로그인
     }
 
-    fun naverLogin(token : String){
+    fun loginNaver(token : String){
         viewModelScope.launch {
             dataStoreManager.putAccessToken(token)
-            loginRepository.loginNaver().onEach {
+            introRepository.loginNaver().onEach {
                 when(it){
                     is ApiState.Success -> {
+                        dataStoreManager.putAutoLogin(true)
+                        dataStoreManager.putAccessToken(it.data.accessToken.toString())
+                        dataStoreManager.putRefreshToken(it.data.refreshToken.toString())
+
                         _events.emit(LoginEvent.NavigateToMain)
                     }
                     is ApiState.Error -> {
@@ -94,4 +98,5 @@ class LoginViewModel @Inject constructor(
             }.launchIn(viewModelScope)
         }
     }
+
 }
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashViewModel.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/presentation/ui/splash/SplashViewModel.kt
@@ -3,7 +3,6 @@ package com.avengers.nibobnebob.presentation.ui.splash
 import androidx.lifecycle.viewModelScope
 import com.avengers.nibobnebob.app.DataStoreManager
 import com.avengers.nibobnebob.app.NetworkManager
-import com.avengers.nibobnebob.data.repository.LoginRepository
 import com.avengers.nibobnebob.presentation.base.BaseActivityViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow

diff --git a/Aos/app/src/main/res/layout/fragment_login.xml b/Aos/app/src/main/res/layout/fragment_login.xml
@@ -92,7 +92,7 @@
             android:textColor="@color/white"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:onClick="@{() -> vm.postCommonLogin()}"
+            android:onClick="@{() -> vm.loginCommon()}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/til_password" />