WIP address code review feedback

* Needs verification
* needs testing

Author: morrieinmaas

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

@@ -36,7 +36,7 @@ def __post_init__(self):
                 self.admin_url,
                 self.client_session)
 
-    def webhook_server(
+    def init_webhook_server(
                         self,
                         webhook_host: str = None,
                         webhook_port: int = None,
@@ -58,7 +58,6 @@ def webhook_server(
             webhook_base=webhook_base,
             is_multitenant=self.is_multitenant)
 
-
     async def listen_webhooks(self):
         try:
             await self.webhook_server.listen_webhooks()

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

@@ -89,8 +89,6 @@ def __post_init__(self):
             self.admin_url,
             self.client_session)
 
-
-
         self.mediation = MediationController(
             self.admin_url,
             self.client_session)
@@ -123,7 +121,7 @@ def __post_init__(self):
             self.client_session
         )
 
-    def webhook_server(self):
+    def init_webhook_server(self):
         raise NotImplementedError
 
     def update_api_key(self, api_key: str):
@@ -159,8 +157,8 @@ def register_listeners(self, listeners, defaults=True):
             basicmessage and present_proof (default is True)
         """
         try:
-            ## TODO figure out if we should actually use these defaults
-            ## If so lets do it consistently
+            # TODO figure out if we should actually use these defaults
+            # If so lets do it consistently
             if defaults:
                 if self.connections:
                     pub.subscribe(

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

@@ -32,9 +32,6 @@ def __post_init__(self):
 
         super().__post_init__()
 
-        # if self.api_key:
-        #     self.headers.update({"X-API-Key": self.api_key})
-
         if self.tenant_jwt:
             self.headers.update(
                 {'Authorization': 'Bearer ' + self.tenant_jwt,
@@ -43,13 +40,15 @@ def __post_init__(self):
         # Update the current client session instantiated in the parent class
         self.client_session.headers.update(self.headers)
 
-    def webhook_server(self):
+    def init_webhook_server(self):
         raise NotImplementedError(
-            "Please, use an AriesAgentController to start a webhook server.")
+            ("Please, use an AriesAgentController to start a webhook server\n"
+                "Webhook server fct is disallowed for tenant controllers."))
 
     def listen_webhooks(self):
         raise NotImplementedError(
-            "Please, use an AriesAgentController to listen to webhooks.")
+            ("Please, use an AriesAgentController to start a webhook server\n"
+                "Webhook server fct is disallowed for tenant controllers."))
 
     def add_listener(self, listener):
         """Subscribe to a listeners for a topic
@@ -63,13 +62,14 @@ def add_listener(self, listener):
             "topic":"topicname" key-value pairs
         """
         try:
-            pub_topic_path = listener['topic']
-            if self.wallet_id:
-                pub_topic_path = f"{self.wallet_id}.{pub_topic_path}"
+            pub_topic_path_base = listener['topic']
+            pub_topic_path = f"{self.wallet_id}.{pub_topic_path_base}"
             print("Subscribing too: " + pub_topic_path)
             pub.subscribe(listener["handler"], pub_topic_path)
-
             logger.debug("Lister added for topic : ", pub_topic_path)
+        except self.wallet_id is "":
+            logger.error(
+                "Cannot add listener for empty wallet_id.")
         except Exception as exc:
             logger.warning(
                 f"Adding webhooks listener failed! {exc!r} occurred.")

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

@@ -24,7 +24,7 @@ class AriesWebhookServer:
     webhook_base : str
         The base url for webhooks (default is "")
     is_multitenant : bool
-        Initialise the multitenant interface (default is False)
+        Handles a multitenant setup (default is False)
     """
 
     webhook_host: str

libs/aries-basic-controller/requirements.txt

@@ -8,4 +8,3 @@ termcolor
 pillow
 qrcode
 beautifulsoup4
-dataclasses