Send Slack request with event data (if handler asks for it)

Author: datashaman

slackeventsapi/server.py

@@ -1,4 +1,5 @@
 from flask import Flask, request, make_response
+import inspect
 import json
 import platform
 import sys
@@ -117,7 +118,15 @@ def event():
             # Parse the Event payload and emit the event to the event listener
             if "event" in event_data:
                 event_type = event_data["event"]["type"]
-                self.emitter.emit(event_type, event_data)
+                event_args = [event_data]
+
+                listeners = self.emitter.listeners(event_type)
+                if listeners:
+                    argspec = inspect.getargspec(listeners[0])
+                    if len(argspec[0]) == 2:
+                        event_args = [event_data, request]
+
+                self.emitter.emit(event_type, *event_args)
                 response = make_response("", 200)
                 response.headers['X-Slack-Powered-By'] = self.package_info
                 return response

tests/test_events.py

@@ -29,3 +29,31 @@ def event_handler(event_data):
         assert res.status_code == 200
 
     assert test_event_emission.event_handled
+
+def test_event_emission_with_request(adapter):
+    test_event_emission.event_handled = False
+
+    # Events should trigger an event
+    @adapter.on('reaction_added')
+    def event_handler(event_data, request):
+        test_event_emission.event_handled = True
+        assert request.headers['X-Slack-Retry-No'] == '99'
+
+    data = pytest.reaction_event_fixture
+    timestamp = int(time.time())
+    signature = pytest.create_signature(adapter.signing_secret, timestamp, data)
+
+    with adapter.server.test_client() as client:
+        res = client.post(
+            '/slack/events',
+            data=data,
+            content_type='application/json',
+            headers={
+                'X-Slack-Request-Timestamp': timestamp,
+                'X-Slack-Retry-No': '99',
+                'X-Slack-Signature': signature
+            }
+        )
+        assert res.status_code == 200
+
+    assert test_event_emission.event_handled