Parameter object

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart

@@ -250,7 +250,7 @@ class GoogleSignInAuthorizationClient {
   /// https://support.google.com/accounts/answer/13533235.
   Future<void> clearAuthorizationToken({required String accessToken}) {
     return GoogleSignInPlatform.instance.clearAuthorizationToken(
-      token: accessToken,
+      ClearAuthorizationTokensParams(accessToken: accessToken),
     );
   }
 

packages/google_sign_in/google_sign_in/test/google_sign_in_test.mocks.dart

@@ -111,27 +111,29 @@ class MockGoogleSignInPlatform extends _i1.Mock
           as _i4.Future<_i2.ServerAuthorizationTokenData?>);
 
   @override
-  _i4.Future<void> signOut(_i2.SignOutParams? params) =>
+  _i4.Future<void> clearAuthorizationToken(
+    _i2.ClearAuthorizationTokensParams? params,
+  ) =>
       (super.noSuchMethod(
-            Invocation.method(#signOut, [params]),
+            Invocation.method(#clearAuthorizationToken, [params]),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
           as _i4.Future<void>);
 
   @override
-  _i4.Future<void> disconnect(_i2.DisconnectParams? params) =>
+  _i4.Future<void> signOut(_i2.SignOutParams? params) =>
       (super.noSuchMethod(
-            Invocation.method(#disconnect, [params]),
+            Invocation.method(#signOut, [params]),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
           as _i4.Future<void>);
 
   @override
-  _i4.Future<void> clearAuthorizationToken({required String? token}) =>
+  _i4.Future<void> disconnect(_i2.DisconnectParams? params) =>
       (super.noSuchMethod(
-            Invocation.method(#clearAuthorizationToken, [], {#token: token}),
+            Invocation.method(#disconnect, [params]),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )

packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart

@@ -28,8 +28,8 @@ class GoogleSignInAndroid extends GoogleSignInPlatform {
   }
 
   @override
-  Future<void> clearAuthorizationToken({required String token}) {
-    return _hostApi.clearAuthorizationToken(token);
+  Future<void> clearAuthorizationToken(ClearAuthorizationTokensParams params) {
+    return _hostApi.clearAuthorizationToken(params.accessToken);
   }
 
   @override

packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart

@@ -135,7 +135,9 @@ class GoogleSignInIOS extends GoogleSignInPlatform {
   }
 
   @override
-  Future<void> clearAuthorizationToken({required String token}) async {
+  Future<void> clearAuthorizationToken(
+    ClearAuthorizationTokensParams params,
+  ) async {
     // No-op; the iOS SDK handles token invalidation internally.
   }
 

packages/google_sign_in/google_sign_in_ios/test/google_sign_in_ios_test.dart

@@ -1233,7 +1233,9 @@ void main() {
   });
 
   test('clearAuthorizationToken no-ops without error', () async {
-    await googleSignIn.clearAuthorizationToken(token: 'any token');
+    await googleSignIn.clearAuthorizationToken(
+      const ClearAuthorizationTokensParams(accessToken: 'any token'),
+    );
 
     verifyZeroInteractions(mockApi);
   });

packages/google_sign_in/google_sign_in_ios/test/google_sign_in_ios_test.mocks.dart

@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.5 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in google_sign_in_ios/test/google_sign_in_ios_test.dart.
 // Do not manually edit this file.
 

packages/google_sign_in/google_sign_in_platform_interface/lib/google_sign_in_platform_interface.dart

@@ -98,22 +98,20 @@ abstract class GoogleSignInPlatform extends PlatformInterface {
     ServerAuthorizationTokensForScopesParameters params,
   );
 
+  /// Clears any token cache for the given access token.
+  Future<void> clearAuthorizationToken(ClearAuthorizationTokensParams params) {
+    throw UnimplementedError(
+      'clearAuthorizationToken() has not been implemented.',
+    );
+  }
+
   /// Signs out previously signed in accounts.
   Future<void> signOut(SignOutParams params);
 
   /// Revokes all of the scopes that all signed in users granted, and then signs
   /// them out.
   Future<void> disconnect(DisconnectParams params);
 
-  /// Clears the token cache for the given access token.
-  ///
-  /// How this is implemented is up to the platform.
-  Future<void> clearAuthorizationToken({required String token}) {
-    throw UnimplementedError(
-      'clearAuthorizationToken() has not been implemented.',
-    );
-  }
-
   /// Returns a stream of authentication events.
   ///
   /// If this is not overridden, the app-facing package will assume that the
@@ -178,17 +176,17 @@ class _PlaceholderImplementation extends GoogleSignInPlatform {
   }
 
   @override
-  Future<void> signOut(SignOutParams params) {
+  Future<void> clearAuthorizationToken(ClearAuthorizationTokensParams params) {
     throw UnimplementedError();
   }
 
   @override
-  Future<void> disconnect(DisconnectParams params) {
+  Future<void> signOut(SignOutParams params) {
     throw UnimplementedError();
   }
 
   @override
-  Future<void> clearAuthorizationToken({required String token}) {
+  Future<void> disconnect(DisconnectParams params) {
     throw UnimplementedError();
   }
 }

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

@@ -363,6 +363,29 @@ class AuthenticationResults {
   final AuthenticationTokenData authenticationTokens;
 }
 
+/// Parameters for the clearAuthorizationTokens method.
+@immutable
+class ClearAuthorizationTokensParams {
+  /// Creates new parameters for clearAuthorizationTokens with the given
+  /// [accessToken]
+  const ClearAuthorizationTokensParams({required this.accessToken});
+
+  /// The OAuth2 access token to clear.
+  final String accessToken;
+
+  @override
+  int get hashCode => accessToken.hashCode;
+
+  @override
+  bool operator ==(Object other) {
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is ClearAuthorizationTokensParams &&
+        other.accessToken == accessToken;
+  }
+}
+
 /// Parameters for the signOut method.
 @immutable
 class SignOutParams {

packages/google_sign_in/google_sign_in_web/example/integration_test/google_sign_in_web_test.dart

@@ -355,13 +355,15 @@ void main() {
     });
 
     group('clearAuthorizationToken', () {
-      const String someToken = '50m3_4cc355_70k3n';
       setUp(() {
         plugin.init(options);
       });
 
       testWidgets('calls clearAuthorizationToken on GIS client', (_) async {
-        await plugin.clearAuthorizationToken(token: someToken);
+        const String someToken = 'someToken';
+        await plugin.clearAuthorizationToken(
+          const ClearAuthorizationTokensParams(accessToken: someToken),
+        );
 
         final List<Object?> arguments =
             mockito

packages/google_sign_in/google_sign_in_web/example/integration_test/google_sign_in_web_test.mocks.dart

@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.5 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in google_sign_in_web_integration_tests/integration_test/google_sign_in_web_test.dart.
 // Do not manually edit this file.
 
@@ -76,6 +76,12 @@ class MockGisSdkClient extends _i1.Mock implements _i2.GisSdkClient {
           )
           as _i3.Future<void>);
 
+  @override
+  void clearAuthorizationToken(String? token) => super.noSuchMethod(
+    Invocation.method(#clearAuthorizationToken, [token]),
+    returnValueForMissingStub: null,
+  );
+
   @override
   _i3.Future<String?> requestScopes(
     List<String>? scopes, {

packages/google_sign_in/google_sign_in_web/example/integration_test/web_only_test.mocks.dart

@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.5 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in google_sign_in_web_integration_tests/integration_test/web_only_test.dart.
 // Do not manually edit this file.
 
@@ -76,6 +76,12 @@ class MockGisSdkClient extends _i1.Mock implements _i2.GisSdkClient {
           )
           as _i3.Future<void>);
 
+  @override
+  void clearAuthorizationToken(String? token) => super.noSuchMethod(
+    Invocation.method(#clearAuthorizationToken, [token]),
+    returnValueForMissingStub: null,
+  );
+
   @override
   _i3.Future<String?> requestScopes(
     List<String>? scopes, {

packages/google_sign_in/google_sign_in_web/lib/google_sign_in_web.dart

@@ -244,9 +244,11 @@ class GoogleSignInPlugin extends GoogleSignInPlatform {
   }
 
   @override
-  Future<void> clearAuthorizationToken({required String token}) async {
+  Future<void> clearAuthorizationToken(
+    ClearAuthorizationTokensParams params,
+  ) async {
     await initialized;
-    return _gisClient.clearAuthorizationToken(token);
+    return _gisClient.clearAuthorizationToken(params.accessToken);
   }
 
   @override

packages/google_sign_in/google_sign_in_web/lib/src/gis_client.dart

@@ -283,7 +283,7 @@ class GisSdkClient {
   void clearAuthorizationToken(String token) {
     _lastClientAuthorizationByUser.removeWhere(
       (String? key, (TokenResponse tokenResponse, DateTime expiration) value) =>
-          value.tokenResponse.access_token == token,
+          value.$1.access_token == token,
     );
   }