Self attest with non-auto attestation (#1755)

* Self attest with non-auto attestation

Signed-off-by: jamshale <[email protected]>

* Fix: json loads default

Signed-off-by: jamshale <[email protected]>

* Fix: repair unit test

Signed-off-by: jamshale <[email protected]>

* Refactor more server client code

Signed-off-by: jamshale <[email protected]>

* Update/Add integration tests

Signed-off-by: jamshale <[email protected]>

* Update: comments

Signed-off-by: jamshale <[email protected]>

* Initiate the server client once when controller created

Signed-off-by: jamshale <[email protected]>

---------

Signed-off-by: jamshale <[email protected]>

Author: jamshale

webvh/.devcontainer/post-install.sh

@@ -8,4 +8,4 @@ WORKSPACE_DIR=$(pwd)
 python -m pip install --upgrade pip
 
 # Generate Poetry Lock file
-poetry lock --no-update
+poetry lock

webvh/integration/tests/test_anoncreds.py

@@ -22,7 +22,12 @@
 async def create_did(agent):
     await agent.post(
         "/did/webvh/configuration",
-        json={"server_url": SERVER_URL, "witness_key": WITNESS_KEY, "witness": True},
+        json={
+            "server_url": SERVER_URL,
+            "witness_key": WITNESS_KEY,
+            "witness": True,
+            "auto_attest": True,
+        },
     )
     identifier = str(uuid.uuid4())
     response = await agent.post(

webvh/integration/tests/test_register_did.py

@@ -4,17 +4,10 @@
 
 import asyncio
 import uuid
-from typing import Optional
 
 import pytest
 from acapy_controller import Controller
 from acapy_controller.controller import params
-from acapy_controller.protocols import (
-    ConnRecord,
-    InvitationMessage,
-    OobRecord,
-    oob_invitation,
-)
 
 from .constants import (
     CONTROLLER_ENV,
@@ -26,89 +19,6 @@
 )
 
 
-async def didexchange(
-    inviter: Controller,
-    invitee: Controller,
-    *,
-    invite: Optional[InvitationMessage] = None,
-    use_existing_connection: bool = False,
-    alias: Optional[str] = None,
-):
-    """Connect two agents using did exchange protocol."""
-    if not invite:
-        invite = await oob_invitation(inviter)
-
-    invitee_oob_record = await invitee.post(
-        "/out-of-band/receive-invitation",
-        json=invite,
-        params=params(
-            use_existing_connection=use_existing_connection,
-            alias=alias,
-        ),
-        response=OobRecord,
-    )
-
-    if use_existing_connection and invitee_oob_record == "reuse-accepted":
-        inviter_oob_record = await inviter.event_with_values(
-            topic="out_of_band",
-            invi_msg_id=invite.id,
-            event_type=OobRecord,
-        )
-        inviter_conn = await inviter.get(
-            f"/connections/{inviter_oob_record.connection_id}",
-            response=ConnRecord,
-        )
-        invitee_conn = await invitee.get(
-            f"/connections/{invitee_oob_record.connection_id}",
-            response=ConnRecord,
-        )
-        return inviter_conn, invitee_conn
-
-    invitee_conn = await invitee.post(
-        f"/didexchange/{invitee_oob_record.connection_id}/accept-invitation",
-        response=ConnRecord,
-    )
-    inviter_oob_record = await inviter.event_with_values(
-        topic="out_of_band",
-        invi_msg_id=invite.id,
-        state="done",
-        event_type=OobRecord,
-    )
-    inviter_conn = await inviter.event_with_values(
-        topic="connections",
-        event_type=ConnRecord,
-        rfc23_state="request-received",
-        invitation_key=inviter_oob_record.our_recipient_key,
-    )
-    # TODO Remove after ACA-Py 0.12.0
-    # There's a bug with race conditions in the OOB multiuse handling
-    await asyncio.sleep(1)
-    inviter_conn = await inviter.post(
-        f"/didexchange/{inviter_conn.connection_id}/accept-request",
-        response=ConnRecord,
-    )
-
-    await invitee.event_with_values(
-        topic="connections",
-        connection_id=invitee_conn.connection_id,
-        rfc23_state="response-received",
-    )
-    invitee_conn = await invitee.event_with_values(
-        topic="connections",
-        connection_id=invitee_conn.connection_id,
-        rfc23_state="completed",
-        event_type=ConnRecord,
-    )
-    inviter_conn = await inviter.event_with_values(
-        topic="connections",
-        connection_id=inviter_conn.connection_id,
-        rfc23_state="completed",
-        event_type=ConnRecord,
-    )
-
-    return inviter_conn, invitee_conn
-
-
 @pytest.mark.asyncio
 async def test_create_single_tenant():
     """Test Controller protocols."""
@@ -314,3 +224,53 @@ async def test_create_with_witness_and_manual_attest():
         did_web = f"did:web:{WEBVH_DOMAIN}:{TEST_NAMESPACE}:{identifier}"
         assert response["did_document"]["id"] == did_web
         assert response["did_document"]["alsoKnownAs"][0].startswith("did:webvh:")
+
+
+@pytest.mark.asyncio
+async def test_create_self_witness_and_manual_attest():
+    """Test Controller protocols."""
+    async with Controller(base_url=WITNESS) as witness:
+        witness_config = (await witness.get("/status/config"))["config"]
+        server_url: str = witness_config["plugin_config"]["did-webvh"]["server_url"]
+
+        # Configure WebVH Witness
+        response = await witness.post(
+            "/did/webvh/configuration",
+            json={
+                "server_url": server_url,
+                "witness_key": WITNESS_KEY,
+                "witness": True,
+                "auto_attest": False,
+            },
+        )
+        assert response["multikey"] == WITNESS_KEY
+
+        # Ensure the witness key is properly configured
+        response = await witness.get(f"/wallet/keys/{WITNESS_KEY}")
+        assert response["kid"] == WITNESS_KID
+
+        # Create the initial did
+        identifier = str(uuid.uuid4())
+        response = await witness.post(
+            "/did/webvh/controller/create",
+            json={"options": {"namespace": TEST_NAMESPACE, "identifier": identifier}},
+        )
+
+        status = response.get("status")
+        assert status == "pending"
+
+        response = await witness.get("/did/webvh/witness/registrations")
+        entry = response.get("results", []).pop()
+        assert isinstance(entry, dict)
+
+        await witness.post(
+            "/did/webvh/witness/registrations",
+            params=params(did=entry["id"]),
+        )
+        await asyncio.sleep(3)
+
+        # Confirm DID is published
+        response = await witness.get(f"/resolver/resolve/{entry['id']}")
+        did_web = f"did:web:{WEBVH_DOMAIN}:{TEST_NAMESPACE}:{identifier}"
+        assert response["did_document"]["id"] == did_web
+        assert response["did_document"]["alsoKnownAs"][0].startswith("did:webvh:")

webvh/poetry.lock

@@ -11,7 +11,7 @@ python = "^3.12"
 # explicitly installed with the plugin if desired.
 acapy-agent = { version = "~1.3.0", optional = true }
 
-did-webvh = "^1.0.0rc0"
+did-webvh = "1.0.0rc0"
 jcs = "^0.2.1"
 multiformats = "^0.3.1.post4"
 bitstring = "^4.3.0"

webvh/pyproject.toml

@@ -14,3 +14,5 @@
 }
 
 SUPPORTED_KEY_TYPES = ["Multikey", "JsonWebKey"]
+
+WEBVH_METHOD = "did:webvh:1.0"