chore: fix merge changes and sdk challenge name

khatruong2009 · khatruong2009 · commit d7f3d5d61b3f · 2024-09-24T19:30:59.000-07:00
diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/sdk_bridge.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/sdk_bridge.dart
@@ -33,7 +33,7 @@ extension ChallengeNameTypeBridge on ChallengeNameType {
         ChallengeNameType.softwareTokenMfa =>
           AuthSignInStep.confirmSignInWithTotpMfaCode,
         // TODO(khatruong2009): confirm ChallengeNameType.emailMfa is added to SDK
-        ChallengeNameType.emailMfa => AuthSignInStep.confirmSignInWithEmailMfaCode,
+        ChallengeNameType.emailOtp => AuthSignInStep.confirmSignInWithEmailMfaCode,
         ChallengeNameType.adminNoSrpAuth ||
         ChallengeNameType.passwordVerifier ||
         ChallengeNameType.devicePasswordVerifier ||
diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart
@@ -458,7 +458,7 @@ final class SignInStateMachine
     _enableMfaType = MfaType.email;
     return RespondToAuthChallengeRequest.build((b) {
       b
-        ..clientId = config.appClientId
+        ..clientId = _authOutputs.userPoolClientId
         ..challengeName = _challengeName
         ..challengeResponses.addAll({
           CognitoConstants.challengeParamUsername: cognitoUsername,

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ final class SignInStateMachine`
`458`	`458`	`_enableMfaType = MfaType.email;`
`459`	`459`	`return RespondToAuthChallengeRequest.build((b) {`
`460`	`460`	`b`
`461`		`- ..clientId = config.appClientId`
	`461`	`+ ..clientId = _authOutputs.userPoolClientId`
`462`	`462`	`..challengeName = _challengeName`
`463`	`463`	`..challengeResponses.addAll({`
`464`	`464`	`CognitoConstants.challengeParamUsername: cognitoUsername,`