From 6f9302a61d50b19e6216fa145b65ff25c24fef84 Mon Sep 17 00:00:00 2001
From: Mirko <mirko.menegazzo@gmail.com>
Date: Fri, 16 Jun 2023 18:36:20 +0200
Subject: [PATCH 1/3] Fix #223

---
 .../java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
index d700c3b..84932d0 100644
--- a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
+++ b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
@@ -61,6 +61,7 @@ public void load() {
 
     GoogleSignInOptions.Builder googleSignInBuilder = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
             .requestIdToken(clientId)
+            .requestServerAuthCode(clientId)
             .requestEmail();
 
     if (forceCodeForRefreshToken) {

From 0fd032f4eac9a84c9fca62951fbe365e992ebba8 Mon Sep 17 00:00:00 2001
From: Mirko <mirko.menegazzo@gmail.com>
Date: Mon, 19 Jun 2023 17:33:18 +0200
Subject: [PATCH 2/3] Fix #272, #55

---
 .../capacitor/GoogleAuth/GoogleAuth.java        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
index 84932d0..dadc9ec 100644
--- a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
+++ b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
@@ -36,6 +36,8 @@
 import java.net.URL;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.OnFailureListener;
 
 @CapacitorPlugin()
 public class GoogleAuth extends Plugin {
@@ -141,8 +143,19 @@ public void refresh(final PluginCall call) {
 
   @PluginMethod()
   public void signOut(final PluginCall call) {
-    googleSignInClient.signOut();
-    call.resolve();
+    googleSignInClient.signOut()
+      .addOnSuccessListener(getActivity(), new OnSuccessListener<Void>() {
+        @Override
+          public void onSuccess(Void aVoid) {
+            call.resolve();
+          }
+      })
+      .addOnFailureListener(getActivity(), new OnFailureListener() {
+        @Override
+          public void onFailure(Exception e) {
+            call.reject("Sign out failed", e);
+          }
+      });
   }
 
   @PluginMethod()

From 39e3ad7f4dee8e26e638dea35486c71eed99f8f1 Mon Sep 17 00:00:00 2001
From: Mirko <mirko.menegazzo@gmail.com>
Date: Mon, 19 Jun 2023 17:34:10 +0200
Subject: [PATCH 3/3] Revert "Fix #223"

This reverts commit 6f9302a61d50b19e6216fa145b65ff25c24fef84.
---
 .../java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
index dadc9ec..80eb03e 100644
--- a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
+++ b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java
@@ -63,7 +63,6 @@ public void load() {
 
     GoogleSignInOptions.Builder googleSignInBuilder = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
             .requestIdToken(clientId)
-            .requestServerAuthCode(clientId)
             .requestEmail();
 
     if (forceCodeForRefreshToken) {