Code review changes

Author: sumitramanga

whatsapp/README.md

@@ -81,8 +81,6 @@ Configure the integration within Autohive using platform authentication for What
 ## Requirements
 
 - `autohive-integrations-sdk`
-- `requests>=2.32.0`
-- `aiohttp>=3.8.0`
 
 ## Usage Examples
 

whatsapp/config.json

@@ -34,7 +34,7 @@
             "output_schema": {
                 "type": "object",
                 "properties": {
-                    "message_id": {"type": "string"},
+                    "message_id": {"type": ["string", "null"]},
                     "success": {"type": "boolean"},
                     "error": {"type": "string"}
                 },
@@ -76,7 +76,7 @@
             "output_schema": {
                 "type": "object",
                 "properties": {
-                    "message_id": {"type": "string"},
+                    "message_id": {"type": ["string", "null"]},
                     "success": {"type": "boolean"},
                     "error": {"type": "string"}
                 },
@@ -120,7 +120,7 @@
             "output_schema": {
                 "type": "object",
                 "properties": {
-                    "message_id": {"type": "string"},
+                    "message_id": {"type": ["string", "null"]},
                     "success": {"type": "boolean"},
                     "error": {"type": "string"}
                 },

whatsapp/requirements.txt

@@ -1,3 +1 @@
 autohive-integrations-sdk~=1.0.2
-requests>=2.32.0
-aiohttp>=3.8.0

whatsapp/tests/test_whatsapp.py

@@ -135,6 +135,29 @@ async def test_media_url_validation():
                 print(f"Error testing media URL validation for {url}: {e}")
 
 
+async def test_phone_number_id_validation():
+    """Test phone number ID validation logic with invalid inputs."""
+    print("Testing phone number ID validation...")
+    
+    # Test invalid phone number IDs
+    invalid_ids = ["abc", "123a", "", " ", "-123"]
+    
+    # Use a valid phone number to bypass phone validation
+    valid_phone = "+1234567890"
+    
+    for pid in invalid_ids:
+        inputs = {"to": valid_phone, "message": "test", "phone_number_id": pid}
+        async with ExecutionContext(auth=AUTH) as context:
+            try:
+                result = await whatsapp.execute_action("send_message", inputs, context)
+                print(f"Phone ID {pid}: {result}")
+                data = result.result.data
+                assert not data["success"]
+                assert "Invalid phone number ID" in data["error"]
+            except Exception as e:
+                print(f"Error testing phone number ID validation for {pid}: {e}")
+
+
 async def main():
     print("Testing WhatsApp Business Integration")
     print("====================================")
@@ -146,7 +169,8 @@ async def main():
         "test_send_media_message": test_send_media_message,
         "test_get_phone_number_health": test_get_phone_number_health,
         "test_phone_validation": test_phone_validation,
-        "test_media_url_validation": test_media_url_validation
+        "test_media_url_validation": test_media_url_validation,
+        "test_phone_number_id_validation": test_phone_number_id_validation
     }
 
     # Check for specific test to run from command line args

whatsapp/whatsapp.py

@@ -14,8 +14,7 @@ def get_whatsapp_creds(auth: Dict[str, Any]) -> Dict[str, str]:
     access_token = creds_source.get("access_token") or creds_source.get("accessToken") or creds_source.get("token")
 
     if not access_token:
-        keys = list(auth.keys())
-        raise ValueError(f"Missing access_token in auth context. Available keys: {keys}")
+        raise ValueError(f"Missing access_token in auth context.")
 
     return {
         "access_token": access_token
@@ -30,6 +29,10 @@ def validate_media_url(url: str) -> bool:
     """Validate that the media URL is a valid HTTPS URL."""
     return url.startswith("https://")
 
+def validate_phone_number_id(phone_number_id: str) -> bool:
+    """Validate that the phone number ID is a numeric string."""
+    return phone_number_id.isdigit()
+
 # ---- Action Handlers ----
 
 @whatsapp.action("send_message")
@@ -42,10 +45,18 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
         message = inputs["message"]
         phone_number_id = inputs["phone_number_id"]
 
+        # Validate phone number ID
+        if not validate_phone_number_id(phone_number_id):
+            return ActionResult(data={
+                "message_id": None,
+                "success": False,
+                "error": "Invalid phone number ID. Must be a numeric string."
+            })
+
         # Validate phone number format to ensure it meets E.164 standards
         if not validate_phone_number(to):
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": "Invalid phone number format. Use format: +1234567890"
             })
@@ -79,14 +90,14 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
             else:
                 # Handle API errors or unexpected response structure
                 return ActionResult(data={
-                    "message_id": "",
+                    "message_id": None,
                     "success": False,
                     "error": response.get("error", {}).get("message", "Unknown error")
                 })
 
         except Exception as e:
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": f"Failed to send message: {str(e)}"
             })
@@ -105,10 +116,18 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
         language_code = inputs.get("language_code", "en")
         parameters = inputs.get("parameters", [])
 
+        # Validate phone number ID
+        if not validate_phone_number_id(phone_number_id):
+            return ActionResult(data={
+                "message_id": None,
+                "success": False,
+                "error": "Invalid phone number ID. Must be a numeric string."
+            })
+        
         # Validate phone number format
         if not validate_phone_number(to):
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": "Invalid phone number format. Use format: +1234567890"
             })
@@ -153,14 +172,14 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
                 })
             else:
                 return ActionResult(data={
-                    "message_id": "",
+                    "message_id": None,
                     "success": False,
                     "error": response.get("error", {}).get("message", "Unknown error")
                 })
 
         except Exception as e:
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": f"Failed to send template message: {str(e)}"
             })
@@ -179,18 +198,26 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
         caption = inputs.get("caption", "")
         filename = inputs.get("filename", "")
 
+        # Validate phone number ID
+        if not validate_phone_number_id(phone_number_id):
+            return ActionResult(data={
+                "message_id": None,
+                "success": False,
+                "error": "Invalid phone number ID. Must be a numeric string."
+            })
+        
         # Validate phone number format
         if not validate_phone_number(to):
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": "Invalid phone number format. Use format: +1234567890"
             })
 
         # Validate media URL
         if not validate_media_url(media_url):
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": "Invalid media URL. Must be a publicly accessible HTTPS URL."
             })
@@ -237,14 +264,14 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
                 })
             else:
                 return ActionResult(data={
-                    "message_id": "",
+                    "message_id": None,
                     "success": False,
                     "error": response.get("error", {}).get("message", "Unknown error")
                 })
 
         except Exception as e:
             return ActionResult(data={
-                "message_id": "",
+                "message_id": None,
                 "success": False,
                 "error": f"Failed to send media message: {str(e)}"
             })
@@ -258,6 +285,15 @@ class GetPhoneNumberHealthAction(ActionHandler):
     async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
         phone_number_id = inputs["phone_number_id"]
 
+        # Validate phone number ID
+        if not validate_phone_number_id(phone_number_id):
+            return ActionResult(data={
+                "status": "UNKNOWN",
+                "quality_rating": "UNKNOWN",
+                "success": False,
+                "error": "Invalid phone number ID. Must be a numeric string."
+            })
+        
         try:
             creds = get_whatsapp_creds(context.auth)