feat: 修改GoogleSignIn.mm及GoogleSignInAppController.mm

由原本的@"CLIENT_ID"改為直接寫入.plist內的CLIENT_ID

issue #6

Author: 盧彥辰

Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm

@@ -223,26 +223,47 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
  * Sign-In.  The return value is a pointer to the currentResult object.
  */
 void *GoogleSignIn_SignIn() {
-  SignInResult *result = startSignIn();
-  if (!result) {
-    [[GIDSignIn sharedInstance] signIn];
-    result = currentResult_.get();
-  }
-  return result;
+    SignInResult *result = startSignIn();
+    if (!result) {
+        [[GIDSignIn sharedInstance] setClientID:@"303413321002-osmliudj71vc5e0lqjd8l6mb137v0clj.apps.googleusercontent.com"];
+        [[GIDSignIn sharedInstance] signIn];
+        result = currentResult_.get();
+    }
+    return result;
 }
+/*修改前版本*/
+//void *GoogleSignIn_SignIn() {
+//  SignInResult *result = startSignIn();
+//  if (!result) {
+//    [[GIDSignIn sharedInstance] signIn];
+//    result = currentResult_.get();
+//  }
+//  return result;
+//}
 
 /**
  * Attempt a silent sign-in. Return value is the pointer to the currentResult
  * object.
  */
 void *GoogleSignIn_SignInSilently() {
-  SignInResult *result = startSignIn();
-  if (!result) {
-    [[GIDSignIn sharedInstance] restorePreviousSignIn];
-    result = currentResult_.get();
-  }
-  return result;
+    SignInResult *result = startSignIn();
+    if (!result) {
+        [GIDSignIn sharedInstance].presentingViewController = UnityGetGLViewController();
+        [[GIDSignIn sharedInstance] setClientID:@"303413321002-osmliudj71vc5e0lqjd8l6mb137v0clj.apps.googleusercontent.com"];
+        [[GIDSignIn sharedInstance] restorePreviousSignIn];
+        result = currentResult_.get();
+    }
+    return result;
 }
+/*修改前版本*/
+//void *GoogleSignIn_SignInSilently() {
+//  SignInResult *result = startSignIn();
+//  if (!result) {
+//    [[GIDSignIn sharedInstance] restorePreviousSignIn];
+//    result = currentResult_.get();
+//  }
+//  return result;
+//}
 
 void GoogleSignIn_Signout() {
   GIDSignIn *signIn = [GIDSignIn sharedInstance];

Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm

@@ -68,13 +68,17 @@ - (BOOL)GoogleSignInAppController:(UIApplication *)application
   NSString *path = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info"
                                                    ofType:@"plist"];
   NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path];
-  NSString *clientId = [dict objectForKey:@"CLIENT_ID"];
+  NSString *clientId = [dict objectForKey:@"303413321002-osmliudj71vc5e0lqjd8l6mb137v0clj.apps.googleusercontent.com"];
+  /*修改前版本*/
+  //NSString *clientId = [dict objectForKey:@"CLIENT_ID"];
 
   gsiHandler = [GoogleSignInHandler alloc];
 
   // Setup the Sign-In instance.
   GIDSignIn *signIn = [GIDSignIn sharedInstance];
-  signIn.clientID = clientId;
+  [[GIDSignIn sharedInstance] setClientID:clientId];
+  /*修改前版本*/
+  //signIn.clientID = clientId;
   signIn.delegate = gsiHandler;
 
   // looks like it's just calling itself, but the implementations were swapped