Merge pull request #1534 from famedly/nico/simplify-sorting

refactor: simplify UIA stage selection logic
famedly · Aug 1, 2023 · 4addccd · 4addccd
2 parents b27fd45 + 59693b7
commit 4addccd
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/lib/src/utils/uia_request.dart b/lib/src/utils/uia_request.dart
@@ -102,17 +102,11 @@ class UiaRequest<T> {
       List<AuthenticationFlow> flows, List<String> completed) {
     final nextStages = <String>{};
     for (final flow in flows) {
-      final stages = flow.stages;
-      final nextStage = stages[completed.length];
-      var stagesValid = true;
-      for (var i = 0; i < completed.length; i++) {
-        if (stages[i] != completed[i]) {
-          stagesValid = false;
-          break;
-        }
-      }
-      if (stagesValid) {
-        nextStages.add(nextStage);
+      // check the flow starts with the completed stages
+      if (flow.stages.length >= completed.length &&
+          flow.stages.take(completed.length).toSet().containsAll(completed)) {
+        final stages = flow.stages.skip(completed.length);
+        if (stages.isNotEmpty) nextStages.add(stages.first);
       }
     }
     return nextStages;