Skip to content

chore(auth): sign-up state machine to use AmplifyOutputs instead of AmplifyConfig types #5230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2024
Merged

chore(auth): sign-up state machine to use AmplifyOutputs instead of AmplifyConfig types #5230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart
View file
Open in desktop
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
Loading