added information about repo owner

Author: englit2008

get_email_webhook.py

@@ -60,17 +60,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 +81,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 +101,31 @@ def github_webhook():
         event = request.headers.get("X-GitHub-Event", "")
 
         if event == "repository" and data.get("action") in ["created", "deleted"]:
-            repo = data.get("repository", {})
+            repo = data["repository"]
+            repo_name = repo["full_name"]
             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}
-"""
+            default_branch = repo.get("default_branch", "N/A")
+            owner = repo["owner"]["login"]
+            creator = data["sender"]["login"]
+            created_at = repo.get("created_at")
+            if created_at:
+                # Remove T and Z
+                created_at = created_at.replace("T", " ").replace("Z", "")
+
+            subject = f"[GitHub Alert] Repository {action}: {repo_name}"
+            body = (
+                f"A repository was {action} in your GitHub organization.\n\n"
+                f"Repository: {repo_name}\n"
+                f"Owner: {owner}\n"
+                f"Default branch: {default_branch}\n"
+                f"Action by: {creator}\n"
+            )
+            if created_at:
+                body += f"Created at: {created_at}\n"
+            body += f"\nFull payload:\n{json.dumps(data, indent=2)}"
 
             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')}")
 
@@ -160,4 +146,4 @@ def health_check():
         )
     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)

get_email_webhook_old_musha.py

@@ -4,13 +4,14 @@
 import hashlib
 import requests
 from msal import ConfidentialClientApplication
+from datetime import datetime
 
 # --- Determine mode ---
 TEST_MODE = os.getenv("TEST_MODE", "true").lower() == "true"
 
 # Only import Flask if not in TEST_MODE
 if not TEST_MODE:
-    from flask import Flask, request, jsonify
+    from flask import Flask, request
     app = Flask(__name__)
 
 # --- Microsoft Graph Email Sending Function ---
@@ -23,7 +24,7 @@ def send_email_via_graph(subject, body):
 
     if not all([TENANT_ID, CLIENT_ID, CLIENT_SECRET, FROM_EMAIL, TO_EMAIL]):
         print("❌ Missing required environment variables")
-        return False
+        return
 
     try:
         app_msal = ConfidentialClientApplication(
@@ -35,7 +36,7 @@ def send_email_via_graph(subject, body):
         access_token = token.get("access_token")
         if not access_token:
             print(f"❌ Failed to get access token: {token}")
-            return False
+            return
 
         email_msg = {
             "message": {
@@ -53,14 +54,22 @@ def send_email_via_graph(subject, body):
 
         if response.status_code == 202:
             print(f"✅ Email sent to {TO_EMAIL}")
-            return True
         else:
             print(f"❌ Failed to send email: {response.status_code} {response.text}")
-            return False
 
     except Exception as e:
         print(f"❌ Exception occurred while sending email: {e}")
-        return False
+
+# --- 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):
@@ -75,13 +84,13 @@ def verify_github_signature(payload_body, signature, secret):
     expected_signature = "sha256=" + mac.hexdigest()
     return hmac.compare_digest(expected_signature, signature)
 
-# --- GitHub Webhook Handler ---
+# --- GitHub Webhook + Health Handlers ---
 if not TEST_MODE:
     @app.route("/webhook", methods=["POST"])
     def github_webhook():
         payload_body = request.data
         signature = request.headers.get("X-Hub-Signature-256")
-        secret = os.getenv("GITHUB_WEBHOOK_SECRET")  # ✅ Correct usage
+        secret = os.getenv("GITHUB_WEBHOOK_SECRET")
 
         # Debug logging
         print("📥 Incoming GitHub webhook")
@@ -102,19 +111,35 @@ def github_webhook():
 
         event = request.headers.get("X-GitHub-Event", "")
 
-        # Handle repository create/delete events
         if event == "repository" and data.get("action") in ["created", "deleted"]:
-            repo_name = data["repository"]["full_name"]
+            repo = data.get("repository", {})
             action = data["action"]
 
-            subject = f"[GitHub Alert] Repository {action}: {repo_name}"
-            body = (
-                f"A repository was {action} in your GitHub organization.\n\n"
-                f"Details:\n{json.dumps(data, indent=2)}"
-            )
+            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')}")
 
@@ -123,18 +148,16 @@ def github_webhook():
     # Health check endpoint
     @app.route("/health", methods=["GET"])
     def health_check():
-        return jsonify({"status": "running"}), 200
+        return {"status": "running"}, 200
 
 # --- Main Entry Point ---
 if __name__ == "__main__":
     if TEST_MODE:
         print("🔹 TEST_MODE: sending test email")
         send_email_via_graph(
             "[Test] Graph Email",
-            "This is a test email sent via Microsoft Graph with application permissions."
+            "The information of Quantori's GitHub repositories has been updated"
         )
     else:
         print("✅ Flask is up and listening on /webhook and /health")
-        # Azure expects port 8000 by default for containerized apps
-        port = int(os.getenv("PORT", 8000))
-        app.run(host="0.0.0.0", port=port)
+        app.run(host="0.0.0.0", port=int(os.getenv("PORT", 8000)))