[google_sign_in] Add serverAuthCode attribute to google_sign_in_platf…

…orm_interface user data (flutter#4179)
mgonzalezc · Oct 8, 2021 · 5117a3f · 5117a3f
1 parent 174f140
commit 5117a3f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md b/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0
+
+* Add serverAuthCode attribute to user data
+
 ## 2.0.1
 
 * Updates `init` function in `MethodChannelGoogleSignIn` to parametrize `clientId` property.

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
@@ -31,6 +31,7 @@ class GoogleSignInUserData {
     this.displayName,
     this.photoUrl,
     this.idToken,
+    this.serverAuthCode,
   });
 
   /// The display name of the signed in user.
@@ -66,9 +67,12 @@ class GoogleSignInUserData {
   /// data.
   String? idToken;
 
+  /// Server auth code used to access Google Login
+  String? serverAuthCode;
+
   @override
-  int get hashCode =>
-      hashObjects(<String?>[displayName, email, id, photoUrl, idToken]);
+  int get hashCode => hashObjects(
+      <String?>[displayName, email, id, photoUrl, idToken, serverAuthCode]);
 
   @override
   bool operator ==(dynamic other) {
@@ -79,7 +83,8 @@ class GoogleSignInUserData {
         otherUserData.email == email &&
         otherUserData.id == id &&
         otherUserData.photoUrl == photoUrl &&
-        otherUserData.idToken == idToken;
+        otherUserData.idToken == idToken &&
+        otherUserData.serverAuthCode == serverAuthCode;
   }
 }
 

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
@@ -14,7 +14,8 @@ GoogleSignInUserData? getUserDataFromMap(Map<String, dynamic>? data) {
       id: data['id']!,
       displayName: data['displayName'],
       photoUrl: data['photoUrl'],
-      idToken: data['idToken']);
+      idToken: data['idToken'],
+      serverAuthCode: data['serverAuthCode']);
 }
 
 /// 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/pubspec.yaml b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml
@@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/master/packages/google_sign_
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 2.0.1
+version: 2.1.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

diff --git a/...le_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart b/...le_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart
@@ -13,6 +13,8 @@ const Map<String, String> kUserData = <String, String>{
   "id": "8162538176523816253123",
   "photoUrl": "https://lh5.googleusercontent.com/photo.jpg",
   "displayName": "John Doe",
+  'idToken': '123',
+  'serverAuthCode': '789',
 };
 
 const Map<dynamic, dynamic> kTokenData = <String, dynamic>{