@@ -7,14 +7,11 @@ import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart';
7
7
import 'package:amplify_auth_cognito_dart/src/credentials/auth_plugin_credentials_provider.dart' ;
8
8
import 'package:amplify_auth_cognito_dart/src/credentials/cognito_keys.dart' ;
9
9
import 'package:amplify_auth_cognito_dart/src/credentials/device_metadata_repository.dart' ;
10
- import 'package:amplify_auth_cognito_dart/src/flows/constants.dart' ;
11
- import 'package:amplify_auth_cognito_dart/src/flows/helpers.dart' ;
12
10
import 'package:amplify_auth_cognito_dart/src/model/session/cognito_sign_in_details.dart' ;
13
11
import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity.dart'
14
12
hide NotAuthorizedException;
15
13
import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity_provider.dart'
16
14
as cognito_idp;
17
- import 'package:amplify_auth_cognito_dart/src/sdk/src/cognito_identity_provider/model/analytics_metadata_type.dart' ;
18
15
import 'package:amplify_auth_cognito_dart/src/state/cognito_state_machine.dart' ;
19
16
import 'package:amplify_auth_cognito_dart/src/state/state.dart' ;
20
17
import 'package:amplify_core/amplify_core.dart' ;
@@ -359,7 +356,6 @@ final class FetchAuthSessionStateMachine
359
356
AuthResult <String > userSubResult;
360
357
AuthResult <AWSCredentials > credentialsResult;
361
358
AuthResult <String > identityIdResult;
362
-
363
359
final hasUserPool = _authConfig? .userPoolId != null ;
364
360
var userPoolTokens = result.userPoolTokens;
365
361
if (! hasUserPool) {
@@ -511,38 +507,30 @@ final class FetchAuthSessionStateMachine
511
507
final deviceSecrets = await getOrCreate <DeviceMetadataRepository >().get (
512
508
userPoolTokens.username,
513
509
);
514
- final refreshRequest = cognito_idp.InitiateAuthRequest .build ((b) {
515
- b
516
- ..authFlow = cognito_idp.AuthFlowType .refreshTokenAuth
517
- ..clientId = _authConfig? .userPoolClientId
518
- ..authParameters.addAll ({
519
- CognitoConstants .refreshToken: userPoolTokens.refreshToken,
520
- })
521
- ..analyticsMetadata = get <AnalyticsMetadataType >()? .toBuilder ();
522
-
523
- // ignore: invalid_use_of_internal_member
524
- if (_authConfig? .appClientSecret != null &&
525
- _authConfig? .userPoolClientId != null ) {
526
- b.authParameters[CognitoConstants .challengeParamSecretHash] =
527
- computeSecretHash (
528
- userPoolTokens.username,
529
- _authConfig! .userPoolClientId! ,
530
- // ignore: invalid_use_of_internal_member
531
- _authConfig! .appClientSecret! ,
532
- );
533
- }
534
510
535
- final deviceKey = deviceSecrets? .deviceKey;
511
+ final deviceKey = deviceSecrets? .deviceKey;
512
+ // ignore: invalid_use_of_internal_member
513
+ final appClientSecret = _authConfig? .appClientSecret;
514
+
515
+ final refreshRequest = cognito_idp.GetTokensFromRefreshTokenRequest .build ((
516
+ b,
517
+ ) {
518
+ b
519
+ ..refreshToken = userPoolTokens.refreshToken
520
+ ..clientId = _authConfig? .userPoolClientId;
536
521
if (deviceKey != null ) {
537
- b.authParameters[CognitoConstants .challengeParamDeviceKey] = deviceKey;
522
+ b.deviceKey = deviceKey;
523
+ }
524
+ if (appClientSecret != null ) {
525
+ b.clientSecret = appClientSecret;
538
526
}
539
527
});
540
528
try {
541
529
final result = await _withZoneOverrides (
542
- () => _cognitoIdpClient.initiateAuth (refreshRequest).result,
530
+ () =>
531
+ _cognitoIdpClient.getTokensFromRefreshToken (refreshRequest).result,
543
532
);
544
533
final authResult = result.authenticationResult;
545
-
546
534
final accessToken = authResult? .accessToken;
547
535
final refreshToken = authResult? .refreshToken;
548
536
final idToken = authResult? .idToken;
0 commit comments