pleeeaaassseee

discord_oauth.py

@@ -23,13 +23,13 @@ def get_discord_api_url():
     try:
         # Try standard URL first
         socket.gethostbyname("discord.com")
-        return "https://discord.com/api/v10/oauth2/token", {}
+        return "https://discord.com/api/v10/oauth2/token", {}, True
     except socket.gaierror:
         # DNS resolution failed, use Cloudflare IP for discord.com
         # This is a known Cloudflare IP that discord.com resolves to
         logger.warning("discord.com DNS resolution failed, using IP address workaround")
-        # Use IP with Host header to make it work
-        return "https://162.159.128.233/api/v10/oauth2/token", {"Host": "discord.com"}
+        # Use IP with Host header - need to disable SSL verify since cert is for discord.com not IP
+        return "https://162.159.128.233/api/v10/oauth2/token", {"Host": "discord.com"}, False
 
 class OAuthCallbackRequest(BaseModel):
     code: str
@@ -50,15 +50,15 @@ async def discord_oauth_callback(request: OAuthCallbackRequest):
         logger.info(f"Discord OAuth callback - Code: {request.code[:20]}..., Redirect URI: {request.redirect_uri}")
         
         # Get Discord API URL with DNS fallback
-        api_url, extra_headers = get_discord_api_url()
-        logger.info(f"Using Discord API URL: {api_url}")
+        api_url, extra_headers, verify_ssl = get_discord_api_url()
+        logger.info(f"Using Discord API URL: {api_url}, SSL verify: {verify_ssl}")
         
         # Exchange code for token
         # Use explicit timeout and retry settings for better reliability
         async with httpx.AsyncClient(
             timeout=30.0,
             limits=httpx.Limits(max_keepalive_connections=5, max_connections=10),
-            verify=True  # Still verify SSL even when using IP
+            verify=verify_ssl  # Disable SSL verification when using IP address
         ) as client:
             headers = {"Content-Type": "application/x-www-form-urlencoded"}
             headers.update(extra_headers)

discord_service.py

@@ -13,10 +13,10 @@ def get_discord_base_url():
     """Get Discord API base URL with DNS fallback"""
     try:
         socket.gethostbyname("discord.com")
-        return "https://discord.com/api/v10", {}
+        return "https://discord.com/api/v10", {}, True
     except socket.gaierror:
         logger.warning("discord.com DNS resolution failed, using IP address workaround")
-        return "https://162.159.128.233/api/v10", {"Host": "discord.com"}
+        return "https://162.159.128.233/api/v10", {"Host": "discord.com"}, False
 
 
 class DiscordService:
@@ -29,13 +29,13 @@ class DiscordService:
         Args:
             access_token: Discord OAuth access token
         """
-        self.base_url, self.extra_headers = get_discord_base_url()
+        self.base_url, self.extra_headers, self.verify_ssl = get_discord_base_url()
         self.headers = {
             "Authorization": f"Bearer {access_token}",
             "Content-Type": "application/json"
         }
         self.headers.update(self.extra_headers)
-        logger.info(f"Discord service initialized with base URL: {self.base_url}")
+        logger.info(f"Discord service initialized with base URL: {self.base_url}, SSL verify: {self.verify_ssl}")
     
     def test_connection(self) -> Dict:
         """
@@ -47,7 +47,8 @@ class DiscordService:
         try:
             response = requests.get(
                 f"{self.base_url}/users/@me",
-                headers=self.headers
+                headers=self.headers,
+                verify=self.verify_ssl
             )
             data = response.json()
             
@@ -80,7 +81,8 @@ class DiscordService:
         try:
             response = requests.get(
                 f"{self.base_url}/users/@me/guilds",
-                headers=self.headers
+                headers=self.headers,
+                verify=self.verify_ssl
             )
             
             if response.status_code == 200:
@@ -105,7 +107,8 @@ class DiscordService:
         try:
             response = requests.get(
                 f"{self.base_url}/guilds/{guild_id}/channels",
-                headers=self.headers
+                headers=self.headers,
+                verify=self.verify_ssl
             )
             
             if response.status_code == 200:
@@ -144,7 +147,8 @@ class DiscordService:
             response = requests.get(
                 f"{self.base_url}/channels/{channel_id}/messages",
                 headers=self.headers,
-                params=params
+                params=params,
+                verify=self.verify_ssl
             )
             
             if response.status_code == 200: