Update get_email_webhook.py

Author: sudosha

get_email_webhook.py

@@ -8,7 +8,7 @@
 # --- Determine mode ---
 TEST_MODE = os.getenv("TEST_MODE", "true").lower() == "true"
 
-# Only import Flask if not in TEST_MODE
+# Import Flask only if not in TEST_MODE
 if not TEST_MODE:
     from flask import Flask, request
     app = Flask(__name__)
@@ -72,6 +72,29 @@ def verify_github_signature(payload_body, signature, secret):
     expected_signature = "sha256=" + mac.hexdigest()
     return hmac.compare_digest(expected_signature, signature)
 
+# --- Format GitHub repository event for email ---
+def format_repo_event(repo, action):
+    repo_name = repo["full_name"]
+    visibility_icon = "🔒 Private" if repo.get("private") else "🌐 Public"
+    owner = repo["owner"]["login"]
+    default_branch = repo.get("default_branch", "N/A")
+    created_at = repo.get("created_at", "").replace("T", " ").replace("Z", "")
+    updated_at = repo.get("updated_at", "").replace("T", " ").replace("Z", "")
+    url = repo.get("html_url", "")
+
+    subject = f"[GitHub Alert] Repository {action}: {repo_name}"
+    body = (
+        f"A repository was {action} in your GitHub organization.\n\n"
+        f"📌 Repository Name: {repo_name}\n"
+        f"{visibility_icon}\n"
+        f"👤 Owner: {owner}\n"
+        f"🌿 Default branch: {default_branch}\n"
+        f"🕒 Created at: {created_at}\n"
+        f"🕒 Last updated: {updated_at}\n"
+        f"🌍 URL: {url}\n"
+    )
+    return subject, body
+
 # --- GitHub Webhook + Health Handlers ---
 if not TEST_MODE:
     @app.route("/webhook", methods=["POST"])
@@ -80,12 +103,9 @@ def github_webhook():
         signature = request.headers.get("X-Hub-Signature-256")
         secret = os.getenv("GITHUB_WEBHOOK_SECRET")
 
-        # --- Debug logging ---
         print("📥 Incoming GitHub webhook")
-        print(f"📥 Payload size: {len(payload_body)} bytes")
-        print(f"📥 GitHub Event: {request.headers.get('X-GitHub-Event')}")
+        print(f"📥 Event: {request.headers.get('X-GitHub-Event')}")
         print(f"📥 Signature header: {signature}")
-        print(f"📥 Secret length: {len(secret) if secret else 'None'}")
 
         if not verify_github_signature(payload_body, signature, secret):
             print(f"❌ Invalid signature! Webhook rejected.")
@@ -100,41 +120,14 @@ def github_webhook():
         event = request.headers.get("X-GitHub-Event", "")
 
         if event == "repository" and data.get("action") in ["created", "deleted"]:
-            repo = data["repository"]
-            repo_name = repo["full_name"]
-            visibility_icon = "🔒 Private" if repo.get("private") else "🌐 Public"
-            owner = repo["owner"]["login"]
-            default_branch = repo.get("default_branch", "N/A")
-            created_at = repo.get("created_at")
-            updated_at = repo.get("updated_at")
-            url = repo.get("html_url", "")
-            
-            # Remove T and Z from timestamps
-            if created_at:
-                created_at = created_at.replace("T", " ").replace("Z", "")
-            if updated_at:
-                updated_at = updated_at.replace("T", " ").replace("Z", "")
-
-            subject = f"[GitHub Alert] Repository {data['action']}: {repo_name}"
-            body = (
-                f"A repository was {data['action']} in your GitHub organization.\n\n"
-                f"📌 Repository Name: {repo_name}\n"
-                f"{visibility_icon}\n"
-                f"👤 Owner: {owner}\n"
-                f"🌿 Default branch: {default_branch}\n"
-                f"🕒 Created at: {created_at}\n"
-                f"🕒 Last updated: {updated_at}\n"
-                f"🌍 URL: {url}\n"
-            )
-
+            subject, body = format_repo_event(data["repository"], data["action"])
             print(f"📩 Sending email alert: {subject}")
             send_email_via_graph(subject, body)
         else:
             print(f"ℹ️ Ignored event: {event}, action: {data.get('action')}")
 
         return "OK", 200
 
-    # Health check endpoint
     @app.route("/health", methods=["GET"])
     def health_check():
         return {"status": "running"}, 200
@@ -143,10 +136,17 @@ def health_check():
 if __name__ == "__main__":
     if TEST_MODE:
         print("🔹 TEST_MODE: sending test email")
-        send_email_via_graph(
-            "[Test] Graph Email",
-            "📌 Repository Name: quantori/sadsrepo\n🔒 Visibility: Private\n👤 Owner: quantori\n🌿 Default branch: main\n🕒 Created at: 2025-09-09 13:06:02\n🕒 Last updated: 2025-09-09 13:09:20\n🌍 URL: https://github.com/quantori/sadsrepo"
-        )
+        test_repo = {
+            "full_name": "quantori/sadsrepo",
+            "private": True,
+            "owner": {"login": "quantori"},
+            "default_branch": "main",
+            "created_at": "2025-09-09T13:06:02Z",
+            "updated_at": "2025-09-09T13:09:20Z",
+            "html_url": "https://github.com/quantori/sadsrepo"
+        }
+        subject, body = format_repo_event(test_repo, "created")
+        send_email_via_graph(subject, body)
     else:
         print("✅ Flask is up and listening on /webhook and /health")
         app.run(host="0.0.0.0", port=8000)