改用SendGrid API發送郵件

.env.example

@@ -18,15 +18,15 @@ APP_ENV=production
 # API 設定
 API_PREFIX=/api
 
-# ==================== 郵件服務設定 (Resend API) ====================
-# 透過 Resend API 發送郵件
-# 註冊: https://resend.com
+# ==================== 郵件服務設定 (SendGrid API) ====================
+# 透過 SendGrid API 發送郵件
+# 註冊: https://sendgrid.com (免費 100封/天)
 
-# Resend API Key (Private Secret)
-RESEND_API_KEY=re_xxxxxxxxxx
+# SendGrid API Key (Private Secret)
+SENDGRID_API_KEY=SG.xxxxxxxxxx
 
-# 寄件人郵箱 (需在 Resend 驗證網域，或使用預設 onboarding@resend.dev)
-RESEND_FROM_EMAIL=onboarding@resend.dev
+# 寄件人郵箱 (需在 SendGrid 驗證，可用個人 Gmail)
+SENDGRID_FROM_EMAIL=your-email@gmail.com
 
 # 寄件人名稱
 FROM_NAME=KSTools

app/services/email_service.py

@@ -1,6 +1,6 @@
 """
 KSTools 郵件服務
-使用 Resend API 發送版本更新通知郵件
+使用 SendGrid API 發送版本更新通知郵件
 """
 
 import os
@@ -18,18 +18,18 @@ logger = logging.getLogger(__name__)
 class EmailService:
     """
     郵件服務類別
-    透過 Resend API 發送郵件
+    透過 SendGrid API 發送郵件
     """
 
     def __init__(self):
         """初始化郵件服務"""
-        self.api_key = os.environ.get('RESEND_API_KEY', '')
-        self.from_email = os.environ.get('RESEND_FROM_EMAIL', 'onboarding@resend.dev')
+        self.api_key = os.environ.get('SENDGRID_API_KEY', '')
+        self.from_email = os.environ.get('SENDGRID_FROM_EMAIL', '')
         self.from_name = os.environ.get('FROM_NAME', 'KSTools')
-        self.api_url = 'https://api.resend.com/emails'
+        self.api_url = 'https://api.sendgrid.com/v3/mail/send'
 
         if not self.api_key:
-            logger.warning("RESEND_API_KEY not configured")
+            logger.warning("SENDGRID_API_KEY not configured")
 
     def is_configured(self) -> bool:
         """檢查郵件服務是否已設定"""
@@ -112,9 +112,9 @@ class EmailService:
 </html>
 """
 
-    async def _send_via_resend(self, to_email: str, subject: str, html_content: str) -> dict:
+    async def _send_via_sendgrid(self, to_email: str, subject: str, html_content: str) -> dict:
         """
-        透過 Resend API 發送單封郵件
+        透過 SendGrid API 發送單封郵件
 
         Args:
             to_email: 收件人郵箱
@@ -125,7 +125,24 @@ class EmailService:
             API 回應
         """
         try:
-            from_address = f"{self.from_name} <{self.from_email}>"
+            payload = {
+                'personalizations': [
+                    {
+                        'to': [{'email': to_email}]
+                    }
+                ],
+                'from': {
+                    'email': self.from_email,
+                    'name': self.from_name
+                },
+                'subject': subject,
+                'content': [
+                    {
+                        'type': 'text/html',
+                        'value': html_content
+                    }
+                ]
+            }
 
             async with httpx.AsyncClient() as client:
                 response = await client.post(
@@ -134,23 +151,19 @@ class EmailService:
                         'Authorization': f'Bearer {self.api_key}',
                         'Content-Type': 'application/json'
                     },
-                    json={
-                        'from': from_address,
-                        'to': [to_email],
-                        'subject': subject,
-                        'html': html_content
-                    },
+                    json=payload,
                     timeout=30
                 )
 
-                if response.status_code == 200:
-                    return {'success': True, 'data': response.json()}
+                # SendGrid 成功回傳 202 Accepted
+                if response.status_code == 202:
+                    return {'success': True}
                 else:
-                    logger.error(f"Resend API error: {response.status_code} - {response.text}")
+                    logger.error(f"SendGrid API error: {response.status_code} - {response.text}")
                     return {'success': False, 'error': response.text}
 
         except Exception as e:
-            logger.error(f"Resend API call failed: {e}")
+            logger.error(f"SendGrid API call failed: {e}")
             return {'success': False, 'error': str(e)}
 
     async def send_version_announcement(
@@ -163,7 +176,7 @@ class EmailService:
         發送版本更新通知郵件
         """
         if not self.is_configured():
