Skip to content

Commit 88e2df5

Browse files
authored
chore(auth): sign-up state machine to use AmplifyOutputs instead of AmplifyConfig types (#5230)
1 parent c0f6f09 commit 88e2df5

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity_provider.dart
77
import 'package:amplify_auth_cognito_dart/src/state/cognito_state_machine.dart';
88
import 'package:amplify_auth_cognito_dart/src/state/state.dart';
99
import 'package:amplify_core/amplify_core.dart';
10+
// ignore: implementation_imports
11+
import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
1012

1113
/// {@template amplify_auth_cognito.sign_up_state_machine}
1214
/// Manages user sign up with Cognito.
@@ -34,12 +36,13 @@ final class SignUpStateMachine
3436
return cognitoIdp;
3537
}
3638

37-
CognitoUserPoolConfig get _userPoolConfig {
38-
final userPoolConfig = get<CognitoUserPoolConfig>();
39-
if (userPoolConfig == null) {
39+
AuthOutputs get _authOutputs {
40+
final authOutputs = get<AuthOutputs>();
41+
if (authOutputs?.userPoolId == null ||
42+
authOutputs?.userPoolClientId == null) {
4043
throw const InvalidAccountTypeException.noUserPool();
4144
}
42-
return userPoolConfig;
45+
return authOutputs!;
4346
}
4447

4548
ASFContextDataProvider get _contextDataProvider => getOrCreate();
@@ -78,7 +81,7 @@ final class SignUpStateMachine
7881
SignUpRequest.build(
7982
(b) {
8083
b
81-
..clientId = _userPoolConfig.appClientId
84+
..clientId = _authOutputs.userPoolClientId
8285
..username = event.parameters.username
8386
..password = event.parameters.password
8487
..clientMetadata.addAll(event.clientMetadata)
@@ -100,11 +103,12 @@ final class SignUpStateMachine
100103
)
101104
..analyticsMetadata = get<AnalyticsMetadataType>()?.toBuilder();
102105

103-
final clientSecret = _userPoolConfig.appClientSecret;
106+
// ignore: invalid_use_of_internal_member
107+
final clientSecret = _authOutputs.appClientSecret;
104108
if (clientSecret != null) {
105109
b.secretHash = computeSecretHash(
106110
event.parameters.username,
107-
_userPoolConfig.appClientId,
111+
_authOutputs.userPoolClientId!,
108112
clientSecret,
109113
);
110114
}
@@ -138,17 +142,18 @@ final class SignUpStateMachine
138142
await _cognito.confirmSignUp(
139143
ConfirmSignUpRequest.build((b) {
140144
b
141-
..clientId = _userPoolConfig.appClientId
145+
..clientId = _authOutputs.userPoolClientId
142146
..username = event.username
143147
..confirmationCode = event.confirmationCode
144148
..clientMetadata.addAll(event.clientMetadata)
145149
..analyticsMetadata = get<AnalyticsMetadataType>()?.toBuilder();
146150

147-
final clientSecret = _userPoolConfig.appClientSecret;
151+
// ignore: invalid_use_of_internal_member
152+
final clientSecret = _authOutputs.appClientSecret;
148153
if (clientSecret != null) {
149154
b.secretHash = computeSecretHash(
150155
event.username,
151-
_userPoolConfig.appClientId,
156+
_authOutputs.userPoolClientId!,
152157
clientSecret,
153158
);
154159
}

0 commit comments

Comments
 (0)