Merge branch 'pr/28' into upm

Author: VirtueSky

Plugins/iOS/GoogleSignIn.h

@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 #import <GoogleSignIn/GIDSignIn.h>
-#import <GoogleSignIn/GIDConfiguration.h>
 
 @interface GoogleSignInHandler : NSObject
 {
-    @public
-    GIDConfiguration* signInConfiguration;
-
     @public
     NSString* loginHint;
 

Plugins/iOS/GoogleSignIn.mm

@@ -18,6 +18,7 @@
 #import <GoogleSignIn/GIDGoogleUser.h>
 #import <GoogleSignIn/GIDProfileData.h>
 #import <GoogleSignIn/GIDSignIn.h>
+#import <GoogleSignIn/GIDConfiguration.h>
 #import <GoogleSignIn/GIDToken.h>
 #import <UnityAppController.h>
 
@@ -184,14 +185,11 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
                             bool requestIdToken, bool hidePopups,
                             const char **additionalScopes, int scopeCount,
                             const char *accountName) {
-    NSString *path = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];
-    NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path];
-    NSString *clientId = [dict objectForKey:@"CLIENT_ID"];
-    GIDConfiguration* config = [[GIDConfiguration alloc] initWithClientID:clientId];
     if (webClientId) {
-      config = [[GIDConfiguration alloc] initWithClientID:clientId serverClientID:[NSString stringWithUTF8String:webClientId]];
+      NSLog(@"Configure webClientId at runtime");
+      GIDConfiguration* config = [GIDSignIn sharedInstance].configuration;
+      [GIDSignIn sharedInstance].configuration = [[GIDConfiguration alloc] initWithClientID:config.clientID serverClientID:[NSString stringWithUTF8String:webClientId] hostedDomain:config.hostedDomain openIDRealm:config.openIDRealm];
     }
-    [GoogleSignInHandler sharedInstance]->signInConfiguration = config;
 
     int scopeSize = scopeCount;
     if (scopeSize) {