.gitignore

@@ -1,5 +1,6 @@
 .gradle/
 .idea/
+.vscode/
 bin/
 build/
 *.iml
@@ -23,3 +24,10 @@ GoogleSignInPlugin/Assets/Plugins/iOS/client*.plist*
 
 Assembly-CSharp-Editor.csproj
 Assembly-CSharp.csproj
+
+# don't check in the binaries that are built (for now)
+staging/native/google-signin-cpp
+
+# don't check in iOS pod generated content
+contents.xcworkspacedata
+staging/native/testapp/testapp.xcodeproj/project.xcworkspace/xcuserdata

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml

@@ -3,36 +3,11 @@
   <!-- See https://github.com/googlesamples/unity-jar-resolver#usage for
     how to configure dependencies -->
   <androidPackages>
-    <!-- Internal library dependency. -->
-    <androidPackage spec="com.google.signin:google-signin-support:1+">
-      <repositories>
-        <repository>Assets/GoogleSignIn/Editor/m2repository</repository>
-      </repositories>
-    </androidPackage>
-    <!--- Auth  THIS IS ALWAYS REQUIRED -->
-    <!-- The dependency is actually on 10.2, but 10+ is close enough.
-         If you have problems, please change this to a concrete value.
-    -->
-    <androidPackage spec="com.google.android.gms:play-services-auth:10+">
-      <androidSdkPackageIds>
-        <androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
-      </androidSdkPackageIds>
-    </androidPackage>
-
-    <!-- IF YOU ARE USING THE GAMES_CONFIG TO SIGN-IN, YOU NEED TO
-           UNCOMMENT THIS DEPENDENCY!!
-
-            This is only used if you need to add play-services-games to your
-            project.
-    -->
-    <!--
-    <androidPackage spec="com.google.android.gms:play-services-games:10+">
+    <androidPackage spec="com.google.android.gms:play-services-auth:16+">
       <androidSdkPackageIds>
         <androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
       </androidSdkPackageIds>
     </androidPackage>
-    -->
-
   </androidPackages>
 
   <!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt

@@ -0,0 +1,27 @@
+Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1
+Assets/GoogleSignIn/Future.cs
+Assets/GoogleSignIn/GoogleSignIn.cs
+Assets/GoogleSignIn/GoogleSignInConfiguration.cs
+Assets/GoogleSignIn/GoogleSignInStatusCode.cs
+Assets/GoogleSignIn/GoogleSignInUser.cs
+Assets/GoogleSignIn/Impl/BaseObject.cs
+Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
+Assets/GoogleSignIn/Impl/NativeFuture.cs
+Assets/GoogleSignIn/Impl/SignInHelperObject.cs
+Assets/Parse/LICENSE
+Assets/Parse/Plugins/Unity.Compat.dll
+Assets/Parse/Plugins/Unity.Tasks.dll
+Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll
+Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll
+Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt
+Assets/Plugins/Android/native-googlesignin-release.aar
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignIn.cs

@@ -66,7 +66,7 @@ static GoogleSignIn() {
     public static GoogleSignInConfiguration Configuration {
       set {
         // Can set the configuration until the singleton is created.
-        if (theInstance == null || theConfiguration == value) {
+        if (theInstance == null || theConfiguration == value || theConfiguration == null) {
           theConfiguration = value;
         } else {
           throw new SignInException(GoogleSignInStatusCode.DeveloperError,
@@ -141,6 +141,7 @@ public Task<GoogleSignInUser> SignInSilently() {
     /// account to use when signing in.
     /// </remarks>
     public void SignOut() {
+      theConfiguration = null;
       impl.SignOut();
     }
 

GoogleSignInPlugin/Assets/GoogleSignIn/Impl/NativeFuture.cs

@@ -65,10 +65,16 @@ public GoogleSignInUser Result {
               GoogleSignInImpl.GoogleSignIn_GetIdToken(userPtr, out_string,
                                                        out_size));
 
+          user.AuthCode = OutParamsToString((out_string, out_size) =>
+              GoogleSignInImpl.GoogleSignIn_GetServerAuthCode(userPtr, out_string,
+                                                              out_size));
+
           string url = OutParamsToString((out_string, out_size) =>
               GoogleSignInImpl.GoogleSignIn_GetImageUrl(userPtr, out_string,
                                                         out_size));
-          user.ImageUrl = new System.Uri(url);
+          if (url.Length > 0) {
+            user.ImageUrl = new System.Uri(url);
+          }
 
           user.UserId = OutParamsToString((out_string, out_size) =>
               GoogleSignInImpl.GoogleSignIn_GetUserId(userPtr, out_string,
@@ -93,4 +99,4 @@ public GoogleSignInStatusCode Status {
       }
     }
   }
-}
+}

GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#import <GoogleSignIn/GIDSignIn.h>
+@interface GoogleSignInHandler
+    : NSObject <GIDSignInDelegate, GIDSignInUIDelegate>
+
+@end