Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_sign_in] Fix "pick account" on iOS #2587

Closed
JanKn wants to merge 4 commits into from
Closed

[google_sign_in] Fix "pick account" on iOS #2587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c041973
Google_sign_in: Fix "pick account" on iOS
JanKn Mar 7, 2020
7bbe2c8
Version bump
JanKn Mar 7, 2020
6b9a594
Update CHANGELOG.md
JanKn Mar 7, 2020
6b70d1d
Merge branch 'master' into google_sign_in-fix-ios-pick-account
JanKn Mar 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/google_sign_in/google_sign_in/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 4.1.5

* Fix flutter/flutter#48602 iOS flow shows account selection, if user is signed in to Google on the device.
Copy link
Contributor

@cyanglaz cyanglaz Mar 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might need to rebase and fix the version.

* Remove unused variable.

## 4.1.4
Expand Down
6 changes: 5 additions & 1 deletion packages/google_sign_in/google_sign_in/ios/Classes/FLTGoogleSignInPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,11 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
NSMutableDictionary *plist = [[NSMutableDictionary alloc] initWithContentsOfFile:path];
[GIDSignIn sharedInstance].clientID = plist[kClientIdKey];
[GIDSignIn sharedInstance].scopes = call.arguments[@"scopes"];
[GIDSignIn sharedInstance].hostedDomain = call.arguments[@"hostedDomain"];
if (call.arguments[@"hostedDomain"] == [NSNull null]) {
[GIDSignIn sharedInstance].hostedDomain = nil;
} else {
[GIDSignIn sharedInstance].hostedDomain = call.arguments[@"hostedDomain"];
}
result(nil);
} else {
result([FlutterError errorWithCode:@"missing-config"
Expand Down