-            raise ValueError("Resend API not configured. Please set RESEND_API_KEY environment variable.")
+            raise ValueError("SendGrid API not configured. Please set SENDGRID_API_KEY environment variable.")
 
         recipients = await self.get_active_user_emails(product_type)
 
@@ -171,7 +184,7 @@ class EmailService:
             logger.warning("No recipients found for email notification")
             return 0
 
-        logger.info(f"Sending version announcement to {len(recipients)} recipients via Resend API")
+        logger.info(f"Sending version announcement to {len(recipients)} recipients via SendGrid API")
 
         html_content = self._format_email_html(content, product_type)
 
@@ -179,7 +192,7 @@ class EmailService:
         failed_count = 0
 
         for email in recipients:
-            result = await self._send_via_resend(email, subject, html_content)
+            result = await self._send_via_sendgrid(email, subject, html_content)
             if result.get('success'):
                 sent_count += 1
             else:
@@ -204,7 +217,7 @@ class EmailService:
         發送郵件給特定用戶
         """
         if not self.is_configured():
-            raise ValueError("Resend API not configured. Please set RESEND_API_KEY environment variable.")
+            raise ValueError("SendGrid API not configured. Please set SENDGRID_API_KEY environment variable.")
 
         if not recipients:
             logger.warning("No recipients provided")
@@ -218,7 +231,7 @@ class EmailService:
             logger.warning("No valid email addresses found")
             return 0
 
-        logger.info(f"Sending email to {len(valid_recipients)} recipients via Resend API")
+        logger.info(f"Sending email to {len(valid_recipients)} recipients via SendGrid API")
 
         html_content = self._format_email_html(content, product_type)
 
@@ -226,7 +239,7 @@ class EmailService:
         failed_count = 0
 
         for email in valid_recipients:
-            result = await self._send_via_resend(email, subject, html_content)
+            result = await self._send_via_sendgrid(email, subject, html_content)
             if result.get('success'):
                 sent_count += 1
             else:
@@ -245,14 +258,14 @@ class EmailService:
         發送測試郵件
         """
         if not self.is_configured():
-            raise ValueError("Resend API not configured")
+            raise ValueError("SendGrid API not configured")
 
         html_content = self._format_email_html(
             '這是一封測試郵件。如果您收到此郵件，表示 KSTools 郵件服務已正確設定。',
             'announcement'
         )
 
-        result = await self._send_via_resend(
+        result = await self._send_via_sendgrid(
             recipient,
             'KSTools 郵件服務測試',
             html_content
@@ -270,7 +283,7 @@ class EmailService:
         郵件服務健康檢查
         """
         return {
-            'service': 'EmailService (Resend API)',
+            'service': 'EmailService (SendGrid API)',
             'configured': self.is_configured(),
             'from_email': self.from_email,
             'from_name': self.from_name,
@@ -279,10 +292,10 @@ class EmailService:
 
     def test_connection(self) -> dict:
         """
-        測試 Resend API 連線
+        測試 SendGrid API 連線
         """
         result = {
-            'service': 'Resend API',
+            'service': 'SendGrid API',
             'configured': self.is_configured(),
             'from_email': self.from_email,
             'from_name': self.from_name,
@@ -291,14 +304,18 @@ class EmailService:
         }
 
         if not self.is_configured():
-            result['error'] = 'Resend API not configured (missing RESEND_API_KEY)'
+            result['error'] = 'SendGrid API not configured (missing SENDGRID_API_KEY)'
             return result
 
-        # 測試 API 連線（取得 API key 資訊）
+        if not self.from_email:
+            result['error'] = 'SENDGRID_FROM_EMAIL not configured'
+            return result
+
+        # 測試 API 連線（使用 scopes endpoint 驗證 API key）
         try:
             with httpx.Client() as client:
                 response = client.get(
-                    'https://api.resend.com/domains',
+                    'https://api.sendgrid.com/v3/scopes',
                     headers={
                         'Authorization': f'Bearer {self.api_key}'
                     },
@@ -307,11 +324,14 @@ class EmailService:
 
                 if response.status_code == 200:
                     result['connection_test'] = 'SUCCESS'
-                    domains = response.json().get('data', [])
-                    result['verified_domains'] = [d.get('name') for d in domains if d.get('status') == 'verified']
+                    scopes = response.json().get('scopes', [])
+                    result['has_mail_send'] = 'mail.send' in scopes
                 elif response.status_code == 401:
                     result['connection_test'] = 'FAILED'
                     result['error'] = 'Invalid API key'
+                elif response.status_code == 403:
+                    result['connection_test'] = 'FAILED'
+                    result['error'] = 'API key lacks permissions'
                 else:
                     result['connection_test'] = 'FAILED'
                     result['error'] = f'HTTP {response.status_code}'