chore(auth): remove token query parameters (#6179)

Author: tyllark

packages/amplify_core/lib/src/config/amplify_outputs/auth/oauth_outputs.dart

@@ -26,7 +26,6 @@ class OAuthOutputs
     this.signOutUri,
     this.signOutUriQueryParameters,
     this.tokenUri,
-    this.tokenUriQueryParameters,
     required this.responseType,
   });
 
@@ -85,13 +84,6 @@ class OAuthOutputs
   @internal
   final String? tokenUri;
 
-  /// Optional query params in the OAuth token URI.
-  ///
-  /// Note: This attribute is not part of the Amplify Outputs schema.
-  /// This exists for backwards compatibility with the Gen 1 config.
-  @internal
-  final Map<String, String>? tokenUriQueryParameters;
-
   /// {@macro amplify_core.amplify_outputs.oauth_response_type}
   final OAuthResponseType responseType;
 
@@ -107,7 +99,6 @@ class OAuthOutputs
     signOutUri,
     signOutUriQueryParameters,
     tokenUri,
-    tokenUriQueryParameters,
     responseType,
   ];
 

packages/amplify_core/lib/src/config/amplify_outputs/auth/oauth_outputs.g.dart

@@ -126,7 +126,6 @@ class AuthConfig extends AmplifyPluginConfigMap {
             signOutUri: oAuthConfig.signOutUri,
             signOutUriQueryParameters: oAuthConfig.signOutUriQueryParameters,
             tokenUri: oAuthConfig.tokenUri,
-            tokenUriQueryParameters: oAuthConfig.tokenUriQueryParameters,
             // Amplify Flutter only supports responseType:code
             // "response_type" is set to "code" by `getAuthorizationUrl` from
             // pkg:oauth2

packages/amplify_core/lib/src/config/auth/auth_config.dart

@@ -26,7 +26,6 @@ class CognitoOAuthConfig
     this.tokenUri,
     this.signInUriQueryParameters,
     this.signOutUriQueryParameters,
-    this.tokenUriQueryParameters,
   });
 
   @internal
@@ -51,7 +50,6 @@ class CognitoOAuthConfig
     final signOutRedirectUri = authOutputs.oauth!.redirectSignOutUri.join(',');
     final webDomain = authOutputs.oauth!.domain;
     final tokenUri = authOutputs.oauth!.tokenUri;
-    final tokenUriQueryParameters = authOutputs.oauth!.tokenUriQueryParameters;
 
     return CognitoOAuthConfig(
       appClientId: appClientId,
@@ -65,7 +63,6 @@ class CognitoOAuthConfig
       signInUriQueryParameters: signInUriQueryParameters,
       signOutUriQueryParameters: signOutUriQueryParameters,
       tokenUri: tokenUri,
-      tokenUriQueryParameters: tokenUriQueryParameters,
     );
   }
 
@@ -103,9 +100,6 @@ class CognitoOAuthConfig
   @JsonKey(name: 'TokenURI')
   final String? tokenUri;
 
-  @JsonKey(name: 'TokenURIQueryParameters')
-  final Map<String, String>? tokenUriQueryParameters;
-
   final List<String> scopes;
 
   @override
@@ -120,7 +114,6 @@ class CognitoOAuthConfig
     signOutUri,
     signOutUriQueryParameters,
     tokenUri,
-    tokenUriQueryParameters,
     scopes,
   ];
 
@@ -135,7 +128,6 @@ class CognitoOAuthConfig
     String? signOutUri,
     Map<String, String>? signOutUriQueryParameters,
     String? tokenUri,
-    Map<String, String>? tokenUriQueryParameters,
     List<String>? scopes,
   }) {
     return CognitoOAuthConfig(
@@ -157,11 +149,6 @@ class CognitoOAuthConfig
               ? null
               : Map.of(this.signOutUriQueryParameters!)),
       tokenUri: tokenUri ?? this.tokenUri,
-      tokenUriQueryParameters:
-          tokenUriQueryParameters ??
-          (this.tokenUriQueryParameters == null
-              ? null
-              : Map.of(this.tokenUriQueryParameters!)),
       scopes: scopes ?? List.of(this.scopes),
     );
   }

packages/amplify_core/lib/src/config/auth/cognito/oauth.dart

@@ -81,9 +81,6 @@ void main() {
           signOutQueryParamKey: signOutQueryParamValue,
         });
         expect(oauth.tokenUri, tokenUri);
-        expect(oauth.tokenUriQueryParameters, {
-          tokenQueryParamKey: tokenQueryParamValue,
-        });
         expect(oauth.scopes, containsAll([scope1, scope2]));
       });
 
@@ -167,7 +164,7 @@ const scope2 = 'scope2';
 
 /// hand written config with all oauth options including those not par of the
 /// AmplifyOutputs schema (SignInURIQueryParameters, SignOutURIQueryParameters,
-/// TokenURI, and TokenURIQueryParameters)
+/// and TokenURI)
 const oauthConfig =
     '''{
   "auth": {
@@ -196,9 +193,6 @@ const oauthConfig =
                 "$signOutQueryParamKey": "$signOutQueryParamValue"
               },
               "TokenURI": "$tokenUri",
-              "TokenURIQueryParameters": {
-                "$tokenQueryParamKey": "$tokenQueryParamValue"
-              },
               "Scopes": [
                 "$scope1",
                 "$scope2"

packages/amplify_core/lib/src/config/auth/cognito/oauth.g.dart

@@ -82,9 +82,6 @@ extension HostedUiConfig on OAuthOutputs {
     } else {
       baseUri = _webDomain.replace(path: '/oauth2/token');
     }
-    return baseUri.replace(
-      // ignore: invalid_use_of_internal_member
-      queryParameters: tokenUriQueryParameters,
-    );
+    return baseUri;
   }
 }