[google_sign_in] add serverAuthCode to GoogleSignInAccount #4180

p-shapovalov · 2021-07-22T07:19:10Z

Description

Reuse serverAuthCode obtained on login in /pull/4179

Related issues

flutter/flutter#57712
flutter/flutter#57741

Pre-launch Checklist

Breaking Change

Does your PR require plugin users to manually update their apps to accommodate your change?

Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
No, this is not a breaking change.

stuartmorgan · 2021-07-22T20:14:45Z

Thanks for the contribution!

I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.

Same question here as in the other PR; I'm not seeing these tests in the PR.

stuartmorgan · 2021-07-22T20:19:15Z

I've fixed the title, but this was not the case:

The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]

Please keep in mind for future submissions that the checklist is to help make sure all the important steps are followed; just checking all the boxes without doing the steps causes PRs to take longer to triage and review.

p-shapovalov · 2021-07-26T17:22:30Z

fixed

p-shapovalov · 2021-08-05T20:59:52Z

Just in case clarification here too. I've removed serverAuthCode from getToken response because that was wrong - android/ios native response doesn't contain serverAuthCode field

And I've added serverAuthCode to user data response according to my changes because serverAuthCode obtained on that step

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart

packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart

p-shapovalov · 2021-10-08T08:37:16Z

Ok, serverAuthCode property now moved from tokens response to signIn response

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart

p-shapovalov · 2021-10-15T12:23:19Z

Hi @cyanglaz
Interface package on pub.dev already https://pub.dev/packages/google_sign_in_platform_interface/changelog
Anything else I can add here?

…povalov/plugins into fix/reuse-server-auth-code

p-shapovalov · 2021-10-21T17:46:09Z

@cyanglaz please let me know if you need anything else.

cyanglaz

LGTM

…lutter/plugins#4180)

p-shapovalov · 2021-10-21T21:10:00Z

Thank you!

stuartmorgan

Post-submit LGTM (with one question), since this should have had two approvals before landing.

stuartmorgan · 2021-10-21T22:17:37Z

packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart

