From 03924ead228cfcc318f38a4e89ff14d75a71ba22 Mon Sep 17 00:00:00 2001 From: Vivaan Verma Date: Thu, 22 Jul 2021 12:01:49 +0100 Subject: Fix and refactor Reflected on feedback provided by @jb3 including: - Change auth method - Move POST request data from params to body --- arthur/apis/cloudflare/zones.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'arthur/apis/cloudflare/zones.py') 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"]} -- cgit v1.2.3