Added missing formats field

Signed-off-by: Gavin Jaeger-Freeborn <[email protected]>

oidc-controller/api/core/aries/__init__.py

@@ -1,6 +1,6 @@
 # flake8: noqa
 
-from .present_proof_attachment import PresentProofv10Attachment
+from .present_proof_attachment import PresentProofv20Attachment
 from .service_decorator import ServiceDecorator, OOBServiceDecorator
 
 from .present_proof_presentation import PresentationRequestMessage

oidc-controller/api/core/aries/present_proof_attachment.py

@@ -5,16 +5,16 @@
 from pydantic import BaseModel, Field
 
 
-class PresentProofv10Attachment(BaseModel):
-    # https://github.com/hyperledger/aries-rfcs/blob/main/features/0037-present-proof/README.md#request-presentation
+class PresentProofv20Attachment(BaseModel):
+    # https://github.com/hyperledger/aries-rfcs/tree/eace815c3e8598d4a8dd7881d8c731fdb2bcc0aa/features/0454-present-proof-v2
     id: str = Field(default="libindy-request-presentation-0", alias="@id")
     mime_type: str = Field(default="application/json", alias="mime-type")
     data: Dict
 
     @classmethod
     def build(
         cls, presentation_request
-    ) -> "PresentProofv10Attachment":  # bundle everything needed for the QR code
+    ) -> "PresentProofv20Attachment":  # bundle everything needed for the QR code
         return cls(
             data={
                 "base64": base64.b64encode(

oidc-controller/api/core/aries/present_proof_presentation.py

@@ -1,9 +1,9 @@
 import json
 import base64
-from typing import Optional, List
+from typing import Optional, List, Dict
 
 from pydantic import BaseModel, ConfigDict, Field
-from api.core.aries import PresentProofv10Attachment, ServiceDecorator
+from api.core.aries import PresentProofv20Attachment, ServiceDecorator
 
 
 class PresentationRequestMessage(BaseModel):
@@ -13,7 +13,8 @@ class PresentationRequestMessage(BaseModel):
         "https://didcomm.org/present-proof/2.0/request-presentation",
         alias="@type",
     )
-    request: List[PresentProofv10Attachment] = Field(
+    formats: List[Dict]
+    request: List[PresentProofv20Attachment] = Field(
         alias="request_presentations~attach"
     )
     comment: Optional[str] = None

oidc-controller/api/routers/oidc.py

@@ -123,12 +123,21 @@ async def get_authorize(request: Request, db: Database = Depends(get_db)):
     else:
         wallet_did = client.get_wallet_did(public=use_public_did)
 
-        byo_attachment = PresentProofv10Attachment.build(pres_exch_dict["pres_request"])
+        byo_attachment = PresentProofv20Attachment(
+            # As of present proof 2.0 the
+            data=pres_exch_dict["pres_request"]["request_presentations~attach"][0][
+                "data"
+            ]
+        )
+
         s_d = ServiceDecorator(
             service_endpoint=client.service_endpoint, recipient_keys=[wallet_did.verkey]
         )
         msg = PresentationRequestMessage(
             id=pres_exch_dict["thread_id"],
+            formats=[
+                {"attach_id": byo_attachment.id, "format": "hlindy/[email protected]"}
+            ],
             request=[byo_attachment],
             service=s_d,
         )