[force-code-for-refresh-token-new] Add forceCodeForRefreshToken to allow android to receive a refresh token on every sign in

Author: fbcouch

packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java

@@ -137,7 +137,8 @@ public void onMethodCall(MethodCall call, Result result) {
         List<String> requestedScopes = call.argument("scopes");
         String hostedDomain = call.argument("hostedDomain");
         String clientId = call.argument("clientId");
-        delegate.init(result, signInOption, requestedScopes, hostedDomain, clientId);
+        boolean forceCodeForRefreshToken = call.argument("forceCodeForRefreshToken");
+        delegate.init(result, signInOption, requestedScopes, hostedDomain, clientId, forceCodeForRefreshToken);
         break;
 
       case METHOD_SIGN_IN_SILENTLY:
@@ -193,7 +194,8 @@ public void init(
         String signInOption,
         List<String> requestedScopes,
         String hostedDomain,
-        String clientId);
+        String clientId,
+        boolean forceCodeForRefreshToken);
 
     /**
      * Returns the account information for the user who is signed in to this app. If no user is
@@ -318,7 +320,8 @@ public void init(
         String signInOption,
         List<String> requestedScopes,
         String hostedDomain,
-        String clientId) {
+        String clientId,
+        boolean forceCodeForRefreshToken) {
       try {
         GoogleSignInOptions.Builder optionsBuilder;
 
@@ -345,10 +348,10 @@ public void init(
                 .getIdentifier("default_web_client_id", "string", context.getPackageName());
         if (!Strings.isNullOrEmpty(clientId)) {
           optionsBuilder.requestIdToken(clientId);
-          optionsBuilder.requestServerAuthCode(clientId);
+          optionsBuilder.requestServerAuthCode(clientId, forceCodeForRefreshToken);
         } else if (clientIdIdentifier != 0) {
           optionsBuilder.requestIdToken(context.getString(clientIdIdentifier));
-          optionsBuilder.requestServerAuthCode(context.getString(clientIdIdentifier));
+          optionsBuilder.requestServerAuthCode(context.getString(clientIdIdentifier), forceCodeForRefreshToken);
         }
         for (String scope : requestedScopes) {
           optionsBuilder.requestScopes(new Scope(scope));

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart

@@ -180,6 +180,7 @@ class GoogleSignIn {
     this.scopes = const <String>[],
     this.hostedDomain,
     this.clientId,
+    this.forceCodeForRefreshToken = false,
   });
 
   /// Factory for creating default sign in user experience.
@@ -228,6 +229,9 @@ class GoogleSignIn {
   /// Client ID being used to connect to google sign-in. Only supported on web.
   final String? clientId;
 
+  /// Force the authorization code to be valid for a refresh token every time. Only needed on Android.
+  final bool forceCodeForRefreshToken;
+
   StreamController<GoogleSignInAccount?> _currentUserController =
       StreamController<GoogleSignInAccount?>.broadcast();
 
@@ -262,6 +266,7 @@ class GoogleSignIn {
       scopes: scopes,
       hostedDomain: hostedDomain,
       clientId: clientId,
+      forceCodeForRefreshToken: forceCodeForRefreshToken,
     )..catchError((dynamic _) {
         // Invalidate initialization if it errors out.
         _initialization = null;

packages/google_sign_in/google_sign_in/pubspec.yaml

@@ -23,7 +23,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  google_sign_in_platform_interface: ^2.1.0
+  google_sign_in_platform_interface: ^2.2.0
   google_sign_in_web: ^0.10.0
 
 dev_dependencies:

packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart

@@ -96,6 +96,27 @@ void main() {
             'scopes': <String>[],
             'hostedDomain': null,
             'clientId': fakeClientId,
+            'forceCodeForRefreshToken': false,
+          }),
+          isMethodCall('signIn', arguments: null),
+        ],
+      );
+    });
+
+    test('forceCodeForRefreshToken sent with init method call', () async {
+      final fakeClientId = 'fakeClientId';
+      googleSignIn = GoogleSignIn(clientId: fakeClientId, forceCodeForRefreshToken: true);
+      await googleSignIn.signIn();
+      expect(googleSignIn.currentUser, isNotNull);
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('init', arguments: <String, dynamic>{
+            'signInOption': 'SignInOption.standard',
+            'scopes': <String>[],
+            'hostedDomain': null,
+            'clientId': fakeClientId,
+            'forceCodeForRefreshToken': true,
           }),
           isMethodCall('signIn', arguments: null),
         ],
@@ -430,5 +451,6 @@ Matcher _isSignInMethodCall({String signInOption = 'SignInOption.standard'}) {
     'scopes': <String>[],
     'hostedDomain': null,
     'clientId': null,
+    'forceCodeForRefreshToken': false
   });
 }

packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart

@@ -85,6 +85,7 @@ abstract class GoogleSignInPlatform {
     SignInOption signInOption = SignInOption.standard,
     String? hostedDomain,
     String? clientId,
+    bool forceCodeForRefreshToken = false,
   }) async {
     throw UnimplementedError('init() has not been implemented.');
   }

packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart

@@ -25,12 +25,14 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform {
     SignInOption signInOption = SignInOption.standard,
     String? hostedDomain,
     String? clientId,
+    bool forceCodeForRefreshToken = false,
   }) {
     return channel.invokeMethod<void>('init', <String, dynamic>{
       'signInOption': signInOption.toString(),
       'scopes': scopes,
       'hostedDomain': hostedDomain,
       'clientId': clientId,
+      'forceCodeForRefreshToken': forceCodeForRefreshToken,
     });
   }
 

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.1.1
+version: 2.2.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/google_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart

@@ -102,12 +102,14 @@ void main() {
               hostedDomain: 'example.com',
               scopes: <String>['two', 'scopes'],
               signInOption: SignInOption.games,
-              clientId: 'fakeClientId');
+              clientId: 'fakeClientId',
+              forceCodeForRefreshToken: true);
         }: isMethodCall('init', arguments: <String, dynamic>{
           'hostedDomain': 'example.com',
           'scopes': <String>['two', 'scopes'],
           'signInOption': 'SignInOption.games',
           'clientId': 'fakeClientId',
+          'forceCodeForRefreshToken': true,
         }),
         () {
           googleSignIn.getTokens(

packages/google_sign_in/google_sign_in_web/lib/google_sign_in_web.dart

@@ -71,6 +71,7 @@ class GoogleSignInPlugin extends GoogleSignInPlatform {
     SignInOption signInOption = SignInOption.standard,
     String? hostedDomain,
     String? clientId,
+    bool forceCodeForRefreshToken = false,
   }) async {
     final String? appClientId = clientId ?? _autoDetectedClientId;
     assert(

packages/google_sign_in/google_sign_in_web/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, iOS and Web.
 repository: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 0.10.0+4
+version: 0.10.1+4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -22,7 +22,7 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  google_sign_in_platform_interface: ^2.0.0
+  google_sign_in_platform_interface: ^2.2.0
   js: ^0.6.3
   pedantic: ^1.10.0