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

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

Merged
merged 3 commits into from
Apr 13, 2021
Merged

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

merged 3 commits into from
Apr 13, 2021

Conversation

vmeretin
Copy link
Contributor

iOS Google Sign-in flow was always forcing user to fill email and password, the null check fixes the account picker, so the flow suggest Google Accounts already signed-in on iOS device.

Fixes: flutter/flutter#48602

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I signed the CLA.
  • The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy.
  • I updated CHANGELOG.md to add a description of the change.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@google-cla google-cla bot added the cla: yes label Apr 12, 2021
@vmeretin vmeretin marked this pull request as ready for review April 13, 2021 05:57
@vmeretin vmeretin mentioned this pull request Apr 13, 2021
Closed
13 tasks
@vmeretin vmeretin changed the title [google_sign_in] Fix "pick account" on iOS #48602 [google_sign_in] Fix "pick account" on iOS Apr 13, 2021
cyanglaz
cyanglaz suggested changes Apr 13, 2021
View reviewed changes
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! Just need to update the version since it is not a public API change, we should only release a patch version update.

packages/google_sign_in/google_sign_in/CHANGELOG.md Outdated Show resolved Hide resolved
packages/google_sign_in/google_sign_in/pubspec.yaml Outdated Show resolved Hide resolved
@vmeretin
Fix version name
27d21a6 
Co-authored-by: Chris Yang <[email protected]>
@vmeretin vmeretin requested a review from cyanglaz April 13, 2021 18:32
cyanglaz
cyanglaz approved these changes Apr 13, 2021
View reviewed changes
Copy link
Contributor

@cyanglaz cyanglaz left a comment

Choose a reason for hiding this comment

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

LGTM

@cyanglaz cyanglaz added the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Apr 13, 2021
@fluttergithubbot fluttergithubbot merged commit b548ae1 into flutter:master Apr 13, 2021
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Apr 14, 2021
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 14, 2021
@engine-flutter-autoroll
b548ae1 [google_sign_in] Fix "pick account" on iOS (flutter/plugins#3805
d574699 
)
fluttergithubbot pushed a commit to flutter/flutter that referenced this pull request Apr 14, 2021
@engine-flutter-autoroll
b548ae1 [google_sign_in] Fix "pick account" on iOS (flutter/plugins#3805
3e9874e 
) (#80397)
bhaveshptl pushed a commit to bhaveshptl/plugins that referenced this pull request Apr 23, 2021
@bhaveshhzt
Merge branch 'master' into webview_file_picker
72e55e2 
* master: (397 commits)
  [in_app_purchase] Implementation of platform interface (flutter#3781)
  [google_sign_in] Add todo WRT correctly setting X-Goog-AuthUser header (flutter#3819)
  [tools] fix version check command not working for new packages (flutter#3818)
  [camera] android-rework part 1: Base classes to support Android Camera features (flutter#3795)
  fix MD (flutter#3815)
  Path provider windows crash fix (flutter#3814)
  [local_auth] docs update (flutter#3103)
  Update PULL_REQUEST_TEMPLATE.md (flutter#3801)
  [quick_actions] handle cold start on iOS correctly (flutter#3811)
  Replace path_provider_linux widget tests with simple unit tests (flutter#3812)
  [sensors] format dart code based on the new dart formatter (flutter#3809)
  [google_sign_in] Fix "pick account" on iOS (flutter#3805)
  [image_picker_platform_interface] Added pickMultiImage (flutter#3782)
  [in_app_purchase] Added currency code and numerical price to product detail model. (flutter#3794)
  [local_auth] Fix iOS crash when no localizedReason (flutter#3780)
  Fix and update version checks (flutter#3792)
  [in_app_purchase] Configured example app to use StoreKit Testing on iOS 14 (flutter#3772)
  [local_auth] Unnecessary reassignment in example removed (flutter#2983)
  [flutter_webview] Fix `allowsInlineMediaPlayback` ignored on iOS (flutter#3791)
  Switch script/tools over to the new analysis options (flutter#3777)
  ...
yasargil added a commit to yasargil/plugins that referenced this pull request Apr 28, 2021
@yasargil
Merge branch 'master' into gmain
58ff4c0 
* master: (79 commits)
  Fix grammatical error in contributing guide (flutter#3217)
  [google_sign_in_web] fix README typos.
  [tool] combine run and runAndExitOnError (flutter#3827)
  [camera] android-rework part 2: Android auto focus feature (flutter#3796)
  [in_app_purchase_platform_interface] Added additional fields to ProductDetails (flutter#3826)
  Move all null safety packages' min dart sdk to 2.12.0 (flutter#3822)
  [path_provider_*] code cleanup: sort directives (flutter#3823)
  [in_app_purchase] Implementation of platform interface (flutter#3781)
  [google_sign_in] Add todo WRT correctly setting X-Goog-AuthUser header (flutter#3819)
  [tools] fix version check command not working for new packages (flutter#3818)
  [camera] android-rework part 1: Base classes to support Android Camera features (flutter#3795)
  fix MD (flutter#3815)
  Path provider windows crash fix (flutter#3814)
  [local_auth] docs update (flutter#3103)
  Update PULL_REQUEST_TEMPLATE.md (flutter#3801)
  [quick_actions] handle cold start on iOS correctly (flutter#3811)
  Replace path_provider_linux widget tests with simple unit tests (flutter#3812)
  [sensors] format dart code based on the new dart formatter (flutter#3809)
  [google_sign_in] Fix "pick account" on iOS (flutter#3805)
  [image_picker_platform_interface] Added pickMultiImage (flutter#3782)
  ...
stuartmorgan
stuartmorgan reviewed Jun 2, 2021
View reviewed changes
packages/google_sign_in/google_sign_in/ios/Tests/GoogleSignInPluginTest.m
[expectation fulfill];
}];
[self waitForExpectations:@[ expectation ] timeout:5];
XCTAssertTrue([self.mockSharedInstance.hostedDomain == nil]);
Copy link
Contributor

Choose a reason for hiding this comment

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

This file was missed during a change in how we run tests, so was not actually being compiled and run. In trying to fix it I found that:
a) it doesn't compile, because of this line, and
b) when that's fixed, other unit tests crash (presumably because calling init changes global state)

I'm going to have to remove this test to get the file running again; if you could submit a PR with a version of the test that compiles, and runs successfully in the context of the whole test suite, that would be great.

Copy link
Contributor

Choose a reason for hiding this comment

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

The same test has been added here: https://github.com/flutter/plugins/blame/master/packages/google_sign_in/google_sign_in/example/ios/RunnerTests/GoogleSignInTests.m#L128.

fotiDim pushed a commit to fotiDim/plugins that referenced this pull request Sep 13, 2021
@vmeretin @fotiDim
[google_sign_in] Fix "pick account" on iOS (flutter#3805)
f862754
This was referenced Dec 20, 2021
Closed
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cyanglaz cyanglaz cyanglaz approved these changes

@stuartmorgan stuartmorgan stuartmorgan left review comments

Assignees
No one assigned
Labels
cla: yes p: google_sign_in platform-ios waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[google_sign_in] Not redirect to "Choose an account"
4 participants
@vmeretin @stuartmorgan @cyanglaz @fluttergithubbot