Fix and refactor

Reflected on feedback provided by @jb3 including:
- Change auth method
- Move POST request data from params to body

2 files changed, 16 insertions, 13 deletions

diff --git a/arthur/apis/cloudflare/zones.py b/arthur/apis/cloudflare/zones.py
index 367dc3b..e027a9a 100644
--- a/arthur/apis/cloudflare/zones.py
+++ b/arthur/apis/cloudflare/zones.py
@@ -5,33 +5,37 @@ import aiohttp
 
 from arthur.config import CONFIG
 
-CF_TOKEN = CONFIG.cloudflare_token
+AUTH_HEADER = {
+    "Authorization": f"Bearer {CONFIG.cloudflare_token}"
+}
 
 
 async def list_zones(zone_name: Optional[str] = None) -> dict[str, str]:
     """List all Cloudflare zones."""
     endpoint = "https://api.cloudflare.com/client/v4/zones"
-    request_headers = {"X-Auth-User-Service-Key": CF_TOKEN}
 
     if zone_name is not None:
         endpoint += f"?name={zone_name}"
 
     async with aiohttp.ClientSession() as session:
-        async with session.get(endpoint, headers=request_headers) as response:
+        async with session.get(endpoint, headers=AUTH_HEADER) as response:
             info = await response.json()
 
     zones = info["result"]
 
-    return {zone.name: zone.id for zone in zones}
+    return {zone["name"]: zone["id"] for zone in zones}
 
 
 async def purge_zone(zone_identifier: str) -> dict:
     """Purge the cache for a Cloudflare zone."""
-    endpoint = f"https://api.cloudflare.com/client/v4/zones/{zone_identifier}/purge_cache?purge_everything=true"  # noqa: E501
-    request_headers = {"X-Auth-User-Service-Key": CF_TOKEN}
+    endpoint = f"https://api.cloudflare.com/client/v4/zones/{zone_identifier}"
+
+    PURGE_EVERYTHING = {
+        "purge_everything": True
+    }
 
     async with aiohttp.ClientSession() as session:
-        async with session.post(endpoint, headers=request_headers) as response:
+        async with session.post(endpoint, headers=AUTH_HEADER, body=PURGE_EVERYTHING) as response:
             info = await response.json()
 
     return {"success": info["success"], "errors": info["errors"]}
diff --git a/arthur/exts/cloudflare/zones.py b/arthur/exts/cloudflare/zones.py
index c6e625f..448ad81 100644
--- a/arthur/exts/cloudflare/zones.py
+++ b/arthur/exts/cloudflare/zones.py
@@ -27,16 +27,15 @@ class Zones(commands.Cog):
         required_id = pydis_zones[zone_name]
         purge_attempt_response = await zones.purge_zone(required_id)
 
-        message = "__Cloudflare cache purge status__\n"
+        message = ""
 
         if purge_attempt_response["success"]:
-            message += "Purge status: **Successful** :white_check_mark:\n"
-            message += f"Zone purged: **Zone purged: `{zone_name}`"
-            return await ctx.send(message)
+            message += ":white_check_mark:"
+            message += f"**Cache cleared!** The Cloudflare cache for `{zone_name}` was cleared."
         else:
-            message += "Purge status: **Failed** :x:\n"
+            message += f":x: **'Tis but a scratch! The cache for `{zone_name}` couldn't be cleared."
             if errors := purge_attempt_response["errors"]:
-                message += "__Errors:__\n"
+                message += "\nReceived errors:\n"
                 for error in errors:
                     message += f"**Code**: `{error.code}`\n"
                     message += f"**Message**: {error.message}\n"