✨Improve error detail when re-requesting credential

app/models/tenants.py

@@ -34,6 +34,7 @@
     "ACAPY_AUTO_RESPOND_CREDENTIAL_OFFER",
     "ACAPY_AUTO_RESPOND_CREDENTIAL_REQUEST",
     "ACAPY_AUTO_VERIFY_PRESENTATION",
+    "ACAPY_AUTO_STORE_CREDENTIAL",
     # "ACAPY_LOG_LEVEL",
     # "ACAPY_MONITOR_PING",
     # "ACAPY_NOTIFY_REVOCATION",

app/services/issuer/acapy_issuer_v2.py

@@ -141,12 +141,22 @@ async def request_credential(
 
         bound_logger.debug("Sending v2 credential request")
         request_body = V20CredRequestRequest(auto_remove=auto_remove)
-        record = await handle_acapy_call(
-            logger=bound_logger,
-            acapy_call=controller.issue_credential_v2_0.send_request,
-            cred_ex_id=credential_exchange_id,
-            body=request_body,
-        )
+
+        try:
+            record = await handle_acapy_call(
+                logger=bound_logger,
+                acapy_call=controller.issue_credential_v2_0.send_request,
+                cred_ex_id=credential_exchange_id,
+                body=request_body,
+            )
+        except CloudApiException as e:
+            # Provide improved error message:
+            if "create_request() called multiple times" in e.detail:
+                raise CloudApiException(
+                    f"Credential {credential_exchange_id} has already been requested",
+                    status_code=409,
+                ) from e
+            raise e
 
         bound_logger.debug("Returning v2 send request result as CredentialExchange.")
         return cls.__record_to_model(record)

app/tests/e2e/issuer/test_indy_credentials.py

@@ -3,16 +3,19 @@
 import pytest
 from assertpy import assert_that
 
+from app.routes.admin.tenants import router as tenant_admin_router
 from app.routes.definitions import CredentialSchema
 from app.routes.issuer import router as issuer_router
 from app.routes.oob import router as oob_router
 from app.tests.fixtures.credentials import sample_credential_attributes
 from app.tests.util.connections import FaberAliceConnect
-from app.tests.util.webhooks import check_webhook_state
+from app.tests.util.regression_testing import TestMode
+from app.tests.util.webhooks import check_webhook_state, get_wallet_id_from_async_client
 from shared import RichAsyncClient
 
 CREDENTIALS_BASE_PATH = issuer_router.prefix
 OOB_BASE_PATH = oob_router.prefix
+TENANTS_BASE_PATH = tenant_admin_router.prefix
 
 
 @pytest.mark.anyio
@@ -299,3 +302,78 @@
 
     assert response.status_code == 200
     assert len(response.json()["cred_rev_ids_published"]) == 1
+
+
+@pytest.mark.anyio
+@pytest.mark.skipif(
+    TestMode.regression_run in TestMode.fixture_params,
+    reason="We don't want to modify wallet settings for regression runs",
+)
+async def test_requesting_already_issued_credential(
+    alice_member_client: RichAsyncClient,
+    tenant_admin_client: RichAsyncClient,
+    faber_client: RichAsyncClient,
+    faber_and_alice_connection: FaberAliceConnect,
+    credential_definition_id: str,
+):
+    # First, configure Alice to not auto-complete credential flow
+    alice_wallet_id = get_wallet_id_from_async_client(alice_member_client)
+    update_request = {"extra_settings": {"ACAPY_AUTO_STORE_CREDENTIAL": False}}
+    update_response = await tenant_admin_client.put(
+        f"{TENANTS_BASE_PATH}/{alice_wallet_id}",
+        json=update_request,
+    )
+    assert update_response.status_code == 200
+
+    # Create credential offer
+    credential = {
+        "connection_id": faber_and_alice_connection.faber_connection_id,
+        "indy_credential_detail": {
+            "credential_definition_id": credential_definition_id,
+            "attributes": sample_credential_attributes,
+        },
+        "save_exchange_record": True,
+    }
+
+    # Send credential offer
+    response = await faber_client.post(
+        CREDENTIALS_BASE_PATH,
+        json=credential,
+    )
+    credential_exchange = response.json()
+    thread_id = credential_exchange["thread_id"]
+
+    # Wait for offer to be received
+    await check_webhook_state(
+        client=alice_member_client,
+        topic="credentials",
+        state="offer-received",
+        filter_map={
+            "thread_id": thread_id,
+        },
+    )
+
+    # Get credential exchange ID
+    await asyncio.sleep(0.5)  # credential may take moment to reflect after webhook
+    response = await alice_member_client.get(
+        CREDENTIALS_BASE_PATH,
+        params={"thread_id": thread_id},
+    )
+    credential_exchange_id = (response.json())[0]["credential_exchange_id"]
+
+    # First request should succeed
+    request_response = await alice_member_client.post(
+        f"{CREDENTIALS_BASE_PATH}/{credential_exchange_id}/request",
+    )
+    assert request_response.status_code == 200
+
+    await asyncio.sleep(1)  # sleep for record to update
+
+    # Second request should fail with 409
+    error_response = await alice_member_client.post(
+        f"{CREDENTIALS_BASE_PATH}/{credential_exchange_id}/request",
+    )
+    assert error_response.status_code == 409
+    assert error_response.json()["detail"] == (
+        f"Credential {credential_exchange_id} has already been requested"
+    )