allow new status list nesting (#268)

Signed-off-by: Johannes Tuerk <[email protected]>
openwallet-foundation-labs · Feb 11, 2025 · 907cf2c · 907cf2c
1 parent 7df514a
commit 907cf2c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/WalletFramework.SdJwtVc/Models/Records/SdJwtRecord.cs b/src/WalletFramework.SdJwtVc/Models/Records/SdJwtRecord.cs
@@ -207,8 +207,10 @@ public SdJwtRecord(
         Claims = sdJwtDoc.GetAllSubjectClaims();
         Display = display;
         DisplayedAttributes = displayedAttributes;
-        StatusListEntry = sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>() is not null
-            ? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>()
+        StatusListEntry = (sdJwtDoc.UnsecuredPayload.SelectToken("status")?.SelectToken("status_list")?.ToObject<StatusListEntry>() 
+                           ?? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>()) is not null
+            ? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.SelectToken("status_list")?.ToObject<StatusListEntry>() 
+              ?? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>()
             : null;
 
         CredentialSetId = credentialSetId;
@@ -248,8 +250,10 @@ public SdJwtRecord(
         Claims = sdJwtDoc.GetAllSubjectClaims();
         Display = display;
         DisplayedAttributes = displayedAttributes;
-        StatusListEntry = sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>() is not null
-            ? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>()
+        StatusListEntry = (sdJwtDoc.UnsecuredPayload.SelectToken("status")?.SelectToken("status_list")?.ToObject<StatusListEntry>() 
+                           ?? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>()) is not null
+            ? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.SelectToken("status_list")?.ToObject<StatusListEntry>() 
+              ?? sdJwtDoc.UnsecuredPayload.SelectToken("status")?.ToObject<StatusListEntry>()
             : null;
 
         CredentialSetId = credentialSetId;