Merge pull request #159 from SOLPLY/feature/#155-google-login

ImHyungsuk · web-flow · commit afd89918c2a3 · 2026-01-12T21:11:57.000+09:00
Feature/#155 google login
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,7 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * extends com.google.gson.TypeAdapter
+-keep class com.google.googlesignin.** { *; }
diff --git a/build-logic/convention/src/main/java/com/teamsolply/solply/convention/BuildConfig.kt b/build-logic/convention/src/main/java/com/teamsolply/solply/convention/BuildConfig.kt
@@ -34,6 +34,11 @@ internal fun Project.configureBuildConfig(
                 "NAVER_DEVELOPERS_CLIENT_SECRET",
                 gradleLocalProperties(rootDir, providers).getProperty("naver.developers.client.secret")
             )
+            buildConfigField(
+                "String",
+                "GOOGLE_WEB_CLIENT_ID",
+                gradleLocalProperties(rootDir, providers).getProperty("google.web.client.id")
+            )
         }
 
         buildFeatures {
diff --git a/core/buildconfig/src/main/java/com/teamsolply/solply/buildconfig/impl/BuildConfigFieldsProviderImpl.kt b/core/buildconfig/src/main/java/com/teamsolply/solply/buildconfig/impl/BuildConfigFieldsProviderImpl.kt
@@ -1,6 +1,7 @@
 package com.teamsolply.solply.buildconfig.impl
 
 import com.teamsolply.solply.buildconfig.BuildConfig.BASE_URL
+import com.teamsolply.solply.buildconfig.BuildConfig.GOOGLE_WEB_CLIENT_ID
 import com.teamsolply.solply.buildconfig.BuildConfig.KAKAO_NATIVE_KEY
 import com.teamsolply.solply.buildconfig.BuildConfig.NAVER_CLIENT_ID
 import com.teamsolply.solply.buildconfig.BuildConfig.NAVER_DEVELOPERS_CLIENT_ID
@@ -14,6 +15,7 @@ class BuildConfigFieldsProviderImpl @Inject constructor() : BuildConfigFieldProv
         BuildConfigFields(
             baseUrl = BASE_URL,
             kakaoNativeKey = KAKAO_NATIVE_KEY,
+            googleWebClientId = GOOGLE_WEB_CLIENT_ID,
             naverClientId = NAVER_CLIENT_ID,
             naverDevelopersClientId = NAVER_DEVELOPERS_CLIENT_ID,
             naverDevelopersClientSecret = NAVER_DEVELOPERS_CLIENT_SECRET,
diff --git a/core/common/src/main/java/com/teamsolply/solply/common/buildconfig/BuildConfigFields.kt b/core/common/src/main/java/com/teamsolply/solply/common/buildconfig/BuildConfigFields.kt
@@ -3,6 +3,7 @@ package com.teamsolply.solply.common.buildconfig
 data class BuildConfigFields(
     val baseUrl: String,
     val kakaoNativeKey: String,
+    val googleWebClientId: String,
     val naverClientId: String,
     val naverDevelopersClientId: String,
     val naverDevelopersClientSecret: String,
diff --git a/feature/mypage/src/main/java/com/teamsolply/solply/mypage/profile/ProfileEditScreen.kt b/feature/mypage/src/main/java/com/teamsolply/solply/mypage/profile/ProfileEditScreen.kt
@@ -127,7 +127,7 @@ fun ProfileEditScreen(
             onBackButtonClick = onBackButtonClick
         )
         Spacer(
-            modifier = Modifier.weight(1f)
+            modifier = Modifier.height(16.dp)
         )
         Image(
             painter = painterResource(R.drawable.img_basic_profile),
@@ -138,7 +138,7 @@ fun ProfileEditScreen(
                 .clip(CircleShape),
             contentScale = ContentScale.Fit
         )
-        Spacer(modifier = Modifier.weight(2f))
+        Spacer(modifier = Modifier.height(32.dp))
         Column(
             modifier = Modifier.padding(horizontal = 16.dp),
             verticalArrangement = Arrangement.Top,
@@ -166,7 +166,7 @@ fun ProfileEditScreen(
                 modifier = Modifier.padding(top = 12.dp)
             )
         }
-        Spacer(modifier = Modifier.weight(1.5f))
+        Spacer(modifier = Modifier.height(24.dp))
         Column(
             modifier = Modifier.padding(horizontal = 16.dp),
             verticalArrangement = Arrangement.Top,
diff --git a/feature/oauth/build.gradle.kts b/feature/oauth/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.teamsolply.solply.convention.extension.implementation
+
 plugins {
     alias(libs.plugins.solply.feature)
 }
@@ -8,5 +10,9 @@ android {
 
 dependencies {
     implementation(libs.kakao.login)
+    implementation(libs.google.id)
+    implementation(libs.credentials.play.auth)
+    implementation(libs.credentials)
     implementation(projects.domain.oauth)
+    implementation(projects.core.buildconfig)
 }
diff --git a/feature/oauth/src/main/java/com/teamsolply/solply/oauth/GoogleLoginHelper.kt b/feature/oauth/src/main/java/com/teamsolply/solply/oauth/GoogleLoginHelper.kt
@@ -0,0 +1,88 @@
+package com.teamsolply.solply.oauth
+
+import android.content.Context
+import android.util.Log
+import androidx.credentials.CredentialManager
+import androidx.credentials.CustomCredential
+import androidx.credentials.GetCredentialRequest
+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.android.libraries.identity.googleid.GoogleIdTokenParsingException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.util.UUID
+
+class GoogleLoginHelper(
+    private val context: Context
+) {
+
+    companion object {
+        const val TAG = "GoogleLogin"
+        const val WEB_CLIENT_ID = com.teamsolply.solply.buildconfig.BuildConfig.GOOGLE_WEB_CLIENT_ID
+        // const val SERVER_URL = ""
+    }
+
+    private val credentialManager: CredentialManager = CredentialManager.create(context)
+    private val nonce = UUID.randomUUID().toString()
+    private val googleIdOption: GetGoogleIdOption = GetGoogleIdOption.Builder()
+        .setServerClientId(WEB_CLIENT_ID) // 웹 클라이언트 ID
+        .setFilterByAuthorizedAccounts(false)
+//        .setNonce(nonce)
+        .build()
+    private val request: GetCredentialRequest = GetCredentialRequest.Builder()
+        .addCredentialOption(googleIdOption)
+        .build()
+    private val coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.Main)
+
+    fun requestGoogleLogin(
+        onSuccess: (String) -> Unit,
+        onFailure: (String) -> Unit
+    ) {
+        coroutineScope.launch {
+            try {
+                val result = credentialManager.getCredential(
+                    request = request,
+                    context = context
+                )
+                handleSignInResult(result, onSuccess, onFailure)
+            } catch (e: GetCredentialException) {
+                Log.e("Google Sign-in failed", " ${e.localizedMessage}")
+            }
+        }
+    }
+
+    private fun handleSignInResult(
+        result: GetCredentialResponse,
+        onSuccess: (String) -> Unit,
+        onFailure: (String) -> Unit
+    ) {
+        when (val credential = result.credential) {
+            is CustomCredential -> {
+                if (credential.type == GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL) {
+                    try {
+                        val googleIdTokenCredential =
+                            GoogleIdTokenCredential.createFrom(credential.data)
+                        val idToken = googleIdTokenCredential.idToken
+//                        Log.d(TAG, idToken) //토큰
+//                        Log.d(TAG, googleIdTokenCredential.id) //이메일
+//                        googleIdTokenCredential.displayName?.let { Log.d(TAG, it) } //이름
+                        onSuccess(idToken) // 성공 시 처리 함수, 서버 응답 후 실행, 여기서는 테스트를 위해 이곳에서 실행
+                    } catch (e: GoogleIdTokenParsingException) {
+//                        Log.e(TAG, "Received an invalid google id token response", e)
+                    }
+                } else {
+//                    Log.e(TAG, "Unexpected type of credential")
+                    onFailure("구글 로그인에 실패하였습니다. 다시 시도해주세요.")
+                }
+            }
+
+            else -> {
+//                Log.e(TAG, "Unexpected type of credential")
+                onFailure("구글 로그인에 실패하였습니다. 다시 시도해주세요.")
+            }
+        }
+    }
+}
diff --git a/feature/oauth/src/main/java/com/teamsolply/solply/oauth/OauthContract.kt b/feature/oauth/src/main/java/com/teamsolply/solply/oauth/OauthContract.kt
@@ -12,6 +12,9 @@ sealed interface OauthIntent : UiIntent {
     data object KakaoLoginClick : OauthIntent
     data class KakaoLoginSuccess(val provider: String, val accessToken: String) : OauthIntent
     data class KakaoLoginFailure(val error: Throwable) : OauthIntent
+    data object GoogleLoginClick : OauthIntent
+    data class GoogleLoginSuccess(val provider: String, val accessToken: String) : OauthIntent
+    data class GoogleLoginFailure(val error: Throwable) : OauthIntent
     data class SaveJwtToken(
         val accessToken: String,
         val refreshToken: String,
@@ -21,6 +24,7 @@ sealed interface OauthIntent : UiIntent {
 
 sealed interface OauthSideEffect : SideEffect {
     data object StartKakaoLogin : OauthSideEffect
+    data object StartGoogleLogin : OauthSideEffect
     data object NavigateToOnBoarding : OauthSideEffect
     data object NavigateToPlace : OauthSideEffect
 }
diff --git a/feature/oauth/src/main/java/com/teamsolply/solply/oauth/OauthScreen.kt b/feature/oauth/src/main/java/com/teamsolply/solply/oauth/OauthScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -46,6 +47,7 @@ fun OauthRoute(
     viewModel: OauthViewModel = hiltViewModel()
 ) {
     val context = LocalContext.current
+    val googleLoginHelper = remember { GoogleLoginHelper(context = context) }
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     LaunchedEffectWithLifecycle {
@@ -63,20 +65,46 @@ fun OauthRoute(
                     }
                 )
 
+                OauthSideEffect.StartGoogleLogin -> googleLoginHelper.requestGoogleLogin(
+                    onSuccess = { accessToken ->
+                        viewModel.sendIntent(
+                            OauthIntent.GoogleLoginSuccess(
+                                provider = "GOOGLE",
+                                accessToken = accessToken
+                            )
+                        )
+                    },
+                    onFailure = {}
+                )
+
                 OauthSideEffect.NavigateToOnBoarding -> navigateToOnBoarding()
                 OauthSideEffect.NavigateToPlace -> navigateToPlace()
             }
         }
     }
 
     OauthScreen(
-        kakaoLoginClick = { viewModel.sendIntent(OauthIntent.KakaoLoginClick) }
+        kakaoLoginClick = { viewModel.sendIntent(OauthIntent.KakaoLoginClick) },
+        googleLoginClick = {
+            googleLoginHelper.requestGoogleLogin(
+                onSuccess = { accessToken ->
+                    viewModel.sendIntent(
+                        OauthIntent.GoogleLoginSuccess(
+                            provider = "GOOGLE",
+                            accessToken = accessToken
+                        )
+                    )
+                },
+                onFailure = {}
+            )
+        }
     )
 }
 
 @Composable
 fun OauthScreen(
     kakaoLoginClick: () -> Unit,
+    googleLoginClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -157,7 +185,7 @@ fun OauthScreen(
                 .customClickable(
                     rippleEnabled = false
                 ) {
-                    kakaoLoginClick()
+                    googleLoginClick()
                 },
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Start
diff --git a/feature/oauth/src/main/java/com/teamsolply/solply/oauth/OauthViewModel.kt b/feature/oauth/src/main/java/com/teamsolply/solply/oauth/OauthViewModel.kt
@@ -24,6 +24,17 @@ class OauthViewModel @Inject constructor(
                 TODO()
             }
 
+            OauthIntent.GoogleLoginClick -> postSideEffect(OauthSideEffect.StartGoogleLogin)
+
+            is OauthIntent.GoogleLoginSuccess -> postSocialLogin(
+                provider = intent.provider,
+                oauthAccessToken = intent.accessToken
+            )
+
+            is OauthIntent.GoogleLoginFailure -> {
+                TODO()
+            }
+
             is OauthIntent.SaveJwtToken -> {
                 viewModelScope.launch {
                     oauthRepository.saveJwtToken(
diff --git a/feature/oauth/src/main/res/values/strings.xml b/feature/oauth/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="kakao_login">카카오로 계속하기</string>
     <string name="google_login">Google로 계속하기</string>
+    <string name="apple_login">Apple로 계속하기</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -90,6 +90,8 @@ coil = "2.7.0"
 lottie = "6.4.1"
 jsoup = "1.17.2"
 kakao-login = "2.19.0"
+credentials = "1.6.0-beta03"
+googleid = "1.1.1"
 process-pheonix = "3.0.0"
 preference = "1.2.1"
 collapsing-toolbar = "2.3.5"
@@ -253,6 +255,11 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref = "lottie"
 lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref = "lottie" }
 jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 kakao-login = { group = "com.kakao.sdk", name = "v2-user", version.ref = "kakao-login" }
+
+credentials = { module = "androidx.credentials:credentials", version.ref = "credentials" }
+credentials-play-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "credentials" }
+google-id = { module = "com.google.android.libraries.identity.googleid:googleid", version.ref = "googleid" }
+
 process-phoenix = { module = "com.jakewharton:process-phoenix", version.ref = "process-pheonix" }
 collapsing-toolbar = { group = "me.onebone", name = "toolbar-compose", version.ref = "collapsing-toolbar" }
 androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ internal fun Project.configureBuildConfig(`
`34`	`34`	`"NAVER_DEVELOPERS_CLIENT_SECRET",`
`35`	`35`	`gradleLocalProperties(rootDir, providers).getProperty("naver.developers.client.secret")`
`36`	`36`	`)`
	`37`	`+ buildConfigField(`
	`38`	`+ "String",`
	`39`	`+ "GOOGLE_WEB_CLIENT_ID",`
	`40`	`+ gradleLocalProperties(rootDir, providers).getProperty("google.web.client.id")`
	`41`	`+ )`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`buildFeatures {`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ fun ProfileEditScreen(`
`127`	`127`	`onBackButtonClick = onBackButtonClick`
`128`	`128`	`)`
`129`	`129`	`Spacer(`
`130`		`- modifier = Modifier.weight(1f)`
	`130`	`+ modifier = Modifier.height(16.dp)`
`131`	`131`	`)`
`132`	`132`	`Image(`
`133`	`133`	`painter = painterResource(R.drawable.img_basic_profile),`
`@@ -138,7 +138,7 @@ fun ProfileEditScreen(`
`138`	`138`	`.clip(CircleShape),`
`139`	`139`	`contentScale = ContentScale.Fit`
`140`	`140`	`)`
`141`		`- Spacer(modifier = Modifier.weight(2f))`
	`141`	`+ Spacer(modifier = Modifier.height(32.dp))`
`142`	`142`	`Column(`
`143`	`143`	`modifier = Modifier.padding(horizontal = 16.dp),`
`144`	`144`	`verticalArrangement = Arrangement.Top,`
`@@ -166,7 +166,7 @@ fun ProfileEditScreen(`
`166`	`166`	`modifier = Modifier.padding(top = 12.dp)`
`167`	`167`	`)`
`168`	`168`	`}`
`169`		`- Spacer(modifier = Modifier.weight(1.5f))`
	`169`	`+ Spacer(modifier = Modifier.height(24.dp))`
`170`	`170`	`Column(`
`171`	`171`	`modifier = Modifier.padding(horizontal = 16.dp),`
`172`	`172`	`verticalArrangement = Arrangement.Top,`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import com.teamsolply.solply.convention.extension.implementation`
	`2`	`+`
`1`	`3`	`plugins {`
`2`	`4`	`alias(libs.plugins.solply.feature)`
`3`	`5`	`}`
`@@ -8,5 +10,9 @@ android {`
`8`	`10`
`9`	`11`	`dependencies {`
`10`	`12`	`implementation(libs.kakao.login)`
	`13`	`+ implementation(libs.google.id)`
	`14`	`+ implementation(libs.credentials.play.auth)`
	`15`	`+ implementation(libs.credentials)`
`11`	`16`	`implementation(projects.domain.oauth)`
	`17`	`+ implementation(projects.core.buildconfig)`
`12`	`18`	`}`