Update OID4VC integration tests and Docker config

Updated Docker Compose health checks and test commands. Temporarily disabled mso_mdoc plugin in dev config. Updated OID4VP flow to use new API endpoints. Cleaned up error handling in test scripts and fixed imports.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>

Author: burdettadam

oid4vc/docker/dev-verifier.yml

@@ -19,8 +19,9 @@ endpoint:
 # plugins
 plugin:
   - oid4vc
-
-# OID4VC plugin configuration - Use different ports for OID4VCI and OID4VP servers
+  - sd_jwt_vc
+  # Temporarily disabled due to missing libisomdl_uniffi.so dependency  
+  # - mso_mdoc# OID4VC plugin configuration - Use different ports for OID4VCI and OID4VP servers
 plugin-config-value:
   - oid4vci.host=0.0.0.0
   - oid4vci.port=8033

oid4vc/docker/dev.yml

@@ -19,6 +19,9 @@ endpoint:
 # plugins
 plugin:
   - oid4vc
+  - sd_jwt_vc
+  # Temporarily disabled due to missing libisomdl_uniffi.so dependency
+  # - mso_mdoc
 
 # OID4VC plugin configuration - Use different port for OID4VCI server
 plugin-config-value:

oid4vc/integration/docker-compose.yml

@@ -17,8 +17,8 @@ services:
       test: ["CMD", "curl", "-f", "http://localhost:3020/health"]
       interval: 10s
       timeout: 5s
-      retries: 3
-      start_period: 15s
+      retries: 5
+      start_period: 30s
 
   # ACA-Py Issuer - Issues credentials via OID4VCI
   acapy-issuer:
@@ -82,7 +82,7 @@ services:
       - WAIT_HOSTS=credo-agent:3020,acapy-issuer:8021,acapy-verifier:8031
       - WAIT_HOSTS_TIMEOUT=300
       - WAIT_SLEEP_INTERVAL=5
-      - WAIT_HTTP_RETRY_COUNT=10
+      - WAIT_HTTP_RETRY_COUNT=15
     volumes:
       - ./test-results:/usr/src/app/test-results
     depends_on:
@@ -92,7 +92,15 @@ services:
         condition: service_healthy
       acapy-verifier:
         condition: service_healthy
-    command: ["uv", "run", "pytest", "tests/test_docker_connectivity.py", "tests/test_acapy_oid4vc_simple.py", "-v"]
+    command: [
+      "sh", "-c",
+      "echo 'Running essential OID4VC integration tests...' && \
+       uv run pytest tests/test_docker_connectivity.py tests/test_acapy_oid4vc_simple.py \
+       --verbose \
+       --tb=short \
+       --junit-xml=test-results/junit-quick.xml \
+       --durations=5"
+    ]
 
 volumes:
   test-results:

oid4vc/integration/tests/test_acapy_credo_oid4vc_flow.py

