Merge pull request #128 from JJUYAAA/#124-refactor_social_login

[Refactor] 소셜로그인, 회원가입 관련 오류 수정

Author: Nico1eKim

.gitignore

@@ -16,4 +16,5 @@ local.properties
 .idea/deploymentTargetSelector.xml
 .idea/misc.xml
 .idea/gradle.xml
-.idea/appInsightsSettings.xml
+.idea/appInsightsSettings.xml
+/app/google-services.json

.idea/.gitignore

@@ -108,9 +108,11 @@ dependencies {
     //implementation ("androidx.datastore:datastore-preferences:1.1.1")
 
 // 구글 로그인
-    implementation(platform("com.google.firebase:firebase-bom:34.1.0"))
-    implementation("com.google.firebase:firebase-auth")
     implementation("com.google.android.gms:play-services-auth:21.2.0")
+
+    implementation("androidx.credentials:credentials:1.2.2")
+    implementation("androidx.credentials:credentials-play-services-auth:1.2.2")
+
 }
 
 kapt {

app/build.gradle.kts

@@ -1,17 +1,17 @@
 package com.texthip.thip.data.repository
 
 import android.content.Context
-import com.google.firebase.Firebase
-import com.google.firebase.auth.GoogleAuthProvider
-import com.google.firebase.auth.auth
 import com.kakao.sdk.user.UserApiClient
 import com.texthip.thip.data.model.auth.request.AuthRequest
 import com.texthip.thip.data.model.auth.response.AuthResponse
 import com.texthip.thip.data.model.base.handleBaseResponse
 import com.texthip.thip.data.service.AuthService
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.tasks.await
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import java.util.Base64
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.coroutines.resume
@@ -36,13 +36,14 @@ class AuthRepository @Inject constructor(
     }
     suspend fun loginWithGoogle(idToken: String): Result<AuthResponse?> {
         return runCatching {
-            //Firebase에 구글 ID 토큰으로 로그인
-            val credential = GoogleAuthProvider.getCredential(idToken, null)
-            val authResult = Firebase.auth.signInWithCredential(credential).await()
-            val googleUid = authResult.user?.uid ?: throw IllegalStateException("Google User UID is null")
+            val payload = idToken.split('.')[1]//ID 토큰을 .기준 분리
+            val decodedJson = String(Base64.getUrlDecoder().decode(payload))//디코딩 해서 JSON 문자열 반환
+
+            val jsonObject = Json.parseToJsonElement(decodedJson).jsonObject
+            val googleSubId = jsonObject["sub"]?.jsonPrimitive?.content ?: throw IllegalStateException("구글 userID (sub)값이 없습니다.")//sub 값 추출
 
             //받아온 UID로 신규/기존 유저인지 확인 요청
-            val request = AuthRequest(oauth2Id = "google_$googleUid")
+            val request = AuthRequest(oauth2Id = "google_$googleSubId")
             authService.checkNewUser(request)
                 .handleBaseResponse()
                 .getOrThrow()

app/google-services.json

@@ -114,7 +114,7 @@ fun EditProfileContent(
                 WarningTextField(
                     containerColor = colors.DarkGrey02,
                     value = uiState.nickname,
-                    onValueChange = onNicknameChange,
+                    onValueChange = { newNickname -> onNicknameChange(newNickname.lowercase()) },
                     hint = stringResource(R.string.nickname_condition),
                     showWarning = uiState.nicknameWarningMessageResId != null,
                     showIcon = false,

app/src/main/java/com/texthip/thip/data/repository/AuthRepository.kt

@@ -71,7 +71,7 @@ class MyPageViewModel @Inject constructor(
         viewModelScope.launch {
             tokenManager.clearTokens()
             // 2. 카카오 SDK에서 로그아웃
-            UserApiClient.instance.unlink { error ->
+            UserApiClient.instance.logout { error ->
                 if (error != null) {
                     Log.e("MyPageViewModel", "카카오 로그아웃 실패", error)
                 } else {

app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageEditScreen.kt

@@ -100,7 +100,7 @@ fun SignupNicknameContent(
             WarningTextField(
                 containerColor = colors.DarkGrey02,
                 value = nickname,
-                onValueChange = onNicknameChange,
+                onValueChange = { newNickname -> onNicknameChange(newNickname.lowercase()) },//소문자로 즉시 변경
                 hint = stringResource(R.string.nickname_condition),
                 showWarning = warningMessageResId != null,
                 showIcon = false,

app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/MyPageViewModel.kt

@@ -446,6 +446,6 @@
     <string name="api_genre_science_it" translatable="false">과학/IT</string>
 
     <!-- Google login constants -->
-    <string name="default_web_client_id" translatable="false">353417813537-ck9g1v0qprlb5nf4dvasinim403eng0f.apps.googleusercontent.com</string>
+    <string name="default_web_client_id" translatable="false">211189590640-a2ul4bnsvislm12ov7k8eu61mtketl8d.apps.googleusercontent.com</string>
 
 </resources>