@@ -350,7 +351,8 @@ void main() {

      expect(auth.accessToken, '456');
      expect(auth.idToken, '123');
-      expect(auth.serverAuthCode, '789');
+      // fix deprecated_member_use_from_same_package
+      // expect(auth.serverAuthCode, '789');


Why was commented-out code checked in?

Oops, sorry I should have caught it. I'll create a PR to remove it

cyanglaz · 2021-10-21T22:51:18Z

Post-submit LGTM (with one question), since this should have had two approvals before landing.

Is it a new policy that we are enforcing for the whole repo? (All PRs need at least 2 approvals before landing)

* master: [webview] Fix typos in the README (flutter#4249) [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180) [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429) [shared_preferences] Switch to new analysis options (flutter#4384) [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413) [camera] Run iOS methods on UI thread by default (flutter#4140) [ci] Always run all `format` steps (flutter#4427) [flutter_plugin_tools] Fix license-check on Windows (flutter#4425) [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400) [image_picker][android] suppress unchecked warning (flutter#4408) [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436) [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality (flutter#4389) Bump compileSdkVersion to 31 (flutter#4432) [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426) Update integration_test README (flutter#3824) [webview_flutter] Adjust test URLs again (flutter#4407) [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179) [camera] Add filter for unsupported cameras on Android (flutter#4418)

stuartmorgan · 2021-10-21T23:07:53Z

Post-submit LGTM (with one question), since this should have had two approvals before landing.

Is it a new policy that we are enforcing for the whole repo? (All PRs need at least 2 approvals before landing)

There's a new-ish policy for all Flutter repos that all PRs need the involvement of two commiters: https://github.com/flutter/flutter/wiki/Tree-hygiene#getting-a-code-review second paragraph.

* master: [webview] Fix typos in the README (flutter#4249) [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180) [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429) [shared_preferences] Switch to new analysis options (flutter#4384) [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413) [camera] Run iOS methods on UI thread by default (flutter#4140) [ci] Always run all `format` steps (flutter#4427) [flutter_plugin_tools] Fix license-check on Windows (flutter#4425) [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400) [image_picker][android] suppress unchecked warning (flutter#4408) [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436) [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality (flutter#4389) Bump compileSdkVersion to 31 (flutter#4432) [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426) Update integration_test README (flutter#3824) [webview_flutter] Adjust test URLs again (flutter#4407) [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179) [camera] Add filter for unsupported cameras on Android (flutter#4418) # Conflicts: # packages/webview_flutter/webview_flutter/CHANGELOG.md # packages/webview_flutter/webview_flutter/pubspec.yaml

* master: (364 commits) Use OpenJDK 11 in CI jobs (flutter#4419) [google_sign_in] remove the commented out code in tests (flutter#4442) [webview] Fix typos in the README (flutter#4249) [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180) [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429) [shared_preferences] Switch to new analysis options (flutter#4384) [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413) [camera] Run iOS methods on UI thread by default (flutter#4140) [ci] Always run all `format` steps (flutter#4427) [flutter_plugin_tools] Fix license-check on Windows (flutter#4425) [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400) [image_picker][android] suppress unchecked warning (flutter#4408) [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436) [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality (flutter#4389) Bump compileSdkVersion to 31 (flutter#4432) [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426) Update integration_test README (flutter#3824) [webview_flutter] Adjust test URLs again (flutter#4407) [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179) [camera] Add filter for unsupported cameras on Android (flutter#4418) ... # Conflicts: # packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

…ideo_src_on_same_controller * commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33': (537 commits) [video_player] Initialize player when size and duration become available (flutter#4438) [webview_flutter] Implement zoom enabled for ios and android (flutter#4417) Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (flutter#4453) Implement Android WebView api with pigeon (Java portion) (flutter#4441) [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434) Implement Android WebView api with pigeon (Dart portion) (flutter#4435) upgraded usage of BinaryMessenger (flutter#4451) [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428) Use OpenJDK 11 in CI jobs (flutter#4419) [google_sign_in] remove the commented out code in tests (flutter#4442) [webview] Fix typos in the README (flutter#4249) [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180) [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429) [shared_preferences] Switch to new analysis options (flutter#4384) [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413) [camera] Run iOS methods on UI thread by default (flutter#4140) [ci] Always run all `format` steps (flutter#4427) [flutter_plugin_tools] Fix license-check on Windows (flutter#4425) [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400) [image_picker][android] suppress unchecked warning (flutter#4408) ... # Conflicts: # packages/video_player/video_player/pubspec.yaml # packages/video_player/video_player_web/lib/video_player_web.dart # packages/video_player/video_player_web/pubspec.yaml

jainkrati · 2021-11-26T04:46:18Z

Thanks for the fix. Somehow I am still getting null serverAuthCode. Is this change already pushed in latest published package for google_sign_in?

Also, are you aware of any ongoing or past fix for ios for this scenario? I am integrating google sign in for my app and need both these fixes. Will appreciate any help :)

cc @p-shapovalov @stuartmorgan

p-shapovalov · 2021-11-26T11:20:52Z

You need to specify correct server client id to get serverAuthCode. Please ensure you have it in SERVER_CLIENT_ID(iOS) and default_web_client_id(Android). For android you also can pass value directly into plugin constructor

jainkrati · 2021-11-30T02:54:08Z

Thanks for the quick tip @p-shapovalov . I made the changes but it keeps crashing everytime google sign in opens in ios after account selection. Strangely, the exception is not throw in the console but the device keeps disconnecting.

I believe its a config issue but I am not able to put a finger on it. So sharing the details here, please let me know if you notice anything that needs to change in the way I am using/configuring the plugin:

In GoogleService-Info.plist, following values are present:
CLIENT_ID
IOSClientID.apps.googleusercontent.com
REVERSED_CLIENT_ID
com.googleusercontent.apps.IOSClientID
SERVER_CLIENT_ID
webClientID.apps.googleusercontent.com
PLIST_VERSION
1
BUNDLE_ID
myAppsBundleID
I am instantiating googleSignIn this way:
account = await GoogleSignIn(clientId: IOSClientID, hostedDomain: "", scopes: [
'email',
'https://www.googleapis.com/auth/contacts.readonly'
]).signIn();
If account is not null then accessing serverAuthCode:
if (account != null) {
final GoogleSignInAuthentication googleSignInAuthentication =
await account.authentication;
print("serverAuthCode is ${googleSignInAuthentication.serverAuthCode}");
}

p-shapovalov · 2021-11-30T08:02:43Z

I'm not sure what exactly wrong with your configuration, because I didn't use google sign in for ios, I guess you can try to catch exception somewhere in https://github.com/flutter/plugins/blob/master/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart#L376

However according to your sample

If account is not null then accessing serverAuthCode:

Please check deprecation warning and use account.serverAuthCode instead

stuartmorgan · 2021-11-30T11:40:50Z

Please do not use PRs for support requests.

devbytyler · 2021-11-30T21:46:40Z

@jainkrati I initially had the same problem as you. (My implementation is very similar to yours) Then I realized that my GoogleService-Info.plist in VSCode did not match in Xcode. Fixed that and everything started working.

jainkrati · 2021-12-01T06:37:27Z

Thanks @tylerstephens814 :)

Yesterday even I got google sign in working on ios by fixing two issues:

Adding SERVER_CLIENT_ID
Removing and re-adding all entries of plist file from XCode instead of VS Code. Apparently there were some extra characters when we added from VS Code last time.

)

reuse serverAuthCode obtained on login

2c6f55e

google-cla bot added the cla: yes label Jul 22, 2021

github-actions bot added the p: google_sign_in label Jul 22, 2021

p-shapovalov mentioned this pull request Jul 22, 2021

[google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data #4179

Merged

13 tasks

stuartmorgan added the needs tests label Jul 22, 2021

stuartmorgan changed the title ~~reuse serverAuthCode obtained on login~~ [google_sign_in] reuse serverAuthCode obtained on login Jul 22, 2021

tests fix

8291838

Merge branch 'master' into fix/reuse-server-auth-code

5b011ae

p-shapovalov added 2 commits August 6, 2021 00:00

Merge branch 'master' into fix/reuse-server-auth-code

f17f84e

Merge branch 'master' into fix/reuse-server-auth-code

b7b9be2

stuartmorgan removed the needs tests label Oct 7, 2021

cyanglaz suggested changes Oct 7, 2021

View reviewed changes

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart Outdated Show resolved Hide resolved

packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart Outdated Show resolved Hide resolved

p-shapovalov added 2 commits October 8, 2021 11:08

Merge branch 'master' into fix/reuse-server-auth-code

258087c

move serverAuthCode to GoogleSignInAccount

c97830f

p-shapovalov changed the title ~~[google_sign_in] reuse serverAuthCode obtained on login~~ [google_sign_in] move serverAuthCode to GoogleSignInAccount Oct 8, 2021

p-shapovalov requested a review from cyanglaz October 8, 2021 08:42

avoid breaking changes

f9097ff

p-shapovalov changed the title ~~[google_sign_in] move serverAuthCode to GoogleSignInAccount~~ [google_sign_in] add serverAuthCode to GoogleSignInAccount Oct 8, 2021

cyanglaz reviewed Oct 8, 2021

View reviewed changes

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart Outdated Show resolved Hide resolved

p-shapovalov added 2 commits October 9, 2021 00:38

pass GoogleSignInAccount.serverAuthCode to GoogleSignInAuthentication

6c63d81

restore prev behaviour for deprecated serverAuthCode

58a16b3

p-shapovalov requested a review from cyanglaz October 8, 2021 21:50

restore deprecated test

bebb406

Trigger Build

28194da

p-shapovalov added 2 commits October 15, 2021 17:23

Merge branch 'fix/reuse-server-auth-code' of https://github.com/p-sha…

e092b7a

…povalov/plugins into fix/reuse-server-auth-code

fix deprecated_member_use_from_same_package

885e1c1

cyanglaz approved these changes Oct 21, 2021

View reviewed changes

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 Oct 21, 2021

fluttergithubbot merged commit 7df7a8f into flutter:master Oct 21, 2021

engine-flutter-autoroll mentioned this pull request Oct 21, 2021

Roll Plugins from 5eec1e61d40c to 7df7a8f71a85 (1 revision) flutter/flutter#92284

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 21, 2021

7df7a8f [google_sign_in] add serverAuthCode to GoogleSignInAccount (f…

77dfc59

…lutter/plugins#4180)

stuartmorgan reviewed Oct 21, 2021

View reviewed changes

cyanglaz mentioned this pull request Oct 21, 2021

[google_sign_in] remove the commented out code in tests #4442

Merged

11 tasks

p-shapovalov deleted the fix/reuse-server-auth-code branch October 23, 2021 06:28

This was referenced Oct 29, 2021

Google Sign In 4.5.1 - ServerAuthCode returns null value flutter/flutter#57712

Closed

[google_sign_in] Fix Server Authorization code on android #2792

Closed

amantoux pushed a commit to amantoux/plugins that referenced this pull request Dec 11, 2021

[google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180

4a0fc21

)

KyleFin pushed a commit to KyleFin/plugins that referenced this pull request Dec 21, 2021

[google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180

3d72641

)

stuartmorgan mentioned this pull request Jan 6, 2022

[google_sign_in] Fix issue obtaining serverAuthCode on Android and add forceCodeForRefreshToken parameter #3356

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[google_sign_in] add serverAuthCode to GoogleSignInAccount #4180

[google_sign_in] add serverAuthCode to GoogleSignInAccount #4180

p-shapovalov commented Jul 22, 2021 •

edited

Loading

stuartmorgan commented Jul 22, 2021

stuartmorgan commented Jul 22, 2021

p-shapovalov commented Jul 26, 2021

p-shapovalov commented Aug 5, 2021

p-shapovalov commented Oct 8, 2021

p-shapovalov commented Oct 15, 2021

p-shapovalov commented Oct 21, 2021

cyanglaz left a comment

p-shapovalov commented Oct 21, 2021

stuartmorgan left a comment

stuartmorgan Oct 21, 2021

cyanglaz Oct 21, 2021

cyanglaz Oct 21, 2021

cyanglaz commented Oct 21, 2021 •

edited

Loading

stuartmorgan commented Oct 21, 2021

jainkrati commented Nov 26, 2021

p-shapovalov commented Nov 26, 2021

jainkrati commented Nov 30, 2021

p-shapovalov commented Nov 30, 2021

stuartmorgan commented Nov 30, 2021

devbytyler commented Nov 30, 2021 •

edited

Loading

jainkrati commented Dec 1, 2021

[google_sign_in] add serverAuthCode to GoogleSignInAccount #4180

[google_sign_in] add serverAuthCode to GoogleSignInAccount #4180

Conversation

p-shapovalov commented Jul 22, 2021 • edited Loading

Description

Related issues

Pre-launch Checklist

Breaking Change

stuartmorgan commented Jul 22, 2021

stuartmorgan commented Jul 22, 2021

p-shapovalov commented Jul 26, 2021

p-shapovalov commented Aug 5, 2021

p-shapovalov commented Oct 8, 2021

p-shapovalov commented Oct 15, 2021

p-shapovalov commented Oct 21, 2021

cyanglaz left a comment

Choose a reason for hiding this comment

p-shapovalov commented Oct 21, 2021

stuartmorgan left a comment

Choose a reason for hiding this comment

stuartmorgan Oct 21, 2021

Choose a reason for hiding this comment

cyanglaz Oct 21, 2021

Choose a reason for hiding this comment

cyanglaz Oct 21, 2021

Choose a reason for hiding this comment

cyanglaz commented Oct 21, 2021 • edited Loading

stuartmorgan commented Oct 21, 2021

jainkrati commented Nov 26, 2021

p-shapovalov commented Nov 26, 2021

jainkrati commented Nov 30, 2021

p-shapovalov commented Nov 30, 2021

stuartmorgan commented Nov 30, 2021

devbytyler commented Nov 30, 2021 • edited Loading

jainkrati commented Dec 1, 2021

p-shapovalov commented Jul 22, 2021 •

edited

Loading

cyanglaz commented Oct 21, 2021 •

edited

Loading

devbytyler commented Nov 30, 2021 •

edited

Loading