[feat/#122] V2 로그인 추가

depromeet · Aug 27, 2024 · 8b1e59d · 8b1e59d
1 parent 88ed452
commit 8b1e59d
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 4 deletions.
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
diff --git a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar
diff --git a/data/src/main/java/com/dpm/data/datasource/SignupRemoteDataSource.kt b/data/src/main/java/com/dpm/data/datasource/SignupRemoteDataSource.kt
@@ -12,5 +12,10 @@ interface SignupRemoteDataSource {
         accessToken: String,
     ): ResponsePostSignupDto
 
+    suspend fun getSignupV2(
+        snsProvider: String,
+        accessToken: String,
+    ): ResponsePostSignupDto
+
     suspend fun deleteWithdraw(): Unit
 }
diff --git a/data/src/main/java/com/dpm/data/datasource/remote/SignupRemoteDataSourceImpl.kt b/data/src/main/java/com/dpm/data/datasource/remote/SignupRemoteDataSourceImpl.kt
@@ -19,6 +19,13 @@ class SignupRemoteDataSourceImpl @Inject constructor(
         return signupService.getSignupMember(accessToken)
     }
 
+    override suspend fun getSignupV2(
+        snsProvider: String,
+        accessToken: String
+    ): ResponsePostSignupDto {
+        return signupService.getSignupMemberV2(snsProvider, accessToken)
+    }
+
     override suspend fun deleteWithdraw(): Unit {
         return signupService.deleteSignupMember()
     }

diff --git a/data/src/main/java/com/dpm/data/remote/SignupService.kt b/data/src/main/java/com/dpm/data/remote/SignupService.kt
@@ -20,6 +20,12 @@ interface SignupService {
         @Path("accessToken") accessToken: String,
     ): ResponsePostSignupDto
 
+    @GET("/api/v2/members/{snsProvider}/{token}")
+    suspend fun getSignupMemberV2(
+        @Path("snsProvider") snsProvider: String,
+        @Path("token") accessToken: String,
+    ): ResponsePostSignupDto
+
     @DELETE("/api/v1/members")
     suspend fun deleteSignupMember()
 }
diff --git a/data/src/main/java/com/dpm/data/repository/SignupRepositoryImpl.kt b/data/src/main/java/com/dpm/data/repository/SignupRepositoryImpl.kt
@@ -23,6 +23,15 @@ class SignupRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun getSignupV2(
+        snsProvider: String,
+        accessToken: String
+    ): Result<SignupTokenModel> {
+        return runCatching {
+            signupRemoteDataSource.getSignupV2(snsProvider, accessToken).toSignupTokenModel()
+        }
+    }
+
     override suspend fun deleteWithdraw(): Result<Unit> {
         return runCatching {
             signupRemoteDataSource.deleteWithdraw()

diff --git a/domain/src/main/java/com/dpm/domain/repository/SignupRepository.kt b/domain/src/main/java/com/dpm/domain/repository/SignupRepository.kt
@@ -12,5 +12,10 @@ interface SignupRepository {
         accessToken: String
     ): Result<SignupTokenModel>
 
+    suspend fun getSignupV2(
+        snsProvider: String,
+        accessToken: String
+    ): Result<SignupTokenModel>
+
     suspend fun deleteWithdraw(): Result<Unit>
 }
diff --git a/presentation/src/main/java/com/dpm/presentation/login/ui/KakaoSignupActivity.kt b/presentation/src/main/java/com/dpm/presentation/login/ui/KakaoSignupActivity.kt
@@ -44,10 +44,13 @@ class KakaoSignupActivity : BaseActivity<FragmentKakaoSignupBinding>({
             val userName = account.givenName
             val serverAuth = account.serverAuthCode
             account.idToken
-            Intent(this, NicknameInputActivity::class.java).apply {
-                putExtra("kakaoToken", account.idToken)
-                startActivity(this)
-            }
+
+            signUpViewModel.updateGoogleToken(account.serverAuthCode.orEmpty())
+
+//            Intent(this, NicknameInputActivity::class.java).apply {
+//                putExtra("kakaoToken", account.idToken)
+//                startActivity(this)
+//            }
 
         } catch (e: ApiException) {
             Timber.e(e)

diff --git a/presentation/src/main/java/com/dpm/presentation/login/viewmodel/KakaoSignupViewModel.kt b/presentation/src/main/java/com/dpm/presentation/login/viewmodel/KakaoSignupViewModel.kt
@@ -51,4 +51,21 @@ class KakaoSignupViewModel @Inject constructor(
         }
     }
 
+    fun updateGoogleToken(token: String) {
+        viewModelScope.launch {
+            _loginUiState.emit(LoginUiState.Loading)
+            signupRepository.getSignupV2("GOOGLE", token)
+                .onSuccess {
+                    if (it.jwtToken.isEmpty()) {
+                        _kakaoToken.value = token
+                    } else {
+                        sharedPreference.token = it.jwtToken
+                        _loginUiState.emit(LoginUiState.LoginSuccess)
+                    }
+                }.onFailure {
+                    _kakaoToken.value = token
+                }
+        }
+    }
+
 }