Skip to content

Commit

Permalink
chore(auth): sign-up state machine to use AmplifyOutputs instead of A…
Browse files Browse the repository at this point in the history
…mplifyConfig types (#5230)
  • Loading branch information
NikaHsn authored Aug 1, 2024
1 parent c0f6f09 commit 88e2df5
Showing 1 changed file with 15 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -34,12 +36,13 @@ final class SignUpStateMachine
return cognitoIdp;
}

CognitoUserPoolConfig get _userPoolConfig {
final userPoolConfig = get<CognitoUserPoolConfig>();
if (userPoolConfig == null) {
AuthOutputs get _authOutputs {
final authOutputs = get<AuthOutputs>();
if (authOutputs?.userPoolId == null ||
authOutputs?.userPoolClientId == null) {
throw const InvalidAccountTypeException.noUserPool();
}
return userPoolConfig;
return authOutputs!;
}

ASFContextDataProvider get _contextDataProvider => getOrCreate();
Expand Down Expand Up @@ -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)
Expand All @@ -100,11 +103,12 @@ final class SignUpStateMachine
)
..analyticsMetadata = get<AnalyticsMetadataType>()?.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,
);
}
Expand Down Expand Up @@ -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<AnalyticsMetadataType>()?.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,
);
}
Expand Down

0 comments on commit 88e2df5

Please sign in to comment.