mvp of webhooks for subwallets

Author: wip-abramson

libs/aries-basic-controller/aries_basic_controller/aries_controller.py

@@ -79,6 +79,7 @@ class AriesAgentController:
     revocations: bool = True
     api_key: str = None
     tenant_jwt: str = None
+    wallet_id: str = "base"
 
 
     def __post_init__(self):
@@ -98,6 +99,7 @@ def __post_init__(self):
         if self.tenant_jwt:
             self.headers.update({'Authorization': 'Bearer ' + self.tenant_jwt, 'content-type': "application/json"})
 
+
         self.client_session: ClientSession = ClientSession(headers=self.headers)
 
         # Instantiate controllers based on the provided attributes
@@ -135,6 +137,7 @@ def __post_init__(self):
                 self.client_session
             )
 
+
 
     def update_tenant_jwt(self, tenant_jwt: str): 
         """Update the tenant JW token attribute and the header
@@ -218,8 +221,13 @@ def add_listener(self, listener):
             A dictionary comprised of a "handler": handler (fct) and a "topic":"topicname" key-value pairs
         """
         try:
-            pub.subscribe(listener["handler"], listener["topic"])
-            logger.debug("Lister added for topic : ", listener["topic"])
+            pub_topic_path = listener['topic']
+            if self.wallet_id:
+                pub_topic_path = f"{self.wallet_id}.{pub_topic_path}"
+            print("Subscribing too: " + pub_topic_path)
+            pub.subscribe(listener["handler"], pub_topic_path)
+
+            logger.debug("Lister added for topic : ", pub_topic_path)
         except Exception as exc:
             print(f"Adding webhooks listener failed! {exc!r} occurred.")
             logger.warn(f"Adding webhooks listener failed! {exc!r} occurred.")
@@ -267,7 +275,7 @@ async def listen_webhooks(self):
         """Create a server to listen to webhooks"""
         try:
             app = web.Application()
-            app.add_routes([web.post(self.webhook_base + "/topic/{topic}/", self._receive_webhook)])
+            app.add_routes([web.post(self.webhook_base + "/{wallet}/topic/{topic}/", self._receive_webhook)])
             runner = web.AppRunner(app)
             await runner.setup()
             self.webhook_site = web.TCPSite(runner, self.webhook_host, self.webhook_port)
@@ -292,17 +300,18 @@ async def _receive_webhook(self, request: ClientRequest):
             A response with status 200
         """
         topic = request.match_info["topic"]
-
+        wallet = request.match_info["wallet"]
+        print("wallet", wallet)
         try:
             payload = await request.json()
-            await self._handle_webhook(topic, payload)
+            await self._handle_webhook(wallet, topic, payload)
             return web.Response(status=200)
         except Exception as exc:
             logger.warn(f"Receiving webhooks failed! {exc!r} occurred.")
 
 
 
-    async def _handle_webhook(self, topic, payload):
+    async def _handle_webhook(self, wallet, topic, payload):
         """Helper handling a webhook
         
         Args:
@@ -313,8 +322,10 @@ async def _handle_webhook(self, topic, payload):
             A JSON-like dictionary representation of the payload
         """
         try:
-            logging.debug(f"Handle Webhook - {topic}", payload)
-            pub.sendMessage(topic, payload=payload)
+            pub_topic_path = f"{wallet}.{topic}"
+            print(f"Handle Webhook - {pub_topic_path}", payload)
+            logging.debug(f"Handle Webhook - {pub_topic_path}", payload)
+            pub.sendMessage(pub_topic_path, payload=payload)
             # return web.Response(status=200)
         except Exception as exc:
             logger.warn(f"Handling webhooks failed! {exc!r} occurred when trying to handle this topic: {topic}")

tutorials/4. Multitenancy/docker-compose.yml

@@ -99,7 +99,7 @@ services:
       - AGENT_NAME=${MULTITENANT_AGENT_NAME}
       - ADMIN_PORT=${MULTITENANT_ADMIN_PORT}
       - HTTP_PORT=${MULTITENANT_HTTP_PORT}
-      - ACAPY_WEBHOOK_URL=${MULTITENANT_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${MULTITENANT_WEBHOOK_URL}/base
       - AGENT_ENDPOINT=${MULTITENANT_AGENT_ENDPOINT}
       - WALLET_SEED=${MULTITENANT_WALLET_SEED}
       - WALLET_NAME=${MULTITENANT_WALLET_NAME}

tutorials/4. Multitenancy/notebooks/mediator/Configure Mediator.ipynb

@@ -32,7 +32,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
     {
@@ -64,7 +64,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -78,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -102,9 +102,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "base.connections\n"
+     ]
+    }
+   ],
    "source": [
     "\n",
     "loop = asyncio.get_event_loop()\n",
@@ -139,36 +147,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Connection Handler Called\n",
-      "Connection 98e7d448-5a16-40b0-bab6-afe9e7b2f96f in State invitation\n",
-      "Connection Handler Called\n",
-      "Connection 98e7d448-5a16-40b0-bab6-afe9e7b2f96f in State invitation\n",
-      "Connection ID 98e7d448-5a16-40b0-bab6-afe9e7b2f96f\n",
+      "Connection ID aa9a800e-9e65-4070-98d8-4f56971d6292\n",
       "Invitation\n",
-      "{'@type': 'did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/connections/1.0/invitation', '@id': '4d68d1f0-83d4-49b9-bb96-9ac35283878d', 'serviceEndpoint': 'https://6512c3c6a284.ngrok.io', 'label': 'MEDIATOR', 'recipientKeys': ['8kPjcAdzMdf8giMrsWackJRDHEUeG6uoDu7ECVm1yGrY']}\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State invitation\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State invitation\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State request\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State request\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State response\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State response\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State active\n",
-      "Connection Handler Called\n",
-      "Connection ab02b489-033d-4378-8202-ad31751d64f0 in State active\n"
+      "{'@type': 'did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/connections/1.0/invitation', '@id': '61520ae1-80f8-473c-ae56-31472c252ceb', 'label': 'MEDIATOR', 'recipientKeys': ['EZ1hdmdntvBTMDW7SHFmQrL28hSV2U3Ctj83ERCzL34C'], 'serviceEndpoint': 'https://7976bda13d4b.ngrok.io'}\n"
      ]
     }
    ],

tutorials/4. Multitenancy/notebooks/mediator/Untitled.ipynb

@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 5
+}