Fix content type on Web API requests (#276)

* Pass API data as form-encoded, not JSON

Author: Roach

slackclient/server.py

@@ -149,7 +149,7 @@ def send_to_websocket(self, data):
 
         """
         try:
-            data = json.dumps(data, ensure_ascii=False)
+            data = json.dumps(data)
             self.websocket.send(data)
         except Exception:
             self.rtm_connect(reconnect=True)
@@ -260,7 +260,7 @@ def api_call(self, method, timeout=None, **kwargs):
         response = self.api_requester.do(self.token, method, kwargs, timeout=timeout)
         response_json = json.loads(response.text)
         response_json["headers"] = dict(response.headers)
-        return json.dumps(response_json, ensure_ascii=False)
+        return json.dumps(response_json)
 
 # TODO: Move the error types defined below into the .exceptions namespace. This would be a semver
 # major change because any clients already referencing these types in order to catch them

slackclient/slackrequest.py

@@ -1,5 +1,3 @@
-import json
-
 import requests
 import six  # noqa: F401
 
@@ -68,7 +66,6 @@ def do(self, token, request="?", post_data=None, domain="slack.com", timeout=Non
 
         headers = {
             'user-agent': self.get_user_agent(),
-            'Content-Type': 'application/json',
             'Authorization': 'Bearer {}'.format(token)
         }
 
@@ -92,7 +89,7 @@ def do(self, token, request="?", post_data=None, domain="slack.com", timeout=Non
         return requests.post(
             url,
             headers=headers,
-            data=json.dumps(post_data),
+            data=post_data,
             files=files,
             timeout=timeout,
             proxies=self.proxies

tests/test_slackrequest.py

@@ -63,9 +63,12 @@ def test_plural_field(mocker):
     request.do('xoxb-123','conversations.open', {'users': ['U123', 'U234', 'U345']})
     args, kwargs = requests.post.call_args
 
-    assert requests.post.call_count == 1
-    assert 'https://slack.com/api/conversations.open' == args[0]
-    assert kwargs['data'] == '{"users": "U123,U234,U345"}'
+    assert kwargs['data'] == {'users': 'U123,U234,U345'}
+
+    request.do('xoxb-123','conversations.open', {'users': "U123,U234,U345"})
+    args2, kwargs2 = requests.post.call_args
+
+    assert kwargs2['data'] == {'users': 'U123,U234,U345'}
 
 
 def test_post_file(mocker):
@@ -80,7 +83,7 @@ def test_post_file(mocker):
 
     assert requests.post.call_count == 1
     assert 'https://slack.com/api/files.upload' == args[0]
-    assert {'filename': 'slack_logo.png'} == json.loads(kwargs['data'])
+    assert {'filename': 'slack_logo.png'} == kwargs['data']
     assert kwargs['files'] is not None
 
 
@@ -93,7 +96,7 @@ def test_get_file(mocker):
 
     assert requests.post.call_count == 1
     assert 'https://slack.com/api/files.info' == args[0]
-    assert {'file': "myFavoriteFileID"} == json.loads(kwargs['data'])
+    assert {'file': "myFavoriteFileID"} == kwargs['data']
     assert kwargs['files'] is None
 
 
@@ -108,5 +111,5 @@ def test_post_attachements(mocker):
 
     assert requests.post.call_count == 1
     assert 'https://slack.com/api/chat.postMessage' == args[0]
-    assert {'attachments': [{'title': 'hello'}]} == json.loads(kwargs['data'])
+    assert {'attachments': [{'title': 'hello'}]} == kwargs['data']
     assert kwargs['files'] is None