Merge pull request #3142 from jamshale/patch/0.11.x-pr3081

[ PATCH ] 0.11.x with PR 3081 terse webhooks

aries_cloudagent/protocols/issue_credential/v2_0/messages/cred_ex_record_webhook.py

@@ -23,6 +23,7 @@ class V20CredExRecordWebhook:
         "credential_definition_id",
         "schema_id",
         "credential_id",
+        "by_format",
         "trace",
         "public_did",
         "cred_id_stored",

aries_cloudagent/protocols/issue_credential/v2_0/models/cred_ex_record.py

@@ -197,11 +197,11 @@ async def emit_event(self, session: ProfileSession, payload: Any = None):
         else:
             topic = f"{self.EVENT_NAMESPACE}::{self.RECORD_TOPIC}"
 
-        if session.profile.settings.get("debug.webhooks"):
-            if not payload:
-                payload = self.serialize()
+        # serialize payload before checking for webhook contents
+        if not payload:
+            payload = self.serialize()
         else:
-            payload = V20CredExRecordWebhook(**self.__dict__)
+            payload = V20CredExRecordWebhook(**payload)
             payload = payload.__dict__
 
         await session.profile.notify(topic, payload)

aries_cloudagent/protocols/present_proof/v2_0/messages/pres_webhook.py

@@ -15,6 +15,7 @@ class V20PresExRecordWebhook:
         "thread_id",
         "state",
         "trace",
+        "by_format",
         "verified",
         "verified_msgs",
         "created_at",

aries_cloudagent/protocols/present_proof/v2_0/models/pres_exchange.py

@@ -197,11 +197,11 @@ async def emit_event(self, session: ProfileSession, payload: Any = None):
         else:
             topic = f"{self.EVENT_NAMESPACE}::{self.RECORD_TOPIC}"
 
-        if session.profile.settings.get("debug.webhooks"):
-            if not payload:
-                payload = self.serialize()
-        else:
-            payload = V20PresExRecordWebhook(**self.__dict__)
+        # serialize payload before checking for webhook contents
+        if not payload:
+            payload = self.serialize()
+        if not session.profile.settings.get("debug.webhooks"):
+            payload = V20PresExRecordWebhook(**payload)
             payload = payload.__dict__
 
         await session.profile.notify(topic, payload)

demo/run_bdd

@@ -203,6 +203,9 @@ fi
 if ! [ -z "$WEBHOOK_TARGET" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e WEBHOOK_TARGET=${WEBHOOK_TARGET}"
 fi
+if ! [ -z "$ACAPY_DEBUG_WEBHOOKS" ]; then
+  DOCKER_ENV="${DOCKER_ENV} -e ACAPY_DEBUG_WEBHOOKS=${ACAPY_DEBUG_WEBHOOKS}"
+fi
 # if $TAILS_NETWORK is specified it will override any previously specified $DOCKER_NET
 if ! [ -z "$TAILS_NETWORK" ]; then
   DOCKER_NET="${TAILS_NETWORK}"

demo/run_demo

@@ -224,6 +224,9 @@ fi
 if ! [ -z "$WEBHOOK_TARGET" ]; then
   DOCKER_ENV="${DOCKER_ENV} -e WEBHOOK_TARGET=${WEBHOOK_TARGET}"
 fi
+if ! [ -z "$ACAPY_DEBUG_WEBHOOKS" ]; then
+  DOCKER_ENV="${DOCKER_ENV} -e ACAPY_DEBUG_WEBHOOKS=${ACAPY_DEBUG_WEBHOOKS}"
+fi
 # if $TAILS_NETWORK is specified it will override any previously specified $DOCKER_NET
 if ! [ -z "$TAILS_NETWORK" ]; then
   DOCKER_NET="${TAILS_NETWORK}"

demo/runners/support/agent.py

@@ -40,6 +40,7 @@
 TRACE_ENABLED = os.getenv("TRACE_ENABLED")
 
 WEBHOOK_TARGET = os.getenv("WEBHOOK_TARGET")
+ACAPY_DEBUG_WEBHOOKS = os.getenv("ACAPY_DEBUG_WEBHOOKS")
 
 AGENT_ENDPOINT = os.getenv("AGENT_ENDPOINT")
 
@@ -417,7 +418,8 @@ def get_agent_args(self):
             # turn on notifications if revocation is enabled
             result.append("--notify-revocation")
         # enable extended webhooks
-        result.append("--debug-webhooks")
+        if ACAPY_DEBUG_WEBHOOKS:
+            result.append("--debug-webhooks")
         # always enable notification webhooks
         result.append("--monitor-revocation-notification")
 

docker/Dockerfile.demo

@@ -4,7 +4,6 @@ FROM ${from_image}
 ENV ENABLE_PTVSD 0
 ENV ENABLE_PYDEVD_PYCHARM 0
 ENV PYDEVD_PYCHARM_HOST "host.docker.internal"
-ENV ACAPY_DEBUG_WEBHOOKS 1
 
 RUN mkdir -p bin && curl -L -o bin/jq \
 	https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \