From 5be9c4de23ca6dfd687feb8c9629e0d25a858e4a Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Tue, 23 Aug 2022 23:42:00 -0700
Subject: [PATCH] set error message if google auth on client fails

---
 .../app/omnivore/omnivore/ui/auth/GoogleAuth.kt   |  2 ++
 .../omnivore/omnivore/ui/auth/LoginViewModel.kt   |  4 ++++
 .../omnivore/omnivore/ui/auth/WelcomeScreen.kt    | 15 ++++++++-------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
index 853787007..524e2941f 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
@@ -36,6 +36,8 @@ fun GoogleAuthButton(viewModel: LoginViewModel) {
           val task: Task<GoogleSignInAccount> = GoogleSignIn.getSignedInAccountFromIntent(intent)
           viewModel.handleGoogleAuthTask(task)
         }
+      } else {
+        viewModel.showGoogleErrorMessage()
       }
     }
 
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
index b9186ed13..779fe3b4a 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
@@ -77,6 +77,10 @@ class LoginViewModel @Inject constructor(
     errorMessage = null
   }
 
+  fun showGoogleErrorMessage() {
+    errorMessage = "Failed to authenticate with Google."
+  }
+
   fun handleGoogleAuthTask(task: Task<GoogleSignInAccount>) {
     val googleIdToken = task?.getResult(ApiException::class.java).idToken
     Log.d(ContentValues.TAG, "Google Result?: $googleIdToken")
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
index dadfd961f..7247c2b8f 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
@@ -131,13 +131,14 @@ fun AuthProviderView(
         GoogleAuthButton(viewModel)
       }
 
-      LoadingButtonWithIcon(
-        text = "Continue with Apple",
-        loadingText = "Signing in...",
-        icon = painterResource(id = R.drawable.ic_logo_apple),
-        modifier = Modifier.padding(vertical = 6.dp),
-        onClick = {}
-      )
+      // Disable apple auth for now
+//      LoadingButtonWithIcon(
+//        text = "Continue with Apple",
+//        loadingText = "Signing in...",
+//        icon = painterResource(id = R.drawable.ic_logo_apple),
+//        modifier = Modifier.padding(vertical = 6.dp),
+//        onClick = {}
+//      )
 
       ClickableText(
         text = AnnotatedString("Continue with Email ->"),