@@ -36,6 +36,7 @@ async def test_acapy_oid4vci_credential_issuance_to_credo(
 
     # Step 1: Create a supported credential on ACA-Py issuer
     credential_supported = {
+        "id": "IdentityCredential",
         "format": "vc+sd-jwt",
         "scope": "IdentityCredential",
         "cryptographic_binding_methods_supported": ["did:key"],
@@ -142,14 +143,29 @@ async def test_acapy_oid4vp_presentation_verification_from_credo(
         ],
     }
 
-    # Step 2: ACA-Py creates presentation request
+    # Step 2: Create presentation definition first
+    pres_def_data = {
+        "pres_def": presentation_definition
+    }
+    
+    pres_def_response = await acapy_verifier_admin.post(
+        "/oid4vp/presentation-definition", json=pres_def_data
+    )
+    assert "pres_def_id" in pres_def_response
+    pres_def_id = pres_def_response["pres_def_id"]
+
+    # Step 3: ACA-Py creates presentation request
     presentation_request_data = {
-        "presentation_definition": presentation_definition,
-        "response_mode": "direct_post",
+        "pres_def_id": pres_def_id,
+        "vp_formats": {
+            "vc+sd-jwt": {
+                "sd-jwt_alg_values": ["EdDSA", "ES256K", "ES256"]
+            }
+        }
     }
 
     presentation_request = await acapy_verifier_admin.post(
-        "/oid4vp/create-request", json=presentation_request_data
+        "/oid4vp/request", json=presentation_request_data
     )
 
     assert "request_uri" in presentation_request
@@ -171,6 +187,7 @@ async def test_full_acapy_credo_oid4vc_flow(
 
     # Step 1: Setup credential configuration on ACA-Py issuer
     credential_supported = {
+        "id": "UniversityDegreeCredential",
         "format": "vc+sd-jwt",
         "scope": "UniversityDegree",
         "cryptographic_binding_methods_supported": ["did:key"],
@@ -273,13 +290,28 @@ async def test_full_acapy_credo_oid4vc_flow(
         ],
     }
 
+    # Create presentation definition first
+    pres_def_data = {
+        "pres_def": presentation_definition
+    }
+    
+    pres_def_response = await acapy_verifier_admin.post(
+        "/oid4vp/presentation-definition", json=pres_def_data
+    )
+    assert "pres_def_id" in pres_def_response
+    pres_def_id = pres_def_response["pres_def_id"]
+
     presentation_request_data = {
-        "presentation_definition": presentation_definition,
-        "response_mode": "direct_post",
+        "pres_def_id": pres_def_id,
+        "vp_formats": {
+            "vc+sd-jwt": {
+                "sd-jwt_alg_values": ["EdDSA", "ES256K", "ES256"]
+            }
+        }
     }
 
     presentation_request = await acapy_verifier_admin.post(
-        "/oid4vp/create-request", json=presentation_request_data
+        "/oid4vp/request", json=presentation_request_data
     )
     request_uri = presentation_request["request_uri"]
 
@@ -294,7 +326,7 @@ async def test_full_acapy_credo_oid4vc_flow(
 
     # Step 6: Verify presentation was successful
     assert "presentation_submission" in presentation_result
-    assert presentation_result.get("status") in ["success", "completed"]
+    assert presentation_result.get("status") == "success"
 
     # Step 7: Check that ACA-Py received and validated the presentation
     # Wait a moment for processing
@@ -306,7 +338,7 @@ async def test_full_acapy_credo_oid4vc_flow(
 
     # Find our presentation
     latest_presentation = presentations[0]  # Assuming most recent
-    assert latest_presentation.get("state") in ["presentation-valid", "completed"]
+    assert latest_presentation.get("state") == "presentation-valid"
 
     print("✅ Full OID4VC flow completed successfully!")
     print(f"   - ACA-Py issued credential: {config_id}")

oid4vc/integration/tests/test_acapy_oid4vc_simple.py

@@ -38,12 +38,8 @@ async def test_simple_oid4vc_flow():
     async with httpx.AsyncClient(
         base_url=CREDO_AGENT_URL, timeout=10.0
     ) as credo_client:
-        try:
-            credo_status = await credo_client.get("/health")
-            print(f"   Credo status: {credo_status.status_code}")
-        except Exception as e:
-            print(f"   Credo error: {e}")
-            return False
+        credo_status = await credo_client.get("/health")
+        print(f"   Credo status: {credo_status.status_code}")
 
         print("✅ All services are healthy!")
 
@@ -66,22 +62,14 @@ async def test_simple_oid4vc_flow():
 
 async def main():
     """Main test runner."""
-    try:
-        success = await test_simple_oid4vc_flow()
-        if success:
-            print("\n✅ Test completed successfully!")
-        else:
-            print("\n❌ Test failed!")
-            return 1
-    except Exception as e:
-        print(f"\n💥 Test crashed: {e}")
-        import traceback
-
-        traceback.print_exc()
+    success = await test_simple_oid4vc_flow()
+    if success:
+        print("\n✅ Test completed successfully!")
+        return 0
+    else:
+        print("\n❌ Test failed!")
         return 1
 
-    return 0
-
 
 if __name__ == "__main__":
     exit_code = asyncio.run(main())

oid4vc/integration/tests/test_dcql.py

@@ -1,5 +1,5 @@
 import pytest
-from acapy_controller.controller import Controller
+from acapy_controller import Controller
 
 
 @pytest.mark.asyncio

oid4vc/integration/tests/test_dual_endpoints.py

@@ -188,32 +188,25 @@ async def test_oid4vci_server_endpoints():
 if __name__ == "__main__":
     # Allow running this test file directly for debugging
     import sys
-    import traceback
 
     async def run_all_tests():
-        try:
-            print("🚀 Starting dual endpoint compatibility tests...\n")
+        print("🚀 Starting dual endpoint compatibility tests...\n")
 
-            await test_acapy_services_health()
-            print()
+        await test_acapy_services_health()
+        print()
 
-            await test_dual_oid4vci_endpoints()
-            print()
+        await test_dual_oid4vci_endpoints()
+        print()
 
-            await test_credo_can_reach_underscore_endpoint()
-            print()
+        await test_credo_can_reach_underscore_endpoint()
+        print()
 
-            await test_oid4vci_server_endpoints()
-            print()
+        await test_oid4vci_server_endpoints()
+        print()
 
-            print(
-                "🎉 All tests passed! Dual endpoint compatibility is working correctly."
-            )
-
-        except Exception as e:
-            print(f"❌ Test failed: {e}")
-            traceback.print_exc()
-            sys.exit(1)
+        print(
+            "🎉 All tests passed! Dual endpoint compatibility is working correctly."
+        )
 
     if len(sys.argv) > 1 and sys.argv[1] == "run":
         asyncio.run(run_all_tests())