fix credential sets

Signed-off-by: Kevin <kevin.dinh@lissi.id>

Author: Dindexx

src/WalletFramework.Oid4Vc/Oid4Vp/Dcql/DcqlFun.cs

@@ -1,5 +1,4 @@
 using LanguageExt;
-using WalletFramework.Core.Functional;
 using WalletFramework.Oid4Vc.Oid4Vp.Dcql.Models;
 using WalletFramework.Oid4Vc.Oid4Vp.Models;
 using WalletFramework.Core.Credentials.Abstractions;
@@ -52,15 +51,26 @@ private static CandidateQueryResult BuildPresentationCandidateSets(
         IReadOnlyList<PresentationCandidate> candidates,
         List<CredentialRequirement> missing)
     {
-        var matchingSets =
-            from setQuery in credentialSetQueries
-            from option in setQuery.Options
-            let matchingIds = option.Ids.Select(id => id.AsString())
-            let setCandidates = candidates.Where(c => matchingIds.Contains(c.Identifier)).ToList()
-            where setCandidates.Count == option.Ids.Count
-            select new PresentationCandidateSet(setCandidates, setQuery.Required);
+        var sets = new List<PresentationCandidateSet>();
+        foreach (var setQuery in credentialSetQueries)
+        {
+            var firstMatchingOption = setQuery.Options
+                .Select(option =>
+                {
+                    return (
+                        Option: option,
+                        SetCandidates: candidates
+                            .Where(c => option.Ids.Select(id => id.AsString()).Contains(c.Identifier))
+                            .ToList()
+                    );
+                })
+                .FirstOrDefault(x => x.SetCandidates.Count == x.Option.Ids.Count);
 
-        var sets = matchingSets.ToList();
+            if (firstMatchingOption != default)
+            {
+                sets.Add(new PresentationCandidateSet(firstMatchingOption.SetCandidates, setQuery.Required));
+            }
+        }
         return new CandidateQueryResult(
             sets.Count > 0 ? sets : Option<List<PresentationCandidateSet>>.None,
             missing.Count > 0 ? missing : Option<List<CredentialRequirement>>.None

src/WalletFramework.Oid4Vc/Oid4Vp/TransactionDatas/TransactionDataFun.cs

@@ -110,7 +110,9 @@ internal static Validation<AuthorizationRequestCancellation, PresentationRequest
                 // Flatten to (setIndex, candidateIndex, candidate)
                 var indexedCandidates = candidateSets
                     .SelectMany((set, setIdx) =>
-                        set.Candidates.Select((candidate, candIdx) => (setIdx, candIdx, candidate)))
+                    {
+                        return set.Candidates.Select((candidate, candIdx) => (setIdx, candIdx, candidate));
+                    })
                     .ToList();
 
                 var updatedCandidates = indexedCandidates.ToDictionary(

test/WalletFramework.Oid4Vc.Tests/Oid4Vp/Dcql/CredentialSets/CredentialSetTests.cs

@@ -64,4 +64,21 @@ public void Candidate_Query_Result_Can_Be_Built_Correctly_From_Dcql_With_One_Cre
         candidatesList.Count.Should().Be(2, "should have a candidate for each credential query in the set");
         candidateSet.IsRequired.Should().BeTrue();
     }
+
+    [Fact]
+    public void Candidate_Set_Wont_Be_Built_When_A_Credential_is_Missing()
+    {
+        // Arrange
+        var query = DcqlSamples.GetDcqlQueryWithOneCredentialSetAndMultipleOptions;
+        var idCard = SdJwtSamples.GetIdCardCredential();
+        // idCard2 is missing
+        var idCard3 = SdJwtSamples.GetIdCard3Credential();
+        var credentials = new List<ICredential> { idCard, idCard3 };
+
+        // Act
+        var result = query.ProcessWith(credentials);
+
+        // Assert
+        result.Candidates.IsNone.Should().BeTrue("no set should be satisfied if a required credential is missing");
+    }
 }

test/WalletFramework.Oid4Vc.Tests/Oid4Vp/Dcql/Samples/DcqlSamples.cs

@@ -100,8 +100,8 @@ public static class DcqlSamples
   ""credential_sets"": [
     {
       ""options"": [
-        [ ""idcard"", ""idcard2"" ],
-        [ ""idcard2"", ""idcard3"" ]
+        [ ""idcard"", ""idcard2""],
+        [ ""idcard2""]
       ]
     }
   ]