Update get_email_webhook.py

Author: sudosha

get_email_webhook.py

@@ -4,7 +4,6 @@
 import hashlib
 import requests
 from msal import ConfidentialClientApplication
-from datetime import datetime
 
 # --- Determine mode ---
 TEST_MODE = os.getenv("TEST_MODE", "true").lower() == "true"
@@ -60,17 +59,6 @@ def send_email_via_graph(subject, body):
     except Exception as e:
         print(f"❌ Exception occurred while sending email: {e}")
 
-# --- Format GitHub timestamp ---
-def format_timestamp(ts):
-    """Convert GitHub timestamp to 'YYYY-MM-DD HH:MM:SS' format."""
-    if not ts:
-        return None
-    try:
-        dt = datetime.strptime(ts, "%Y-%m-%dT%H:%M:%SZ")
-        return dt.strftime("%Y-%m-%d %H:%M:%S")
-    except Exception:
-        return ts  # fallback
-
 # --- Verify GitHub webhook signature ---
 def verify_github_signature(payload_body, signature, secret):
     if not secret:
@@ -92,15 +80,15 @@ def github_webhook():
         signature = request.headers.get("X-Hub-Signature-256")
         secret = os.getenv("GITHUB_WEBHOOK_SECRET")
 
-        # Debug logging
+        # --- 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"📥 Signature header: {signature}")
         print(f"📥 Secret length: {len(secret) if secret else 'None'}")
 
         if not verify_github_signature(payload_body, signature, secret):
-            print("❌ Invalid signature! Webhook rejected.")
+            print(f"❌ Invalid signature! Webhook rejected.")
             return "❌ Invalid signature", 401
 
         try:
@@ -112,34 +100,35 @@ def github_webhook():
         event = request.headers.get("X-GitHub-Event", "")
 
         if event == "repository" and data.get("action") in ["created", "deleted"]:
-            repo = data.get("repository", {})
-            action = data["action"]
-
-            repo_name = repo.get("name")
-            full_name = repo.get("full_name")
-            org = repo.get("owner", {}).get("login")
-            owner_id = repo.get("owner", {}).get("id")
-            default_branch = repo.get("default_branch")
-            created_at = format_timestamp(repo.get("created_at"))
-            updated_at = format_timestamp(repo.get("updated_at"))
-            html_url = repo.get("html_url")
-
-            subject = f"[GitHub Alert] Repository {action}: {full_name}"
-            body = f"""
-A repository was {action} in your GitHub organization.
-
-Repository: {repo_name}
-Full name: {full_name}
-Organization: {org}
-Owner ID: {owner_id}
-Default branch: {default_branch}
-Created at: {created_at}
-Last updated: {updated_at}
-URL: {html_url}
-"""
+            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"
+            )
 
             print(f"📩 Sending email alert: {subject}")
-            send_email_via_graph(subject, body.strip())
+            send_email_via_graph(subject, body)
         else:
             print(f"ℹ️ Ignored event: {event}, action: {data.get('action')}")
 
@@ -156,8 +145,8 @@ def health_check():
         print("🔹 TEST_MODE: sending test email")
         send_email_via_graph(
             "[Test] Graph Email",
-            "The information of Quantori's GitHub repositories has been updated"
+            "📌 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"
         )
     else:
         print("✅ Flask is up and listening on /webhook and /health")
-        app.run(host="0.0.0.0", port=int(os.getenv("PORT", 8000)))
+        app.run(host="0.0.0.0", port=8000)