Clean Up + Fixes

Author: calumma-robert

GoogleSignIn/Future.cs

@@ -55,14 +55,14 @@ internal Future(FutureAPIImpl<T> impl) {
     /// Gets the status.
     /// </summary>
     /// <value>The status is set when Pending == false.</value>
-    GoogleSignInStatusCode Status { get { return apiImpl.Status; } }
+    public GoogleSignInStatusCode Status { get { return apiImpl.Status; } }
 
     /// <summary>
     /// Gets the result.
     /// </summary>
     /// <value>The result is set when Pending == false and there is no error.
     /// </value>
-    T Result { get { return apiImpl.Result; } }
+    public T Result { get { return apiImpl.Result; } }
 
     /// <summary>
     /// Waits for result then completes the TaskCompleationSource.
@@ -71,6 +71,21 @@ internal Future(FutureAPIImpl<T> impl) {
     /// <param name="tcs">Tcs.</param>
     internal IEnumerator WaitForResult(TaskCompletionSource<T> tcs) {
       yield return new WaitUntil(() => !Pending);
+      yield return null;
+      if (Status == GoogleSignInStatusCode.CANCELED) {
+        tcs.SetCanceled();
+      } else if (Status == GoogleSignInStatusCode.SUCCESS ||
+            Status == GoogleSignInStatusCode.SUCCESS_CACHE) {
+        tcs.SetResult(Result);
+      } else {
+        tcs.SetException(new GoogleSignIn.SignInException(Status));
+      }
+    }
+
+    internal async Task WaitForResultAsync(TaskCompletionSource<T> tcs)
+    {
+      while (Pending) await Task.Yield();
+      await Task.Yield();
       if (Status == GoogleSignInStatusCode.CANCELED) {
         tcs.SetCanceled();
       } else if (Status == GoogleSignInStatusCode.SUCCESS ||

GoogleSignIn/GoogleSignIn.cs

@@ -123,6 +123,14 @@ public Task<GoogleSignInUser> SignIn() {
       return tcs.Task;
     }
 
+    public Task<GoogleSignInUser> SignInAsync() {
+      var tcs = new TaskCompletionSource<GoogleSignInUser>();
+      impl.SignIn().WaitForResultAsync(tcs);
+      return tcs.Task;
+    }
+
+    public Future<GoogleSignInUser> SignInFuture() => impl.SignIn();
+
     /// <summary>Starts the silent authentication process.</summary>
     /// <remarks>
     /// The authenication process is started and will attempt to sign in without
@@ -136,6 +144,14 @@ public Task<GoogleSignInUser> SignInSilently() {
       return tcs.Task;
     }
 
+    public Task<GoogleSignInUser> SignInSilentlyAsync() {
+      var tcs = new TaskCompletionSource<GoogleSignInUser>();
+      impl.SignInSilently().WaitForResultAsync(tcs);
+      return tcs.Task;
+    }
+
+    public Future<GoogleSignInUser> SignInSilentlyFuture() => impl.SignInSilently();
+
     /// <summary>
     /// Signs out the User.
     /// </summary>

GoogleSignIn/Impl/GoogleSignInImpl.cs

@@ -1,4 +1,5 @@
-// <copyright file="GoogleSignInImpl.cs" company="Google Inc.">
+#if UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS
+// <copyright file="GoogleSignInImpl.cs" company="Google Inc.">
 // Copyright (C) 2017 Google Inc. All Rights Reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -358,3 +359,4 @@ public static AndroidJavaObject ToAndroidJavaObject(in this IntPtr intPtr)
     }
   }
 }
+#endif

GoogleSignIn/Impl/GoogleSignInImplEditor.cs

@@ -62,6 +62,8 @@ static HttpListener BindLocalHostFirstAvailablePort()
 #if UNITY_EDITOR_WIN
       var listeners = IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners();
       return Enumerable.Range(minPort, ushort.MaxValue - minPort).Where((i) => !listeners.Any((x) => x.Port == i)).Select((port) => {
+#elif UNITY_EDITOR_OSX
+      return Enumerable.Range(minPort, ushort.MaxValue - minPort).Select((port) => {
 #else
       return Enumerable.Range(0,10).Select((i) => UnityEngine.Random.Range(minPort,ushort.MaxValue)).Select((port) => {
 #endif

GoogleSignIn/Impl/NativeFuture.cs

@@ -1,4 +1,5 @@
-// <copyright file="NativeFuture.cs" company="Google Inc.">
+#if UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS
+// <copyright file="NativeFuture.cs" company="Google Inc.">
 // Copyright (C) 2017 Google Inc. All Rights Reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,3 +88,4 @@ public GoogleSignInStatusCode Status {
     }
   }
 }
+#endif

Plugins/Android/src/main/java/com/google/googlesignin/TokenPendingResult.java

@@ -22,6 +22,7 @@
 import com.google.android.gms.common.api.ResultCallback;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.Locale;
 
 /**
  * Pending result class for TokenResult. This allows the pending result to be returned to the
@@ -41,6 +42,12 @@ public TokenPendingResult(IListener requestHandle) {
     result = new TokenResult();
     result.setHandle(requestHandle);
   }
+    
+  @Override
+  public String toString() {
+    return String.format(
+        Locale.getDefault(), "Pending Result: %s", (result == null) ? "<null>" : result);
+  }
 
   @Override
   public TokenResult await() {

package.json

@@ -1,7 +1,8 @@
 {
     "name": "com.google.signin",
     "displayName": "Google Signin",
-    "version": "0.8.0",
+    "author": "Robert Lehmann",
+    "version": "0.8.1",
     "unity": "2021.3",
     "description": "Google Signin for android, ios ,desktop",
     "keywords": [
@@ -19,4 +20,4 @@
             "path": "Samples~/SignInSample"
         }
     ]
-}
+}