Skip to content

Commit ce996c1

Browse files
authored
Adjsut runtime configuration for webClientId in GoogleSignIn_Configure (#28)
* Adjust runtime configuration for webClientId in GoogleSignIn_Configure * Fix typo of GIDConfiguration's property
1 parent 95951af commit ce996c1

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Plugins/iOS/GoogleSignIn.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
* limitations under the License.
1515
*/
1616
#import <GoogleSignIn/GIDSignIn.h>
17-
#import <GoogleSignIn/GIDConfiguration.h>
1817

1918
@interface GoogleSignInHandler : NSObject
2019
{
21-
@public
22-
GIDConfiguration* signInConfiguration;
23-
2420
@public
2521
NSString* loginHint;
2622

Plugins/iOS/GoogleSignIn.mm

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#import <GoogleSignIn/GIDGoogleUser.h>
1919
#import <GoogleSignIn/GIDProfileData.h>
2020
#import <GoogleSignIn/GIDSignIn.h>
21+
#import <GoogleSignIn/GIDConfiguration.h>
2122
#import <GoogleSignIn/GIDToken.h>
2223
#import <UnityAppController.h>
2324

@@ -202,14 +203,11 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn,
202203
bool requestIdToken, bool hidePopups,
203204
const char **additionalScopes, int scopeCount,
204205
const char *accountName) {
205-
NSString *path = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];
206-
NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path];
207-
NSString *clientId = [dict objectForKey:@"CLIENT_ID"];
208-
GIDConfiguration* config = [[GIDConfiguration alloc] initWithClientID:clientId];
209206
if (webClientId) {
210-
config = [[GIDConfiguration alloc] initWithClientID:clientId serverClientID:[NSString stringWithUTF8String:webClientId]];
207+
NSLog(@"Configure webClientId at runtime");
208+
GIDConfiguration* config = [GIDSignIn sharedInstance].configuration;
209+
[GIDSignIn sharedInstance].configuration = [[GIDConfiguration alloc] initWithClientID:config.clientID serverClientID:[NSString stringWithUTF8String:webClientId] hostedDomain:config.hostedDomain openIDRealm:config.openIDRealm];
211210
}
212-
[GoogleSignInHandler sharedInstance]->signInConfiguration = config;
213211

214212
int scopeSize = scopeCount;
215213
if (scopeSize) {

0 commit comments

Comments
 (0)