Merge pull request #2615 from dbluhm/fix/presentation-result-verifica…

…tion fix: report presentation result
openwallet-foundation · Nov 21, 2023 · 0b01fff · 0b01fff
2 parents fee8e62 + 8663036
commit 0b01fff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/handler.py b/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/handler.py
@@ -188,13 +188,13 @@ async def create_pres(
             limit_record_ids = pres_spec_payload.get("record_ids")
             reveal_doc_frame = pres_spec_payload.get("reveal_doc")
         if not pres_definition:
-            if "options" in proof_request:
-                challenge = proof_request["options"].get("challenge")
-                domain = proof_request["options"].get("domain")
             pres_definition = PresentationDefinition.deserialize(
                 proof_request.get("presentation_definition")
             )
             issuer_id = None
+        if "options" in proof_request:
+            challenge = proof_request["options"].get("challenge")
+            domain = proof_request["options"].get("domain")
         if not challenge:
             challenge = str(uuid4())
 

diff --git a/aries_cloudagent/vc/vc_ld/verify.py b/aries_cloudagent/vc/vc_ld/verify.py
@@ -111,7 +111,6 @@ async def _verify_presentation(
     )
 
     credential_results = None
-    verified = True
 
     credentials = JsonLdProcessor.get_values(presentation, "verifiableCredential")
     credential_results = await asyncio.gather(
@@ -129,7 +128,8 @@ async def _verify_presentation(
         ]
     )
 
-    verified = all(result.verified for result in credential_results)
+    credentials_verified = all(result.verified for result in credential_results)
+    verified = credentials_verified and presentation_result.verified
 
     return PresentationVerificationResult(
         verified=verified,