chore(auth): More TOTP cleanup

aws-amplify · Jul 10, 2023 · 403c387 · 403c387
1 parent d06e6b0
commit 403c387
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/amplify_core/lib/src/types/auth/mfa/user_mfa_preference.dart b/packages/amplify_core/lib/src/types/auth/mfa/user_mfa_preference.dart
@@ -14,9 +14,9 @@ final class UserMfaPreference
         AWSDebuggable {
   /// {@macro amplify_core.auth.user_mfa_preference}
   const UserMfaPreference({
-    Set<MfaType>? enabled,
+    this.enabled = const {},
     this.preferred,
-  }) : enabled = enabled ?? const {};
+  });
 
   /// The enabled MFA methods for the user.
   final Set<MfaType> enabled;
@@ -35,7 +35,7 @@ final class UserMfaPreference
 
   @override
   Map<String, Object?> toJson() => {
-        'enabled': enabled.map((typ) => typ.name.toUpperCase()).toList(),
+        'enabled': enabled.map((type) => type.name.toUpperCase()).toList(),
         'preferred': preferred?.name.toUpperCase(),
       };
 }
diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/mfa_totp_optional_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/mfa_totp_optional_test.dart
@@ -34,7 +34,7 @@ void main() {
         because: 'MFA is optional',
       ).equals(AuthSignInStep.done);
 
-      await setUpTotp();
+      await setUpTotp(deviceName: friendlyDeviceName);
 
       await cognitoPlugin.updateMfaPreference(
         totp: MfaPreference.preferred,

diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/utils/totp_utils.dart b/packages/auth/amplify_auth_cognito/example/integration_test/utils/totp_utils.dart
@@ -42,7 +42,7 @@ Future<int> get _nextTotpTime async {
 }
 
 String? _sharedSecret;
-Future<void> setUpTotp() async {
+Future<void> setUpTotp({String? deviceName = friendlyDeviceName}) async {
   if (_sharedSecret != null) {
     throw StateError('Cannot reconfigure TOTP');
   }
@@ -52,9 +52,9 @@ Future<void> setUpTotp() async {
   _sharedSecret = totpSetupResult.sharedSecret;
   await Amplify.Auth.verifyTotpSetup(
     await generateTotpCode(),
-    options: const VerifyTotpSetupOptions(
+    options: VerifyTotpSetupOptions(
       pluginOptions: CognitoVerifyTotpSetupPluginOptions(
-        friendlyDeviceName: friendlyDeviceName,
+        friendlyDeviceName: deviceName,
       ),
     ),
   );