Merge pull request #83 from OpenMined/feature/om_course

Completed OpenMined PKI Course Tutorials

Author: wip-abramson

configuration/aries-args-advanced.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>
@@ -33,7 +33,7 @@ auto-ping-connection: true
 wallet-type: !ENV ${WALLET_TYPE}
 wallet-name: !ENV ${WALLET_NAME}
 wallet-key: !ENV ${WALLET_KEY}
-seed: !ENV ${WALLET_SEED}
+#seed: !ENV ${WALLET_SEED}
 
 ## run a local postgres (docker) like:
 ##    docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d -p 5432:5432 postgres:10

configuration/aries-args-basic.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

configuration/aries-args-multitenant.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

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

@@ -219,6 +219,7 @@ def add_listener(self, listener):
         """
         try:
             pub.subscribe(listener["handler"], listener["topic"])
+            logger.debug("Lister added for topic : ", listener["topic"])
         except Exception as exc:
             print(f"Adding webhooks listener failed! {exc!r} occurred.")
             logger.warn(f"Adding webhooks listener failed! {exc!r} occurred.")
@@ -291,6 +292,7 @@ async def _receive_webhook(self, request: ClientRequest):
             A response with status 200
         """
         topic = request.match_info["topic"]
+
         try:
             payload = await request.json()
             await self._handle_webhook(topic, payload)

projects/aries-fl/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - AGENT_NAME=${NHSTRUST_AGENT_NAME}
       - ADMIN_PORT=${NHSTRUST_ADMIN_PORT}
       - HTTP_PORT=${NHSTRUST_HTTP_PORT}
-      - WEBHOOK_URL=${NHSTRUST_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${NHSTRUST_WEBHOOK_URL}
       - AGENT_ENDPOINT=${NHSTRUST_AGENT_ENDPOINT}
       - WALLET_SEED=${NHSTRUST_WALLET_SEED}
       - WALLET_NAME=${NHSTRUST_WALLET_NAME}
@@ -54,7 +54,7 @@ services:
       - AGENT_NAME=${REGULATOR_AGENT_NAME}
       - ADMIN_PORT=${REGULATOR_ADMIN_PORT}
       - HTTP_PORT=${REGULATOR_HTTP_PORT}
-      - WEBHOOK_URL=${REGULATOR_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${REGULATOR_WEBHOOK_URL}
       - AGENT_ENDPOINT=${REGULATOR_AGENT_ENDPOINT}
       - WALLET_SEED=${REGULATOR_WALLET_SEED}
       - WALLET_NAME=${REGULATOR_WALLET_NAME}
@@ -99,7 +99,7 @@ services:
       - AGENT_NAME=${RESEARCHER_AGENT_NAME}
       - ADMIN_PORT=${RESEARCHER_ADMIN_PORT}
       - HTTP_PORT=${RESEARCHER_HTTP_PORT}
-      - WEBHOOK_URL=${RESEARCHER_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${RESEARCHER_WEBHOOK_URL}
       - AGENT_ENDPOINT=${RESEARCHER_AGENT_ENDPOINT}
       - WALLET_SEED=${RESEARCHER_WALLET_SEED}
       - WALLET_NAME=${RESEARCHER_WALLET_NAME}
@@ -144,7 +144,7 @@ services:
       - AGENT_NAME=${HOSPITAL1_AGENT_NAME}
       - ADMIN_PORT=${HOSPITAL1_ADMIN_PORT}
       - HTTP_PORT=${HOSPITAL1_HTTP_PORT}
-      - WEBHOOK_URL=${HOSPITAL1_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HOSPITAL1_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HOSPITAL1_AGENT_ENDPOINT}
       - WALLET_SEED=${HOSPITAL1_WALLET_SEED}
       - WALLET_NAME=${HOSPITAL1_WALLET_NAME}
@@ -190,7 +190,7 @@ services:
       - AGENT_NAME=${HOSPITAL2_AGENT_NAME}
       - ADMIN_PORT=${HOSPITAL2_ADMIN_PORT}
       - HTTP_PORT=${HOSPITAL2_HTTP_PORT}
-      - WEBHOOK_URL=${HOSPITAL2_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HOSPITAL2_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HOSPITAL2_AGENT_ENDPOINT}
       - WALLET_SEED=${HOSPITAL2_WALLET_SEED}
       - WALLET_NAME=${HOSPITAL2_WALLET_NAME}
@@ -236,7 +236,7 @@ services:
       - AGENT_NAME=${HOSPITAL3_AGENT_NAME}
       - ADMIN_PORT=${HOSPITAL3_ADMIN_PORT}
       - HTTP_PORT=${HOSPITAL3_HTTP_PORT}
-      - WEBHOOK_URL=${HOSPITAL3_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HOSPITAL3_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HOSPITAL3_AGENT_ENDPOINT}
       - WALLET_SEED=${HOSPITAL3_WALLET_SEED}
       - WALLET_NAME=${HOSPITAL3_WALLET_NAME}