[google_sign_in] Add ability to return serverAuthCode

AUTHORS

@@ -43,4 +43,5 @@ Audrius Karosevicius <[email protected]>
 Lukasz Piliszczuk <[email protected]>
 SoundReply Solutions GmbH <[email protected]>
 Rafal Wachol <[email protected]>
-Pau Picas <[email protected]>
+Pau Picas <[email protected]>
+Kazuki Yamaguchi <[email protected]>

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.

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());

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];
   }

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