added

Author: englit2008

get_email_webhook.py

@@ -60,6 +60,17 @@ 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:
@@ -81,15 +92,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(f"❌ Invalid signature! Webhook rejected.")
+            print("❌ Invalid signature! Webhook rejected.")
             return "❌ Invalid signature", 401
 
         try:
@@ -101,38 +112,34 @@ 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["name"]
-            visibility = repo.get("private", False)
-            visibility_icon = "🔒 Private" if visibility else "🌐 Public"
-            owner = repo["owner"]["login"]
-            default_branch = repo.get("default_branch", "N/A")
-            creator = data["sender"]["login"]
-            created_at = repo.get("created_at")
-            updated_at = repo.get("updated_at")
-            url = repo.get("html_url", "")
-
-            # Remove T and Z
-            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"📌 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"
-                f"👤 Action by: {creator}\n\n"
-                f"Full payload:\n{json.dumps(data, indent=2)}"
-            )
+            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}
+"""
 
             print(f"📩 Sending email alert: {subject}")
-            send_email_via_graph(subject, body)
+            send_email_via_graph(subject, body.strip())
         else:
             print(f"ℹ️ Ignored event: {event}, action: {data.get('action')}")
 
@@ -153,4 +160,4 @@ def health_check():
         )
     else:
         print("✅ Flask is up and listening on /webhook and /health")
-        app.run(host="0.0.0.0", port=8000)
+        app.run(host="0.0.0.0", port=int(os.getenv("PORT", 8000)))