fix: refactor factors lists into single code block [#325]

Author: shinyford

packages/clerk_auth/lib/src/models/client/sign_in.dart

@@ -106,15 +106,8 @@ class SignIn extends AuthObject with InformativeToStringMixin {
   /// Is this [SignIn] transferable to a [SignUp]?
   bool get isTransferable => verification?.status.isTransferable == true;
 
-  /// fromJson
-  static SignIn fromJson(Map<String, dynamic> json) => _$SignInFromJson(json);
-
-  /// toJson
-  @override
-  Map<String, dynamic> toJson() => _$SignInToJson(this);
-
   /// Find a [Verification] if one exists for this [SignIn]
-  /// at the giver [Stage]
+  /// at the given [Stage]
   ///
   Verification? verificationFor(Stage stage) {
     return switch (stage) {
@@ -123,7 +116,26 @@ class SignIn extends AuthObject with InformativeToStringMixin {
     };
   }
 
-  /// The factors for the current stage
+  /// Find a list of [Factor]s for this [SignIn]
+  /// at the given [Stage]
+  ///
+  List<Factor> factorsFor(Stage stage) {
+    return switch (stage) {
+      Stage.first => supportedFirstFactors,
+      Stage.second => supportedSecondFactors,
+    };
+  }
+
+  /// Do we need factors for the given [Stage]?
+  ///
+  bool needsFactorsFor(Stage stage) {
+    return switch (stage) {
+      Stage.first => needsFirstFactor,
+      Stage.second => needsSecondFactor,
+    };
+  }
+
+  /// The factors for the current status
   List<Factor> get factors => switch (status) {
         Status.needsFirstFactor => supportedFirstFactors,
         Status.needsSecondFactor => supportedSecondFactors,
@@ -134,9 +146,7 @@ class SignIn extends AuthObject with InformativeToStringMixin {
   bool get canUsePassword => factors.any((f) => f.strategy.isPassword);
 
   /// Find the [Factor] for this [SignIn] that matches
-  /// the [strategy] and [stage]
-  ///
-  /// Throw an error on failure
+  /// the [strategy] and optional [stage], or null
   ///
   Factor? factorFor(
     Strategy strategy, {
@@ -153,4 +163,11 @@ class SignIn extends AuthObject with InformativeToStringMixin {
 
     return null;
   }
+
+  /// fromJson
+  static SignIn fromJson(Map<String, dynamic> json) => _$SignInFromJson(json);
+
+  /// toJson
+  @override
+  Map<String, dynamic> toJson() => _$SignInToJson(this);
 }

packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_in_panel.dart

@@ -93,7 +93,7 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel>
                 clerk.Strategy.enterpriseSSO,
                 identifier: _identifier.orNullIfEmpty,
               );
-            } else if (signIn.needsSecondFactor && factors.length == 1) {
+            } else if (signIn.needsFactor && factors.length == 1) {
               await authState.attemptSignIn(strategy: factors.first.strategy);
             }
             if (signIn.needsFactor && signIn.factors.length == 1) {
@@ -152,8 +152,6 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel>
     final themeExtension = ClerkAuth.themeExtensionOf(context);
 
     final signIn = authState.signIn ?? clerk.SignIn.empty;
-    final firstFactors = signIn.supportedFirstFactors;
-    final secondFactors = signIn.supportedSecondFactors;
     final safeIdentifier = signIn.factorFor(_strategy)?.safeIdentifier;
 
     return Column(
@@ -199,27 +197,18 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel>
           onSubmit: (code) => _submitCode(code, authState),
         ),
 
-        // First factors
-        if (firstFactors.isNotEmpty) //
-          _FactorList(
-            key: const Key('firstFactors'),
-            open: signIn.needsFirstFactor &&
-                _externalActionFactorChosen(firstFactors) == false,
-            factors: firstFactors,
-            onPasswordChanged: _updatePassword,
-            onSubmit: (strategy) => _continue(authState, strategy: strategy),
-          ),
-
-        // Second factors
-        if (secondFactors.length > 1) //
-          _FactorList(
-            key: const Key('secondFactors'),
-            open: signIn.needsSecondFactor &&
-                _externalActionFactorChosen(secondFactors) == false,
-            factors: secondFactors,
-            onPasswordChanged: _updatePassword,
-            onSubmit: (strategy) => _continue(authState, strategy: strategy),
-          ),
+        // Factors for each stage
+        for (final stage in clerk.Stage.values) //
+          if (signIn.factorsFor(stage) case final factors
+              when factors.isNotEmpty) //
+            _FactorList(
+              key: ValueKey<clerk.Stage>(stage),
+              open: signIn.needsFactorsFor(stage) &&
+                  _externalActionFactorChosen(factors) == false,
+              factors: factors,
+              onPasswordChanged: _updatePassword,
+              onSubmit: (strategy) => _continue(authState, strategy: strategy),
+            ),
 
         verticalMargin8,