Merge pull request #330 from sklump/pres-repeat-cred-def

accommodate proofs with repeat cred defs, check for bait-and-switch b…
openwallet-foundation · Jan 20, 2020 · bb86a63 · bb86a63
2 parents 10db549 + 6b24a25
commit bb86a63
Show file tree

Hide file tree

Showing 10 changed files with 1,003 additions and 137 deletions.
diff --git a/aries_cloudagent/protocols/present_proof/v1_0/handlers/presentation_request_handler.py b/aries_cloudagent/protocols/present_proof/v1_0/handlers/presentation_request_handler.py
@@ -10,9 +10,10 @@
 from .....storage.error import StorageNotFoundError
 
 from ..manager import PresentationManager
+from ..messages.presentation_proposal import PresentationProposal
 from ..messages.presentation_request import PresentationRequest
 from ..models.presentation_exchange import V10PresentationExchange
-from ..util.indy import indy_proof_request2indy_requested_creds
+from ..util.indy import indy_proof_req_preview2indy_requested_creds
 
 
 class PresentationRequestHandler(BaseHandler):
@@ -41,7 +42,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
 
         indy_proof_request = context.message.indy_proof_request(0)
 
-        # Get credential exchange record (holder initiated via proposal)
+        # Get presentation exchange record (holder initiated via proposal)
         # or create it (verifier sent request first)
         try:
             (
@@ -70,9 +71,18 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
 
         # If auto_present is enabled, respond immediately with presentation
         if presentation_exchange_record.auto_present:
+            presentation_preview = None
+            if presentation_exchange_record.presentation_proposal_dict:
+                exchange_pres_proposal = PresentationProposal.deserialize(
+                    presentation_exchange_record.presentation_proposal_dict
+                )
+                presentation_preview = exchange_pres_proposal.presentation_proposal
+
             try:
-                req_creds = await indy_proof_request2indy_requested_creds(
-                    indy_proof_request, await context.inject(BaseHolder)
+                req_creds = await indy_proof_req_preview2indy_requested_creds(
+                    indy_proof_request,
+                    presentation_preview,
+                    holder=await context.inject(BaseHolder)
                 )
             except ValueError as err:
                 self._logger.warning(f"{err}")