From bea8b48e05caec564654ec4666404247963b9b55 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 11 Mar 2021 14:43:52 +0200
Subject: [PATCH] Build

---
 lib/utils/oauth.dart | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/utils/oauth.dart b/lib/utils/oauth.dart
index fc147e8d4..0d73d2e77 100644
--- a/lib/utils/oauth.dart
+++ b/lib/utils/oauth.dart
@@ -14,26 +14,36 @@ void googleSignIn(Function(String, String, String) callback,
   GoogleSignInAccount account;
 
   if (isSilent) {
-    account = await _googleSignIn.signInSilently();
+    account = await _googleSignIn.signInSilently().catchError((Object error) {
+      print('## 1 CATCH ERROR: $error');
+    }).onError((Object error, stackTrace) {
+      print('## 1 ON ERROR: $error');
+      return null;
+    });
   }
 
-  account ??= await _googleSignIn.signIn();
+  account ??= await _googleSignIn.signIn().catchError((Object error) {
+    print('## 2 CATCH ERROR: $error');
+  }).onError((Object error, stackTrace) {
+    print('## 2 ON ERROR: $error');
+    return null;
+  });
 
-  if (account == null) {
-    print('## Error: Google sign in failed');
-  } else {
+  if (account != null) {
     account.authentication.then((GoogleSignInAuthentication value) {
       callback(value.idToken, value.accessToken, value.serverAuthCode);
     });
+  } else {
+    throw 'Error: sign in failed';
   }
 }
 
 void googleSignUp(Function(String, String, String) callback) async {
   final account =
       await _googleSignIn.grantOfflineAccess().catchError((Object error) {
-    print('## CATCH ERROR: $error');
+    print('## 3 CATCH ERROR: $error');
   }).onError((Object error, stackTrace) {
-    print('## ON ERROR: $error');
+    print('## 3 ON ERROR: $error');
     return null;
   });
   if (account != null) {
@@ -41,7 +51,7 @@ void googleSignUp(Function(String, String, String) callback) async {
       callback(value.idToken, value.accessToken, value.serverAuthCode);
     });
   } else {
-    print('## Error: Google sign up failed');
+    throw 'Error: sign up failed';
   }
 }