Merge branch 'main' into docs-stream-change

Author: lukegalbraithrussell

slack_sdk/signature/__init__.py

@@ -3,7 +3,13 @@
 import hashlib
 import hmac
 from time import time
-from typing import Dict, Optional, Union
+from typing import Dict, Optional, Union, TYPE_CHECKING
+
+# Fallback to Dict for Python 3.7/3.8 compatibility (safe to remove once these versions are no longer supported)
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+else:
+    Mapping = Dict
 
 
 class Clock:
@@ -26,23 +32,23 @@ def __init__(self, signing_secret: str, clock: Clock = Clock()):
     def is_valid_request(
         self,
         body: Union[str, bytes],
-        headers: Dict[str, str],
+        headers: Mapping[str, str],
     ) -> bool:
         """Verifies if the given signature is valid"""
         if headers is None:
             return False
         normalized_headers = {k.lower(): v for k, v in headers.items()}
         return self.is_valid(
             body=body,
-            timestamp=normalized_headers.get("x-slack-request-timestamp", None),  # type: ignore[arg-type]
-            signature=normalized_headers.get("x-slack-signature", None),  # type: ignore[arg-type]
+            timestamp=normalized_headers.get("x-slack-request-timestamp", None),
+            signature=normalized_headers.get("x-slack-signature", None),
         )
 
     def is_valid(
         self,
         body: Union[str, bytes],
-        timestamp: str,
-        signature: str,
+        timestamp: Optional[str],
+        signature: Optional[str],
     ) -> bool:
         """Verifies if the given signature is valid"""
         if timestamp is None or signature is None:

slack_sdk/socket_mode/aiohttp/__init__.py

@@ -379,7 +379,7 @@ async def connect(self):
                     autoping=False,
                     heartbeat=self.ping_interval,
                     proxy=self.proxy,
-                    ssl=self.web_client.ssl,
+                    ssl=self.web_client.ssl if self.web_client.ssl is not None else True,
                 )
                 session_id: str = await self.session_id()
                 self.auto_reconnect_enabled = self.default_auto_reconnect_enabled