fix(google-sign-in): fix google sign in option

SUITEDEV-35599 Co-authored-by: megamegax <[email protected]> Co-authored-by: kovacszsoltizsolt <[email protected]>
emartech · May 2, 2024 · 0600e41 · 0600e41
1 parent 8475b5b
commit 0600e41
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/nightly_e2e_workflow.yml b/.github/workflows/nightly_e2e_workflow.yml
@@ -33,6 +33,7 @@ env:
   SLACK_TITLE: Commit status
   SLACK_USERNAME: Emarsys SDK - Android
   SLACK_WEBHOOK: ${{ secrets.SLACK_MOBILE_TEAM_CI_CHANNEL_WEBHOOK }}
+  FIREBASE_WEB_SERVER_CLIENT_ID: ${{ secrets.FIREBASE_WEB_SERVER_CLIENT_ID }}
 
 jobs:
   Build:

diff --git a/.github/workflows/nightly_workflow.yml b/.github/workflows/nightly_workflow.yml
@@ -37,6 +37,7 @@ env:
   SLACK_TITLE: Nightly build status
   SLACK_USERNAME: Emarsys SDK - Android
   SLACK_WEBHOOK: ${{ secrets.SLACK_MOBILE_TEAM_CI_CHANNEL_WEBHOOK }}
+  FIREBASE_WEB_SERVER_CLIENT_ID: ${{ secrets.FIREBASE_WEB_SERVER_CLIENT_ID }}
 
 jobs:
   Build:

diff --git a/.github/workflows/on_push_workflow.yml b/.github/workflows/on_push_workflow.yml
@@ -40,6 +40,7 @@ env:
   SLACK_TITLE: Commit status
   SLACK_USERNAME: Emarsys SDK - Android
   SLACK_WEBHOOK: ${{ secrets.SLACK_MOBILE_TEAM_CI_CHANNEL_WEBHOOK }}
+  FIREBASE_WEB_SERVER_CLIENT_ID: ${{ secrets.FIREBASE_WEB_SERVER_CLIENT_ID }}
 
 jobs:
   Test:

diff --git a/.github/workflows/release_sample_app_workflow.yml b/.github/workflows/release_sample_app_workflow.yml
@@ -30,6 +30,7 @@ env:
   SLACK_TITLE: Commit status
   SLACK_USERNAME: Emarsys SDK - Android
   SLACK_WEBHOOK: ${{ secrets.SLACK_MOBILE_TEAM_CI_CHANNEL_WEBHOOK }}
+  FIREBASE_WEB_SERVER_CLIENT_ID: ${{ secrets.FIREBASE_WEB_SERVER_CLIENT_ID }}
 
 jobs:
   ReleaseSampleApp:

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -37,6 +37,16 @@ android {
                 )
             }\""
         )
+        buildConfigField(
+            "String",
+            "FIREBASE_WEB_SERVER_CLIENT_ID",
+            "\"${
+                env.fetch(
+                    "FIREBASE_WEB_SERVER_CLIENT_ID",
+                    System.getenv("FIREBASE_WEB_SERVER_CLIENT_ID") ?: ""
+                )
+            }\""
+        )
     }
 
     buildFeatures {

diff --git a/sample/src/main/kotlin/com/emarsys/sample/dashboard/DashboardScreen.kt b/sample/src/main/kotlin/com/emarsys/sample/dashboard/DashboardScreen.kt
@@ -204,7 +204,7 @@ class DashboardScreen(
         } else {
             Emarsys.setAuthenticatedContact(
                 viewModel.getTfContactFieldIdValue().toInt(),
-                account.email!!
+                account.idToken!!
             ) {
                 if (verifyLogin(it, context)) {
                     setupInfoSetContact(context)

diff --git a/sample/src/main/kotlin/com/emarsys/sample/dashboard/GoogleAuthResult.kt b/sample/src/main/kotlin/com/emarsys/sample/dashboard/GoogleAuthResult.kt
@@ -4,14 +4,19 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
+import com.emarsys.sample.BuildConfig
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.tasks.Task
 
 class GoogleAuthResult : ActivityResultContract<Int, Task<GoogleSignInAccount>?>() {
-      override fun createIntent(context: Context, input: Int): Intent =
+    private companion object {
+        const val SERVER_CLIENT_ID = BuildConfig.FIREBASE_WEB_SERVER_CLIENT_ID
+    }
+
+    override fun createIntent(context: Context, input: Int): Intent =
         getGoogleSignInClient(context).signInIntent.putExtra("input", input)
 
     override fun parseResult(resultCode: Int, intent: Intent?): Task<GoogleSignInAccount>? {
@@ -24,6 +29,7 @@ class GoogleAuthResult : ActivityResultContract<Int, Task<GoogleSignInAccount>?>
     private fun getGoogleSignInClient(context: Context): GoogleSignInClient {
         val signInOptions = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
             .requestEmail()
+            .requestIdToken(SERVER_CLIENT_ID)
             .build()
 
         return GoogleSignIn.getClient(context, signInOptions)