From 36f7fd0431c93c2d9ac181331d0160eeaae07db8 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 11:54:45 +0900 Subject: [PATCH 01/27] Update GoogleSignInPlugin.java --- .../io/flutter/plugins/googlesignin/GoogleSignInPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java index d2fc260c7b1c..0ad9b46219ef 100755 --- a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java +++ b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java @@ -239,6 +239,7 @@ public void init( "default_web_client_id", "string", registrar.context().getPackageName()); if (clientIdIdentifier != 0) { optionsBuilder.requestIdToken(registrar.context().getString(clientIdIdentifier)); + optionsBuilder.requestServerAuthCode(registrar.context().getString(clientIdIdentifier)); } for (String scope : requestedScopes) { optionsBuilder.requestScopes(new Scope(scope)); @@ -360,6 +361,7 @@ private void onSignInAccount(GoogleSignInAccount account) { response.put("email", account.getEmail()); response.put("id", account.getId()); response.put("idToken", account.getIdToken()); + response.put("serverAuthCode", account.getServerAuthCode()); response.put("displayName", account.getDisplayName()); if (account.getPhotoUrl() != null) { response.put("photoUrl", account.getPhotoUrl().toString()); From 9350ff9f33bd5c1f0e924d2a5f87fcca41eeef4e Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 11:59:08 +0900 Subject: [PATCH 02/27] Update GoogleSignInPlugin.m --- packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m index 483bc5c6e81c..abf1493c6116 100644 --- a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m +++ b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m @@ -10,6 +10,8 @@ // for more info. static NSString *const kClientIdKey = @"CLIENT_ID"; +static NSString *const kServerClientIdKey = @"SERVER_CLIENT_ID"; + // These error codes must match with ones declared on Android and Dart sides. static NSString *const kErrorReasonSignInRequired = @"sign_in_required"; static NSString *const kErrorReasonSignInCanceled = @"sign_in_canceled"; @@ -73,6 +75,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result if (path) { NSMutableDictionary *plist = [[NSMutableDictionary alloc] initWithContentsOfFile:path]; [GIDSignIn sharedInstance].clientID = plist[kClientIdKey]; + [GIDSignIn sharedInstance].serverClientID = plist[kServerClientIdKey]; [GIDSignIn sharedInstance].scopes = call.arguments[@"scopes"]; [GIDSignIn sharedInstance].hostedDomain = call.arguments[@"hostedDomain"]; result(nil); @@ -173,6 +176,7 @@ - (void)signIn:(GIDSignIn *)signIn @"email" : user.profile.email ?: [NSNull null], @"id" : user.userID ?: [NSNull null], @"photoUrl" : [photoUrl absoluteString] ?: [NSNull null], + @"serverAuthCode" : user.serverAuthCode ?: [NSNull null] } error:nil]; } From 722959c924d347a6e95d1e385861d19a9d313990 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:02:05 +0900 Subject: [PATCH 03/27] Update google_sign_in.dart --- packages/google_sign_in/lib/google_sign_in.dart | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/lib/google_sign_in.dart index f1e1db21801e..b86a6eed7e6c 100644 --- a/packages/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/lib/google_sign_in.dart @@ -26,6 +26,8 @@ class GoogleSignInAuthentication { /// The OAuth2 access token to access Google services. String get accessToken => _data['accessToken']; + String get serverAuthCode => _data['serverAuthCode']; + @override String toString() => 'GoogleSignInAuthentication:$_data'; } @@ -36,7 +38,8 @@ class GoogleSignInAccount implements GoogleIdentity { email = data['email'], id = data['id'], photoUrl = data['photoUrl'], - _idToken = data['idToken'] { + _idToken = data['idToken'], + _serverAuthCode = data['serverAuthCode'] { assert(id != null); } @@ -61,6 +64,9 @@ class GoogleSignInAccount implements GoogleIdentity { final String photoUrl; final String _idToken; + + final String _serverAuthCode; + final GoogleSignIn _googleSignIn; /// Retrieve [GoogleSignInAuthentication] for this account. @@ -91,6 +97,10 @@ class GoogleSignInAccount implements GoogleIdentity { if (response['idToken'] == null) { response['idToken'] = _idToken; } + + if (response['serverAuthCode'] == null) { + response['serverAuthCode'] = _serverAuthCode; + } return GoogleSignInAuthentication._(response); } @@ -123,7 +133,8 @@ class GoogleSignInAccount implements GoogleIdentity { email == otherAccount.email && id == otherAccount.id && photoUrl == otherAccount.photoUrl && - _idToken == otherAccount._idToken; + _idToken == otherAccount._idToken && + _serverAuthCode == otherAccount._serverAuthCode; } @override From 55ce6a4261620b3a96497f35b00b9a80f0fc36e4 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:02:52 +0900 Subject: [PATCH 04/27] Update version number --- packages/google_sign_in/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index 246a6389e39c..c5adc53f218d 100644 --- a/packages/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in -version: 4.0.8 +version: 4.0.9 flutter: plugin: From 9efd8c4935fe7877eadbe22844179d1e59993000 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:06:19 +0900 Subject: [PATCH 05/27] Update AUTHORS --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index ed6942ae1a6e..74cd46f356b1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,4 +43,5 @@ Audrius Karosevicius Lukasz Piliszczuk SoundReply Solutions GmbH Rafal Wachol -Pau Picas \ No newline at end of file +Pau Picas +Kazuki Yamaguchi From 73f6fa0aaa54dc26d0b8fbe855cba4a4acd47842 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:15:14 +0900 Subject: [PATCH 06/27] Update CHANGELOG.md --- packages/google_sign_in/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 188167e53cae..96a1ca98383c 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.9 + +* Added support for getting `serverAuthCode` + ## 4.0.8 * Get rid of `MethodCompleter` and serialize async actions using chained futures. From df155e55a69ca9df3a9528a8ad6de3cf9bd462b9 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 11:54:45 +0900 Subject: [PATCH 07/27] Update GoogleSignInPlugin.java --- .../io/flutter/plugins/googlesignin/GoogleSignInPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java index d2fc260c7b1c..0ad9b46219ef 100755 --- a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java +++ b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java @@ -239,6 +239,7 @@ public void init( "default_web_client_id", "string", registrar.context().getPackageName()); if (clientIdIdentifier != 0) { optionsBuilder.requestIdToken(registrar.context().getString(clientIdIdentifier)); + optionsBuilder.requestServerAuthCode(registrar.context().getString(clientIdIdentifier)); } for (String scope : requestedScopes) { optionsBuilder.requestScopes(new Scope(scope)); @@ -360,6 +361,7 @@ private void onSignInAccount(GoogleSignInAccount account) { response.put("email", account.getEmail()); response.put("id", account.getId()); response.put("idToken", account.getIdToken()); + response.put("serverAuthCode", account.getServerAuthCode()); response.put("displayName", account.getDisplayName()); if (account.getPhotoUrl() != null) { response.put("photoUrl", account.getPhotoUrl().toString()); From 66f969c598481075103bd81575d2ea6bde97aaa7 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 11:59:08 +0900 Subject: [PATCH 08/27] Update GoogleSignInPlugin.m --- packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m index 483bc5c6e81c..abf1493c6116 100644 --- a/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m +++ b/packages/google_sign_in/ios/Classes/GoogleSignInPlugin.m @@ -10,6 +10,8 @@ // for more info. static NSString *const kClientIdKey = @"CLIENT_ID"; +static NSString *const kServerClientIdKey = @"SERVER_CLIENT_ID"; + // These error codes must match with ones declared on Android and Dart sides. static NSString *const kErrorReasonSignInRequired = @"sign_in_required"; static NSString *const kErrorReasonSignInCanceled = @"sign_in_canceled"; @@ -73,6 +75,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result if (path) { NSMutableDictionary *plist = [[NSMutableDictionary alloc] initWithContentsOfFile:path]; [GIDSignIn sharedInstance].clientID = plist[kClientIdKey]; + [GIDSignIn sharedInstance].serverClientID = plist[kServerClientIdKey]; [GIDSignIn sharedInstance].scopes = call.arguments[@"scopes"]; [GIDSignIn sharedInstance].hostedDomain = call.arguments[@"hostedDomain"]; result(nil); @@ -173,6 +176,7 @@ - (void)signIn:(GIDSignIn *)signIn @"email" : user.profile.email ?: [NSNull null], @"id" : user.userID ?: [NSNull null], @"photoUrl" : [photoUrl absoluteString] ?: [NSNull null], + @"serverAuthCode" : user.serverAuthCode ?: [NSNull null] } error:nil]; } From 3ed41e7c83ff04dcadb29def0bf3563d9e7dcf50 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:02:05 +0900 Subject: [PATCH 09/27] Update google_sign_in.dart --- packages/google_sign_in/lib/google_sign_in.dart | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/lib/google_sign_in.dart index f1e1db21801e..b86a6eed7e6c 100644 --- a/packages/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/lib/google_sign_in.dart @@ -26,6 +26,8 @@ class GoogleSignInAuthentication { /// The OAuth2 access token to access Google services. String get accessToken => _data['accessToken']; + String get serverAuthCode => _data['serverAuthCode']; + @override String toString() => 'GoogleSignInAuthentication:$_data'; } @@ -36,7 +38,8 @@ class GoogleSignInAccount implements GoogleIdentity { email = data['email'], id = data['id'], photoUrl = data['photoUrl'], - _idToken = data['idToken'] { + _idToken = data['idToken'], + _serverAuthCode = data['serverAuthCode'] { assert(id != null); } @@ -61,6 +64,9 @@ class GoogleSignInAccount implements GoogleIdentity { final String photoUrl; final String _idToken; + + final String _serverAuthCode; + final GoogleSignIn _googleSignIn; /// Retrieve [GoogleSignInAuthentication] for this account. @@ -91,6 +97,10 @@ class GoogleSignInAccount implements GoogleIdentity { if (response['idToken'] == null) { response['idToken'] = _idToken; } + + if (response['serverAuthCode'] == null) { + response['serverAuthCode'] = _serverAuthCode; + } return GoogleSignInAuthentication._(response); } @@ -123,7 +133,8 @@ class GoogleSignInAccount implements GoogleIdentity { email == otherAccount.email && id == otherAccount.id && photoUrl == otherAccount.photoUrl && - _idToken == otherAccount._idToken; + _idToken == otherAccount._idToken && + _serverAuthCode == otherAccount._serverAuthCode; } @override From 97cbf5b56b4744ab0d261e74b615b3f02a3f1e53 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:06:19 +0900 Subject: [PATCH 10/27] Update AUTHORS --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index ed6942ae1a6e..74cd46f356b1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,4 +43,5 @@ Audrius Karosevicius Lukasz Piliszczuk SoundReply Solutions GmbH Rafal Wachol -Pau Picas \ No newline at end of file +Pau Picas +Kazuki Yamaguchi From a24a5470b463fc8ff2b3d56eb1363df0c977e113 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 27 Sep 2019 12:44:55 +0900 Subject: [PATCH 11/27] Update CHANGELOG.md --- packages/google_sign_in/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index b46be247f317..cb11878234d7 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.10 + +* Added support for getting `serverAuthCode` + ## 4.0.9 * Update and migrate iOS example project. From beed7872c7151d4455aec7f07656c3c0cb84886a Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 8 Nov 2019 15:53:52 +0900 Subject: [PATCH 12/27] modify variable assignment --- packages/google_sign_in/lib/google_sign_in.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/lib/google_sign_in.dart index b86a6eed7e6c..8ff00c7e6ac4 100644 --- a/packages/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/lib/google_sign_in.dart @@ -98,9 +98,7 @@ class GoogleSignInAccount implements GoogleIdentity { response['idToken'] = _idToken; } - if (response['serverAuthCode'] == null) { - response['serverAuthCode'] = _serverAuthCode; - } + response['serverAuthCode'] ??= _serverAuthCode; return GoogleSignInAuthentication._(response); } From 5227ce83f79b784c6f14ab5f5e5a99aa7f92da8c Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 8 Nov 2019 18:16:49 +0900 Subject: [PATCH 13/27] add test case --- packages/google_sign_in/test/google_sign_in_test.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/test/google_sign_in_test.dart index 108edf9c892b..381c6620be73 100755 --- a/packages/google_sign_in/test/google_sign_in_test.dart +++ b/packages/google_sign_in/test/google_sign_in_test.dart @@ -22,6 +22,7 @@ void main() { "id": "8162538176523816253123", "photoUrl": "https://lh5.googleusercontent.com/photo.jpg", "displayName": "John Doe", + "serverAuthCode": "789", }; const Map kDefaultResponses = { @@ -368,6 +369,7 @@ void main() { expect(auth.accessToken, '456'); expect(auth.idToken, '123'); + expect(auth.serverAuthCode, '789'); expect( log, [ From 0cc73de005ce44d354defddd9f68d3519abd6015 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 8 Nov 2019 18:27:53 +0900 Subject: [PATCH 14/27] pubspec version up --- packages/google_sign_in/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index e239e01c3b44..03d2fb2b3e54 100644 --- a/packages/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in -version: 4.0.11 +version: 4.1.0 flutter: plugin: From d77b4808f2f88264c0e3729a465d0fe2b8649338 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 8 Nov 2019 19:16:08 +0900 Subject: [PATCH 15/27] Update CHANGELOG.md --- packages/google_sign_in/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 300eba20968e..a38116ae5901 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.1.0 + +* Added support for getting `serverAuthCode` + ## 4.0.11 * Update iOS CocoaPod dependency to 5.0 to fix deprecated API usage issue. From cbe903e75564dda19657a13af392f825f9fbbac4 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Mon, 30 Mar 2020 11:36:26 +0900 Subject: [PATCH 16/27] modify return values --- .../google_sign_in/lib/google_sign_in.dart | 4 +++- .../lib/src/utils.dart | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart index 0c88a7295323..b81542a50d73 100644 --- a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart @@ -12,6 +12,7 @@ import 'src/common.dart'; export 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart' show SignInOption; + export 'src/common.dart'; export 'widgets.dart'; @@ -140,7 +141,8 @@ class GoogleSignInAccount implements GoogleIdentity { } @override - int get hashCode => hashValues(displayName, email, id, photoUrl, _idToken); + int get hashCode => + hashValues(displayName, email, id, photoUrl, _idToken, _serverAuthCode); @override String toString() { diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart index eb60f00cba63..5518c803a9f9 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart @@ -10,11 +10,13 @@ GoogleSignInUserData getUserDataFromMap(Map data) { return null; } return GoogleSignInUserData( - displayName: data['displayName'], - email: data['email'], - id: data['id'], - photoUrl: data['photoUrl'], - idToken: data['idToken']); + displayName: data['displayName'], + email: data['email'], + id: data['id'], + photoUrl: data['photoUrl'], + idToken: data['idToken'], + serverAuthCode: data['serverAuthCode'], + ); } /// Converts token data coming from native code into the proper platform interface type. @@ -25,5 +27,6 @@ GoogleSignInTokenData getTokenDataFromMap(Map data) { return GoogleSignInTokenData( idToken: data['idToken'], accessToken: data['accessToken'], + serverAuthCode: data['serverAuthCode'], ); } From 71771366980467d3e5fcadacefb7bc556886c566 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Wed, 8 Apr 2020 19:34:33 +0900 Subject: [PATCH 17/27] update ios/android example code --- .../example/android/app/src/main/res/values/strings.xml | 4 ++++ .../example/ios/Runner/GoogleService-Info.plist | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml b/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml new file mode 100644 index 000000000000..4d5717c62f54 --- /dev/null +++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + YOUR_WEB_CLIENT_ID + \ No newline at end of file diff --git a/packages/google_sign_in/google_sign_in/example/ios/Runner/GoogleService-Info.plist b/packages/google_sign_in/google_sign_in/example/ios/Runner/GoogleService-Info.plist index 8d24ccc9b130..6042aab908af 100644 --- a/packages/google_sign_in/google_sign_in/example/ios/Runner/GoogleService-Info.plist +++ b/packages/google_sign_in/google_sign_in/example/ios/Runner/GoogleService-Info.plist @@ -38,5 +38,7 @@ 1:479882132969:ios:2643f950e0a0da08 DATABASE_URL https://my-flutter-proj.firebaseio.com + SERVER_CLIENT_ID + YOUR_SERVER_CLIENT_ID \ No newline at end of file From 7c7d0a78b9d9d24525fec7168a7e010e74375c8c Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 10:50:53 +0900 Subject: [PATCH 18/27] update interface package version --- packages/google_sign_in/google_sign_in/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml index 75ae9b9d261d..0b9991d50bae 100644 --- a/packages/google_sign_in/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in/pubspec.yaml @@ -16,7 +16,7 @@ flutter: default_package: google_sign_in_web dependencies: - google_sign_in_platform_interface: ^1.1.0 + google_sign_in_platform_interface: ^1.1.1 flutter: sdk: flutter meta: ^1.0.4 From 866e356cacb7d23bac2bf78d4a890baf2bc6bc0d Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 11:00:16 +0900 Subject: [PATCH 19/27] remove interface code --- .../test/google_sign_in_test.dart | 3 +-- .../lib/src/types.dart | 21 +++++-------------- .../lib/src/utils.dart | 1 - 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart index a987ff32f030..26adea2128de 100755 --- a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart +++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:google_sign_in/testing.dart'; +import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -23,7 +23,6 @@ void main() { "id": "8162538176523816253123", "photoUrl": "https://lh5.googleusercontent.com/photo.jpg", "displayName": "John Doe", - "serverAuthCode": "789", }; const Map kDefaultResponses = { diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart index ec0de30b1c82..c60402200bdd 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart @@ -26,14 +26,8 @@ enum SignInOption { class GoogleSignInUserData { /// Uses the given data to construct an instance. Any of these parameters /// could be null. - GoogleSignInUserData({ - this.displayName, - this.email, - this.id, - this.photoUrl, - this.idToken, - this.serverAuthCode, - }); + GoogleSignInUserData( + {this.displayName, this.email, this.id, this.photoUrl, this.idToken}); /// The display name of the signed in user. /// @@ -68,13 +62,9 @@ class GoogleSignInUserData { /// data. String idToken; - /// A serverAuthCode that can be sent to your own server to verify - /// the authentication data. - String serverAuthCode; - @override - int get hashCode => hashObjects( - [displayName, email, id, photoUrl, idToken, serverAuthCode]); + int get hashCode => + hashObjects([displayName, email, id, photoUrl, idToken]); @override bool operator ==(dynamic other) { @@ -85,8 +75,7 @@ class GoogleSignInUserData { otherUserData.email == email && otherUserData.id == id && otherUserData.photoUrl == photoUrl && - otherUserData.idToken == idToken && - otherUserData.serverAuthCode == serverAuthCode; + otherUserData.idToken == idToken; } } diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart index 5518c803a9f9..8d9ce9897512 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart @@ -15,7 +15,6 @@ GoogleSignInUserData getUserDataFromMap(Map data) { id: data['id'], photoUrl: data['photoUrl'], idToken: data['idToken'], - serverAuthCode: data['serverAuthCode'], ); } From 1381e7898eb2f6321f2224ff2d27add20e07c380 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 11:10:46 +0900 Subject: [PATCH 20/27] add attribute description comment --- packages/google_sign_in/google_sign_in/lib/google_sign_in.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart index 3146332b3171..0391dc7a8087 100644 --- a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart @@ -28,6 +28,7 @@ class GoogleSignInAuthentication { /// The OAuth2 access token to access Google services. String get accessToken => _data.accessToken; + /// Server auth code used to access Google Login String get serverAuthCode => _data.serverAuthCode; @override From 39ce20b87b5721fb7f300455f439632bc0aea883 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 11:12:36 +0900 Subject: [PATCH 21/27] remove extra line --- .../google_sign_in/test/google_sign_in_test.dart | 2 +- .../lib/google_sign_in_platform_interface.dart | 2 -- .../lib/src/utils.dart | 11 +++++------ .../test/google_sign_in_platform_interface_test.dart | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart index 26adea2128de..9a21556120fc 100755 --- a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart +++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:google_sign_in/testing.dart'; -import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart index 9c1c7419573c..966e93551086 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart @@ -3,9 +3,7 @@ // found in the LICENSE file. import 'dart:async'; - import 'package:meta/meta.dart' show required, visibleForTesting; - import 'src/method_channel_google_sign_in.dart'; import 'src/types.dart'; diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart index 8d9ce9897512..1ae828604af6 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/utils.dart @@ -10,12 +10,11 @@ GoogleSignInUserData getUserDataFromMap(Map data) { return null; } return GoogleSignInUserData( - displayName: data['displayName'], - email: data['email'], - id: data['id'], - photoUrl: data['photoUrl'], - idToken: data['idToken'], - ); + displayName: data['displayName'], + email: data['email'], + id: data['id'], + photoUrl: data['photoUrl'], + idToken: data['idToken']); } /// Converts token data coming from native code into the proper platform interface type. diff --git a/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart b/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart index e71e60571060..f411b8992821 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter_test/flutter_test.dart'; import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart'; +import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; void main() { From 1c3b37bccfbba734f4fd87ee34be4e876b632d3b Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 11:29:30 +0900 Subject: [PATCH 22/27] remove unnecessary code --- .../google_sign_in/google_sign_in/lib/google_sign_in.dart | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart index 0391dc7a8087..1498d7c1826c 100644 --- a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart @@ -12,7 +12,6 @@ import 'src/common.dart'; export 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart' show SignInOption; - export 'src/common.dart'; export 'widgets.dart'; @@ -45,8 +44,7 @@ class GoogleSignInAccount implements GoogleIdentity { email = data.email, id = data.id, photoUrl = data.photoUrl, - _idToken = data.idToken, - _serverAuthCode = data.serverAuthCode { + _idToken = data.idToken { assert(id != null); } @@ -72,8 +70,6 @@ class GoogleSignInAccount implements GoogleIdentity { final String _idToken; - final String _serverAuthCode; - final GoogleSignIn _googleSignIn; /// Retrieve [GoogleSignInAuthentication] for this account. @@ -102,8 +98,6 @@ class GoogleSignInAccount implements GoogleIdentity { if (response.idToken == null) { response.idToken = _idToken; } - - response.serverAuthCode ??= _serverAuthCode; return GoogleSignInAuthentication._(response); } From 42b6410a9ed1ae0a33f6a2011ce7f7704ffedf9d Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 12:05:39 +0900 Subject: [PATCH 23/27] modify attribute --- .../google_sign_in/google_sign_in/lib/google_sign_in.dart | 7 ++----- .../google_sign_in/test/google_sign_in_test.dart | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart index 1498d7c1826c..0f1f15bbb8c4 100644 --- a/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart +++ b/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart @@ -69,7 +69,6 @@ class GoogleSignInAccount implements GoogleIdentity { final String photoUrl; final String _idToken; - final GoogleSignIn _googleSignIn; /// Retrieve [GoogleSignInAuthentication] for this account. @@ -131,13 +130,11 @@ class GoogleSignInAccount implements GoogleIdentity { email == otherAccount.email && id == otherAccount.id && photoUrl == otherAccount.photoUrl && - _idToken == otherAccount._idToken && - _serverAuthCode == otherAccount._serverAuthCode; + _idToken == otherAccount._idToken; } @override - int get hashCode => - hashValues(displayName, email, id, photoUrl, _idToken, _serverAuthCode); + int get hashCode => hashValues(displayName, email, id, photoUrl, _idToken); @override String toString() { diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart index 9a21556120fc..5969edbaba76 100755 --- a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart +++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart @@ -36,6 +36,7 @@ void main() { 'getTokens': { 'idToken': '123', 'accessToken': '456', + 'serverAuthCode': '789', }, }; From bfc4d8e5eedcee8f12337ed3915fa90be4977a67 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Fri, 24 Apr 2020 13:07:00 +0900 Subject: [PATCH 24/27] update package version --- packages/google_sign_in/google_sign_in/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml index 0b9991d50bae..845024a2086d 100644 --- a/packages/google_sign_in/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in -version: 4.4.4 +version: 4.5.0 flutter: plugin: From f0cc548bf8f47e31e28f852efbaeab4ce45d1992 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Sat, 25 Apr 2020 13:24:24 +0900 Subject: [PATCH 25/27] modify CHANGELOG.md --- packages/google_sign_in/google_sign_in/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md index 39e7e4d6c540..0c446cf7c732 100644 --- a/packages/google_sign_in/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in/CHANGELOG.md @@ -1,6 +1,6 @@ ## 4.5.0 -* Add support for getting `serverAuthCode` +* Add support for getting `serverAuthCode`. ## 4.4.4 From 6deb8cf313934fe7bdcf78c1a716196a37104d09 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Sat, 25 Apr 2020 13:26:52 +0900 Subject: [PATCH 26/27] add EOF line --- .../example/android/app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml b/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml index 4d5717c62f54..c7e28ffcedd1 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml +++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ YOUR_WEB_CLIENT_ID - \ No newline at end of file + From a373bf77a7cc4f978715cde017063f4f6f1a48b8 Mon Sep 17 00:00:00 2001 From: yamarkz Date: Thu, 30 Apr 2020 11:33:19 +0900 Subject: [PATCH 27/27] use v2 embedding context --- .../io/flutter/plugins/googlesignin/GoogleSignInPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java index fea98868e42b..ce04e595080b 100755 --- a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java +++ b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java @@ -334,8 +334,8 @@ public void init( .getResources() .getIdentifier("default_web_client_id", "string", context.getPackageName()); if (clientIdIdentifier != 0) { - optionsBuilder.requestIdToken(registrar.context().getString(clientIdIdentifier)); - optionsBuilder.requestServerAuthCode(registrar.context().getString(clientIdIdentifier)); + optionsBuilder.requestIdToken(context.getString(clientIdIdentifier)); + optionsBuilder.requestServerAuthCode(context.getString(clientIdIdentifier)); } for (String scope : requestedScopes) { optionsBuilder.requestScopes(new Scope(scope));