fix: Problem Report Before Exchange

Signed-off-by: Rob Simpson <[email protected]>
openwallet-foundation · Sep 27, 2023 · 7283b43 · 7283b43
1 parent f68914b
commit 7283b43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/aries_cloudagent/protocols/issue_credential/v1_0/routes.py b/aries_cloudagent/protocols/issue_credential/v1_0/routes.py
@@ -668,8 +668,6 @@ async def credential_exchange_send_proposal(request: web.BaseRequest):
 
     connection_record = None
     cred_ex_record = None
-    credential_proposal = None
-    result = None
     try:
         preview = CredentialPreview.deserialize(preview_spec) if preview_spec else None
         async with profile.session() as session:
@@ -695,12 +693,12 @@ async def credential_exchange_send_proposal(request: web.BaseRequest):
             async with profile.session() as session:
                 await cred_ex_record.save_error_state(session, reason=err.roll_up)
         # other party cannot yet receive a problem report about our failed protocol start
+        raise web.HTTPBadRequest(reason=err.roll_up)
 
-    else:
-        await outbound_handler(
-            credential_proposal,
-            connection_id=connection_id,
-        )
+    await outbound_handler(
+        credential_proposal,
+        connection_id=connection_id,
+    )
 
     trace_event(
         context.settings,
@@ -873,8 +871,6 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
 
     cred_ex_record = None
     connection_record = None
-    credential_offer_message = None
-    result = None
     try:
         async with profile.session() as session:
             connection_record = await ConnRecord.retrieve_by_id(session, connection_id)
@@ -903,9 +899,9 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
             async with profile.session() as session:
                 await cred_ex_record.save_error_state(session, reason=err.roll_up)
         # other party cannot yet receive a problem report about our failed protocol start
+        raise web.HTTPBadRequest(reason=err.roll_up)
 
-    else:
-        await outbound_handler(credential_offer_message, connection_id=connection_id)
+    await outbound_handler(credential_offer_message, connection_id=connection_id)
 
     trace_event(
         context.settings,

diff --git a/aries_cloudagent/protocols/issue_credential/v2_0/routes.py b/aries_cloudagent/protocols/issue_credential/v2_0/routes.py
@@ -805,8 +805,6 @@ async def credential_exchange_send_proposal(request: web.BaseRequest):
 
     conn_record = None
     cred_ex_record = None
-    cred_proposal_message = None
-    result = None
     try:
         cred_preview = (
             V20CredPreview.deserialize(preview_spec) if preview_spec else None
@@ -838,9 +836,9 @@ async def credential_exchange_send_proposal(request: web.BaseRequest):
             async with profile.session() as session:
                 await cred_ex_record.save_error_state(session, reason=err.roll_up)
         # other party cannot yet receive a problem report about our failed protocol start
+        raise web.HTTPBadRequest(reason=err.roll_up)
 
-    else:
-        await outbound_handler(cred_proposal_message, connection_id=connection_id)
+    await outbound_handler(cred_proposal_message, connection_id=connection_id)
 
     trace_event(
         context.settings,
@@ -1008,8 +1006,6 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
 
     cred_ex_record = None
     conn_record = None
-    cred_offer_message = None
-    result = None
     try:
         async with profile.session() as session:
             conn_record = await ConnRecord.retrieve_by_id(session, connection_id)
@@ -1042,9 +1038,9 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
             async with profile.session() as session:
                 await cred_ex_record.save_error_state(session, reason=err.roll_up)
         # other party cannot yet receive a problem report about our failed protocol start
+        raise web.HTTPBadRequest(reason=err.roll_up)
 
-    else:
-        await outbound_handler(cred_offer_message, connection_id=connection_id)
+    await outbound_handler(cred_offer_message, connection_id=connection_id)
 
     trace_event(
         context.settings,
@@ -1202,8 +1198,6 @@ async def credential_exchange_send_free_request(request: web.BaseRequest):
 
     conn_record = None
     cred_ex_record = None
-    cred_request_message = None
-    result = None
     try:
         try:
             async with profile.session() as session:
@@ -1249,9 +1243,9 @@ async def credential_exchange_send_free_request(request: web.BaseRequest):
             async with profile.session() as session:
                 await cred_ex_record.save_error_state(session, reason=err.roll_up)
         # other party cannot yet receive a problem report about our failed protocol start
+        raise web.HTTPBadRequest(reason=err.roll_up)
 
-    else:
-        await outbound_handler(cred_request_message, connection_id=connection_id)
+    await outbound_handler(cred_request_message, connection_id=connection_id)
 
     trace_event(
         context.settings,