From 3c0cb10f98300999877f6851763f3b52775104ed Mon Sep 17 00:00:00 2001 From: Nika Hassani Date: Wed, 31 Jul 2024 15:49:44 -0400 Subject: [PATCH] chore(auth): sign-up state machine to use AmplifyOutputs instead of AmplifyConfig types --- .../state/machines/sign_up_state_machine.dart | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart index 07865189a5..8d4f9356d0 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart @@ -7,6 +7,8 @@ import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity_provider.dart import 'package:amplify_auth_cognito_dart/src/state/cognito_state_machine.dart'; import 'package:amplify_auth_cognito_dart/src/state/state.dart'; import 'package:amplify_core/amplify_core.dart'; +// ignore: implementation_imports +import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart'; /// {@template amplify_auth_cognito.sign_up_state_machine} /// Manages user sign up with Cognito. @@ -34,12 +36,13 @@ final class SignUpStateMachine return cognitoIdp; } - CognitoUserPoolConfig get _userPoolConfig { - final userPoolConfig = get(); - if (userPoolConfig == null) { + AuthOutputs get _authOutputs { + final authOutputs = get(); + if (authOutputs?.userPoolId == null || + authOutputs?.userPoolClientId == null) { throw const InvalidAccountTypeException.noUserPool(); } - return userPoolConfig; + return authOutputs!; } ASFContextDataProvider get _contextDataProvider => getOrCreate(); @@ -78,7 +81,7 @@ final class SignUpStateMachine SignUpRequest.build( (b) { b - ..clientId = _userPoolConfig.appClientId + ..clientId = _authOutputs.userPoolClientId ..username = event.parameters.username ..password = event.parameters.password ..clientMetadata.addAll(event.clientMetadata) @@ -100,11 +103,12 @@ final class SignUpStateMachine ) ..analyticsMetadata = get()?.toBuilder(); - final clientSecret = _userPoolConfig.appClientSecret; + // ignore: invalid_use_of_internal_member + final clientSecret = _authOutputs.appClientSecret; if (clientSecret != null) { b.secretHash = computeSecretHash( event.parameters.username, - _userPoolConfig.appClientId, + _authOutputs.userPoolClientId!, clientSecret, ); } @@ -138,17 +142,18 @@ final class SignUpStateMachine await _cognito.confirmSignUp( ConfirmSignUpRequest.build((b) { b - ..clientId = _userPoolConfig.appClientId + ..clientId = _authOutputs.userPoolClientId ..username = event.username ..confirmationCode = event.confirmationCode ..clientMetadata.addAll(event.clientMetadata) ..analyticsMetadata = get()?.toBuilder(); - final clientSecret = _userPoolConfig.appClientSecret; + // ignore: invalid_use_of_internal_member + final clientSecret = _authOutputs.appClientSecret; if (clientSecret != null) { b.secretHash = computeSecretHash( event.username, - _userPoolConfig.appClientId, + _authOutputs.userPoolClientId!, clientSecret, ); }