Make samples up-to-date

seratch · seratch · commit 7b9032712b25 · 2020-09-25T14:56:59.000+09:00
* Fix some OAuth issues
* Change app.event("message")'s behavior to receive all subtype events too
diff --git a/samples/falcon/oauth_app.py b/samples/falcon/oauth_app.py
@@ -87,6 +87,16 @@ def handle_app_mentions(body, say, logger):
     say("What's up?")
 
 
+@app.message("What")
+def handle_matched_messages(event, logger):
+    logger.info(f"message matched: {event['text']}")
+
+
+@app.event("message")
+def handle_messages(event, logger):
+    logger.info(f"subtype: {event.get('subytype')}")
+
+
 api = falcon.API()
 resource = SlackAppResource(app)
 api.add_route("/slack/events", resource)
diff --git a/samples/fastapi/async_oauth_app.py b/samples/fastapi/async_oauth_app.py
@@ -5,6 +5,9 @@
 sys.path.insert(1, "../..")
 # ------------------------------------------------
 
+import logging
+logging.basicConfig(level=logging.DEBUG)
+
 from slack_bolt.async_app import AsyncApp
 from slack_bolt.adapter.fastapi.async_handler import AsyncSlackRequestHandler
 
diff --git a/samples/fastapi/oauth_app.py b/samples/fastapi/oauth_app.py
@@ -19,7 +19,7 @@ def handle_app_mentions(body, say, logger):
 
 
 @app.event("message")
-async def handle_message():
+def handle_message():
     pass
 
 
diff --git a/slack_bolt/app/app.py b/slack_bolt/app/app.py
@@ -141,6 +141,15 @@ def __init__(
             )
 
         self._oauth_flow: Optional[OAuthFlow] = None
+
+        if (
+            oauth_settings is None
+            and os.environ.get("SLACK_CLIENT_ID") is not None
+            and os.environ.get("SLACK_CLIENT_SECRET") is not None
+        ):
+            # initialize with the default settings
+            oauth_settings = OAuthSettings()
+
         if oauth_flow:
             self._oauth_flow = oauth_flow
             if self._installation_store is None:
@@ -389,7 +398,9 @@ def message(
 
         def __call__(*args, **kwargs):
             functions = self._to_listener_functions(kwargs) if kwargs else list(args)
-            primary_matcher = builtin_matchers.event("message")
+            primary_matcher = builtin_matchers.event(
+                {"type": "message", "subtype": None}
+            )
             middleware.append(MessageListenerMatches(keyword))
             return self._register_listener(
                 list(functions), primary_matcher, matchers, middleware, True
diff --git a/slack_bolt/app/async_app.py b/slack_bolt/app/async_app.py
@@ -149,6 +149,15 @@ def __init__(
             )
 
         self._async_oauth_flow: Optional[AsyncOAuthFlow] = None
+
+        if (
+            oauth_settings is None
+            and os.environ.get("SLACK_CLIENT_ID") is not None
+            and os.environ.get("SLACK_CLIENT_SECRET") is not None
+        ):
+            # initialize with the default settings
+            oauth_settings = AsyncOAuthSettings()
+
         if oauth_flow:
             self._async_oauth_flow = oauth_flow
             if self._async_installation_store is None:
@@ -398,7 +407,9 @@ def message(
 
         def __call__(*args, **kwargs):
             functions = self._to_listener_functions(kwargs) if kwargs else list(args)
-            primary_matcher = builtin_matchers.event("message", True)
+            primary_matcher = builtin_matchers.event(
+                {"type": "message", "subtype": None}, True
+            )
             middleware.append(AsyncMessageListenerMatches(keyword))
             return self._register_listener(
                 list(functions), primary_matcher, matchers, middleware, True
diff --git a/slack_bolt/listener_matcher/builtins.py b/slack_bolt/listener_matcher/builtins.py
@@ -75,10 +75,6 @@ async def async_fun(body: Dict[str, Any]) -> bool:
 def event(
     constraints: Union[str, Pattern, Dict[str, str]], asyncio: bool = False,
 ) -> Union[ListenerMatcher, "AsyncListenerMatcher"]:
-    if constraints == "message":
-        # matches message events that don't have subtype in body
-        constraints = {"type": "message", "subtype": None}
-
     if isinstance(constraints, (str, Pattern)):
         event_type: Union[str, Pattern] = constraints
 
diff --git a/slack_bolt/oauth/async_oauth_settings.py b/slack_bolt/oauth/async_oauth_settings.py
@@ -55,8 +55,8 @@ def __init__(
         self,
         *,
         # OAuth flow parameters/credentials
-        client_id: str,
-        client_secret: str,
+        client_id: Optional[str] = None,  # required
+        client_secret: Optional[str] = None,  # required
         scopes: Optional[List[str]] = None,
         user_scopes: Optional[List[str]] = None,
         redirect_uri: Optional[str] = None,
diff --git a/slack_bolt/oauth/oauth_settings.py b/slack_bolt/oauth/oauth_settings.py
@@ -50,8 +50,8 @@ def __init__(
         self,
         *,
         # OAuth flow parameters/credentials
-        client_id: str,
-        client_secret: str,
+        client_id: Optional[str] = None,  # required
+        client_secret: Optional[str] = None,  # required
         scopes: Optional[List[str]] = None,
         user_scopes: Optional[List[str]] = None,
         redirect_uri: Optional[str] = None,
