Merge branch 'main' into issue_14/create_invitation

Author: morrieinmaas

aries_cloudcontroller/controllers/base.py

@@ -55,7 +55,6 @@ def handle_output(self, *output, source: str = None, **kwargs):
     async def admin_request(
         self, method, path, json_data=None, text=False, params=None, data=None
     ) -> ClientResponse:
-        params = json.dumps(params)
         params = {k: v for (k, v) in (params or {}).items() if v is not None}
         async with self.client_session.request(
             method, self.admin_url + path, json=json_data, params=params, data=data

aries_cloudcontroller/controllers/connections.py

@@ -29,6 +29,13 @@ def default_handler(self, payload):
                 connection.update_state(state)
                 logger.debug(f"{connection_id} state updated")
 
+    # Combines receive and accept connection api calls
+    async def accept_connection(self, invitation):
+        response = await self.receive_invitation(invitation)
+
+        accepted = await self.accept_invitation(response["connection_id"])
+        return accepted
+
     ### TODO refactor to extract out generic base - /connections
 
     async def get_connections(
@@ -68,18 +75,17 @@ async def create_invitation(
         self,
         alias: str = None,
         auto_accept: bool = None,
-        public: bool = None,
-        multi_use: bool = None,
-        invite_options: dict = None,
+        public: str = None,
+        multi_use: str = None,
     ):
         params = {}
         if alias:
             params["alias"] = alias
-        if auto_accept in [True, False]:
+        if auto_accept:
             params["auto_accept"] = auto_accept
-        if public in [True, False]:
+        if public:
             params["public"] = public
-        if multi_use in [True, False]:
+        if multi_use:
             params["multi_use"] = multi_use
         if invite_option:
             """A dictionary of the form:
@@ -114,7 +120,7 @@ async def receive_invitation(
         params = {}
         if alias:
             params["alias"] = alias
-        if auto_accept in [True, False]:
+        if auto_accept:
             params["auto_accept"] = auto_accept
 
         response = await self.admin_POST(

aries_cloudcontroller/controllers/messaging.py

@@ -21,8 +21,11 @@ async def send_message(self, connection_id, msg):
         )
         return response
 
-    async def trust_ping(self, connection_id: str, msg: str):
-        response = await self.admin_POST(
-            f"/connections/{connection_id}/send-ping", {"content": msg}
-        )
+    async def trust_ping(self, connection_id: str, comment_msg: str = None):
+        if comment_msg:
+            response = await self.admin_POST(
+                f"/connections/{connection_id}/send-ping", {"comment": comment_msg}
+            )
+        else:
+            response = await self.admin_POST(f"/connections/{connection_id}/send-ping", {})
         return response