UMC-Edison · HwangJaemin49 · Feb 24, 2026 · Jan 25, 2026 · Jan 25, 2026 · Jan 25, 2026
diff --git a/app/src/main/java/com/umc/edison/presentation/login/GoogleLoginHelper.kt b/app/src/main/java/com/umc/edison/presentation/login/GoogleLoginHelper.kt
@@ -8,8 +8,10 @@ import androidx.credentials.GetCredentialResponse
 import androidx.credentials.exceptions.GetCredentialException
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
+import com.google.firebase.crashlytics.ktx.crashlytics
 import com.umc.edison.BuildConfig
 import com.umc.edison.R
+import com.google.firebase.ktx.Firebase
 import com.umc.edison.common.logging.AppLogger
 import com.umc.edison.common.logging.UserContext
 import com.umc.edison.domain.DataResource
@@ -39,7 +41,7 @@ class GoogleLoginHelper @Inject constructor(
     ) {
         val signInWithGoogleOption = GetGoogleIdOption.Builder()
             .setFilterByAuthorizedAccounts(false)
-            .setServerClientId(context.getString(R.string.google_cloud_server_client_id))
+            .setServerClientId(context.getString(R.string.firebase_config_client_id))
             .setAutoSelectEnabled(true)
             .build()
 
@@ -59,8 +61,17 @@ class GoogleLoginHelper @Inject constructor(
                     is androidx.credentials.exceptions.GetCredentialCancellationException ->
                         GoogleLoginState.ERROR_MESSAGE_CANCELLED
 
-                    else ->
+                    else -> {
+                        AppLogger.e(
+                            "Google SignIn",
+                            "GetCredentialException: ${e.javaClass.simpleName} - ${e.message}",
+                            e
+                        )
+                        Firebase.crashlytics.setCustomKey("google_signin_phase", "get_credential")
+                        Firebase.crashlytics.setCustomKey("google_signin_error_type", e.javaClass.simpleName)
+                        Firebase.crashlytics.setCustomKey("google_signin_error_message", "A credential error occurred.")
-                        Firebase.crashlytics.setCustomKey("google_signin_error_message", "A credential error occurred.")
+                        Firebase.crashlytics.setCustomKey("google_signin_error_message", e.message ?: "A credential error occurred.")
-                        Firebase.crashlytics.setCustomKey("google_signin_error_message", "A credential error occurred.")
+                        Firebase.crashlytics.setCustomKey("google_signin_error_message", e.message ?: "A credential error occurred.")
                         GoogleLoginState.ERROR_MESSAGE_UNKNOWN
+                    }
                 }
                 onResult(GoogleLoginState.Failure(errorMessage))
             }
@@ -98,11 +109,13 @@ class GoogleLoginHelper @Inject constructor(
                         onResult(GoogleLoginState.Failure(GoogleLoginState.ERROR_MESSAGE_INVALID_TOKEN))
                     }
                 } else {
+                    AppLogger.w("Google SignIn", "CustomCredential type mismatch: ${credential.type}")
                     onResult(GoogleLoginState.Failure())
                 }
             }
 
             else -> {
+                AppLogger.w("Google SignIn", "Unknown credential type: ${credential.javaClass.simpleName}")
                 onResult(GoogleLoginState.Failure())
             }
         }

diff --git a/app/src/main/java/com/umc/edison/remote/di/NetworkModule.kt b/app/src/main/java/com/umc/edison/remote/di/NetworkModule.kt
@@ -78,12 +78,14 @@ object NetworkModule {
     @Singleton
     fun provideRefreshRetrofit(
         httpLoggingInterceptor: HttpLoggingInterceptor,
+        hostSelectionInterceptor: HostSelectionInterceptor,
         gsonConverterFactory: GsonConverterFactory
     ): Retrofit {
         val okHttpClient = OkHttpClient.Builder()
             .connectTimeout(TIME_OUT.toLong(), TimeUnit.SECONDS)
             .readTimeout(TIME_OUT.toLong(), TimeUnit.SECONDS)
             .writeTimeout(TIME_OUT.toLong(), TimeUnit.SECONDS)
+            .addInterceptor(hostSelectionInterceptor)
             .addInterceptor(httpLoggingInterceptor)
             .build()
 
@@ -93,4 +95,4 @@ object NetworkModule {
             .client(okHttpClient)
             .build()
     }
-}
+}
diff --git a/app/src/main/java/com/umc/edison/remote/model/login/SignUpRequest.kt b/app/src/main/java/com/umc/edison/remote/model/login/SignUpRequest.kt
@@ -9,4 +9,4 @@ data class SignUpRequest (
     val nickname: String,
     @SerializedName("identities")
     val identity: List<SetIdentityKeywordRequest>
-)
+)
diff --git a/app/src/main/java/com/umc/edison/remote/model/login/SignUpResponse.kt b/app/src/main/java/com/umc/edison/remote/model/login/SignUpResponse.kt
@@ -15,8 +15,8 @@ data class SignUpResponse(
     val accessToken: String,
     @SerializedName("refreshToken")
     val refreshToken: String,
-    @SerializedName("identity")
-    val identity: IdentityResponse
+    @SerializedName("identities")
+    val identities: List<IdentityResponse>
 ): RemoteMapper<UserWithTokenEntity> {
     override fun toData(): UserWithTokenEntity =
         UserWithTokenEntity(

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="bubble">버블</string>
     <string name="artboard">아트보드</string>
     <string name="my">마이</string>
-    <string name="google_cloud_server_client_id">574560748765-f7gcudpd69caa8otl671d7apipjqg7er.apps.googleusercontent.com</string>
+    <string name="firebase_config_client_id">669429282923-8cfddnme5mtcfb25r2o3md9eaepnd2m9.apps.googleusercontent.com</string>
     <string name="login_require_title">로그인이 필요한 페이지입니다</string>
     <string name="login_require_detail">로그인으로 더 안전하게 아이디어를 보관하세요!</string>
     <string name="login_require_title_hint">스페이스 자동 시각화 기능 지원\n맞춤형 레터 추천과 북마크 기능 지원</string>