merge conflicts

Author: tomasreimers

.gitignore

@@ -12,11 +12,11 @@ __pycache__/
 *~
 
 # virtualenv
-env/
+env*/
 venv/
 
 # codecov / coverage
-.coverage
+.coverage*
 cov_*
 coverage.xml
 
@@ -33,3 +33,4 @@ pip
 
 tmp.txt
 .DS_Store
+logs/

.travis.yml

@@ -1,9 +1,9 @@
-sudo: false
 dist: xenial
 language: python
 python:
   - "3.6"
   - "3.7"
+  - "3.8"
 install:
   - python setup.py install
 script:

README.md

@@ -74,11 +74,11 @@ We've created this [tutorial](/tutorial) to build a basic Slack app in less than
 
 ---
 
-Slack provide a Web API that gives you the ability to build applications that interact with Slack in a variety of ways. This Development Kit is a module based wrapper that makes interaction with that API easier. We have a basic example here with some of the more common uses but a full list of the available methods are available [here][api-methods]. More detailed examples can be found in our [Basic Usage](https://slack.dev/python-slackclient/basic_usage.html) guide
+Slack provide a Web API that gives you the ability to build applications that interact with Slack in a variety of ways. This Development Kit is a module based wrapper that makes interaction with that API easier. We have a basic example here with some of the more common uses but a full list of the available methods are available [here][api-methods]. More detailed examples can be found in our [Basic Usage](https://slack.dev/python-slackclient/basic_usage.html) guide.
 
 #### Sending a message to Slack
 
-One of the most common use-cases is sending a message to Slack. If you want to send a message as your app, or as a user, this method can do both. In our examples, we specify the channel name, however it is recommended to use the `channel_id` where possible.
+One of the most common use-cases is sending a message to Slack. If you want to send a message as your app, or as a user, this method can do both. In our examples, we specify the channel name, however it is recommended to use the `channel_id` where possible. Also, if your app's bot user is not in a channel yet, invite the bot user before running the code snippet (or add `chat:write.public` to Bot Token Scopes for posting in any public channels).
 
 ```python
 import os

codecov.yml

@@ -0,0 +1,8 @@
+coverage:
+  status:
+    project:
+      default:
+        threshold: 0.3%
+    patch:
+      default:
+        target: 50%

docs-src/basic_usage.rst

@@ -178,19 +178,16 @@ Modals use the same blocks that compose messages with the addition of an `input`
 
 .. code-block:: python
 
+  # This module is available since v2.6.0rc1
+  from slack.signature import SignatureVerifier
+  signature_verifier = SignatureVerifier(os.environ["SLACK_SIGNING_SECRET"])
+
   from flask import Flask, request, make_response
   app = Flask(__name__)
-  signing_secret = os.environ["SLACK_SIGNING_SECRET"]
 
   @app.route("/slack/events", methods=["POST"])
   def slack_app():
-    # Refer to https://github.com/slackapi/python-slack-events-api
-    # (The Slack Team is going to provide a new package soon)
-    if not verify_request(
-      signing_secret=signing_secret,
-      request_body=request.get_data(),
-      timestamp=request.headers.get("X-Slack-Request-Timestamp"),
-      signature=request.headers.get("X-Slack-Signature")):
+    if not signature_verifier.is_valid_request(request.get_data(), request.headers):
       return make_response("invalid request", 403)
 
     if "command" in request.form \

docs-src/changelog.rst

@@ -2,6 +2,29 @@
 Changelog
 ==============================================
 
+v2.6.0rc1 (2020-05-14)
+-------------------
+
+Refer to `v2.6.0 milestone <https://github.com/slackapi/python-slackclient/milestone/5>`_ to know the complete list of the issues resolved by this release.
+
+**New Features**
+
+1. [Block Kit] #659 Add complete supports for Block Kit components and fixed a few existing bugs as well (#500 #519 #623 #632 #635 #639 #676) - Thanks @seratch @diurnalist @ruberVulpes @jeremyschulman @e271828- @RodneyU215
+2. [Signature] #686 Add slack.signature.SignatureVerifier for request verification - Thanks @seratch
+3. [WebClient] #682 Add missing Grid admin APIs (`admin.usergroups.*`, `admin.users.*`, `admin.apps.*`) - Thanks @stevengill @seratch
+
+**Updates**
+
+1. [WebClient][RTMClient] Fixed a bunch of the currency issues this SDK had (#429 #463 #492 #497 #530 #558 #569 #605 #613 #619 #626 #630 #631 #633 #669) - Thanks @seratch @aaguilartablada @aoberoi @stevengill
+2. [WebClient] #681 #560 Enable using bool values for request parameters - Thanks @roman-kachanovsky @seratch
+3. [WebClient] #661 #678 Improve handling of required "ids" parameters (e.g., channel_ids, users) - Thanks @seratch
+4. [WebClient] #680 Add non-conversation API deprecation warnings - Thanks @seratch
+5. [WebClient] #671 #670 Enable passing None values for request parameters (they used to result in errors) - Thanks @seratch
+6. [WebClient] #673 Fix #672 files.upload fails with a filepath containing multi byte chars - Thanks @yuji38kwmt @seratch
+7. [WebClient] #656 Fix #594 preview_image for files.remote.add API method is not properly supported - Thanks @seratch
+8. [Maintenance] #618 Add py.typed file to package distribution - Thanks @JKillian
+9. [WebClient] #599 Strip token string parameters of whitespace - Thanks @TheFrozenFire
+
 v2.5.0 (2019-12-09)
 -------------------
 **New Features**

docs/basic_usage.html

@@ -162,6 +162,7 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-6-0rc1-2020-05-14">v2.6.0rc1 (2020-05-14)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-5-0-2019-12-09">v2.5.0 (2019-12-09)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-4-0-2019-11-27">v2.4.0 (2019-11-27)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-3-1-2019-10-29">v2.3.1 (2019-10-29)</a></li>
@@ -354,19 +355,16 @@ <h2>Deleting a message<a class="headerlink" href="#deleting-a-message" title="Pe
 <h2>Opening a modal<a class="headerlink" href="#opening-a-modal" title="Permalink to this headline">¶</a></h2>
 <p>Modals allow you to collect data from users and display dynamic information in a focused surface.</p>
 <p>Modals use the same blocks that compose messages with the addition of an <cite>input</cite> block.</p>
-<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">flask</span> <span class="kn">import</span> <span class="n">Flask</span><span class="p">,</span> <span class="n">request</span><span class="p">,</span> <span class="n">make_response</span>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="c1"># This module is available since v2.6.0rc1</span>
+<span class="kn">from</span> <span class="nn">slack.signature</span> <span class="kn">import</span> <span class="n">SignatureVerifier</span>
+<span class="n">signature_verifier</span> <span class="o">=</span> <span class="n">SignatureVerifier</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s2">&quot;SLACK_SIGNING_SECRET&quot;</span><span class="p">])</span>
+
+<span class="kn">from</span> <span class="nn">flask</span> <span class="kn">import</span> <span class="n">Flask</span><span class="p">,</span> <span class="n">request</span><span class="p">,</span> <span class="n">make_response</span>
 <span class="n">app</span> <span class="o">=</span> <span class="n">Flask</span><span class="p">(</span><span class="vm">__name__</span><span class="p">)</span>
-<span class="n">signing_secret</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s2">&quot;SLACK_SIGNING_SECRET&quot;</span><span class="p">]</span>
 
 <span class="nd">@app</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s2">&quot;/slack/events&quot;</span><span class="p">,</span> <span class="n">methods</span><span class="o">=</span><span class="p">[</span><span class="s2">&quot;POST&quot;</span><span class="p">])</span>
 <span class="k">def</span> <span class="nf">slack_app</span><span class="p">():</span>
-  <span class="c1"># Refer to https://github.com/slackapi/python-slack-events-api</span>
-  <span class="c1"># (The Slack Team is going to provide a new package soon)</span>
-  <span class="k">if</span> <span class="ow">not</span> <span class="n">verify_request</span><span class="p">(</span>
-    <span class="n">signing_secret</span><span class="o">=</span><span class="n">signing_secret</span><span class="p">,</span>
-    <span class="n">request_body</span><span class="o">=</span><span class="n">request</span><span class="o">.</span><span class="n">get_data</span><span class="p">(),</span>
-    <span class="n">timestamp</span><span class="o">=</span><span class="n">request</span><span class="o">.</span><span class="n">headers</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;X-Slack-Request-Timestamp&quot;</span><span class="p">),</span>
-    <span class="n">signature</span><span class="o">=</span><span class="n">request</span><span class="o">.</span><span class="n">headers</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;X-Slack-Signature&quot;</span><span class="p">)):</span>
+  <span class="k">if</span> <span class="ow">not</span> <span class="n">signature_verifier</span><span class="o">.</span><span class="n">is_valid_request</span><span class="p">(</span><span class="n">request</span><span class="o">.</span><span class="n">get_data</span><span class="p">(),</span> <span class="n">request</span><span class="o">.</span><span class="n">headers</span><span class="p">):</span>
     <span class="k">return</span> <span class="n">make_response</span><span class="p">(</span><span class="s2">&quot;invalid request&quot;</span><span class="p">,</span> <span class="mi">403</span><span class="p">)</span>
 
   <span class="k">if</span> <span class="s2">&quot;command&quot;</span> <span class="ow">in</span> <span class="n">request</span><span class="o">.</span><span class="n">form</span> \

docs/changelog.html

@@ -162,6 +162,7 @@
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Changelog</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#v2-6-0rc1-2020-05-14">v2.6.0rc1 (2020-05-14)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#v2-5-0-2019-12-09">v2.5.0 (2019-12-09)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#v2-4-0-2019-11-27">v2.4.0 (2019-11-27)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#v2-3-1-2019-10-29">v2.3.1 (2019-10-29)</a></li>
@@ -222,6 +223,28 @@
           <div class="card">
   <div class="section" id="changelog">
 <h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="v2-6-0rc1-2020-05-14">
+<h2>v2.6.0rc1 (2020-05-14)<a class="headerlink" href="#v2-6-0rc1-2020-05-14" title="Permalink to this headline">¶</a></h2>
+<p>Refer to <a class="reference external" href="https://github.com/slackapi/python-slackclient/milestone/5">v2.6.0 milestone</a> to know the complete list of the issues resolved by this release.</p>
+<p><strong>New Features</strong></p>
+<ol class="arabic simple">
+<li><p>[Block Kit] #659 Add complete supports for Block Kit components and fixed a few existing bugs as well (#500 #519 #623 #632 #635 #639 #676) - Thanks &#64;seratch &#64;diurnalist &#64;ruberVulpes &#64;jeremyschulman &#64;e271828- &#64;RodneyU215</p></li>
+<li><p>[Signature] #686 Add slack.signature.SignatureVerifier for request verification - Thanks &#64;seratch</p></li>
+<li><p>[WebClient] #682 Add missing Grid admin APIs (<cite>admin.usergroups.*</cite>, <cite>admin.users.*</cite>, <cite>admin.apps.*</cite>) - Thanks &#64;stevengill &#64;seratch</p></li>
+</ol>
+<p><strong>Updates</strong></p>
+<ol class="arabic simple">
+<li><p>[WebClient][RTMClient] Fixed a bunch of the currency issues this SDK had (#429 #463 #492 #497 #530 #558 #569 #605 #613 #619 #626 #630 #631 #633 #669) - Thanks &#64;seratch &#64;aaguilartablada &#64;aoberoi &#64;stevengill</p></li>
+<li><p>[WebClient] #681 #560 Enable using bool values for request parameters - Thanks &#64;roman-kachanovsky &#64;seratch</p></li>
+<li><p>[WebClient] #661 #678 Improve handling of required “ids” parameters (e.g., channel_ids, users) - Thanks &#64;seratch</p></li>
+<li><p>[WebClient] #680 Add non-conversation API deprecation warnings - Thanks &#64;seratch</p></li>
+<li><p>[WebClient] #671 #670 Enable passing None values for request parameters (they used to result in errors) - Thanks &#64;seratch</p></li>
+<li><p>[WebClient] #673 Fix #672 files.upload fails with a filepath containing multi byte chars - Thanks &#64;yuji38kwmt &#64;seratch</p></li>
+<li><p>[WebClient] #656 Fix #594 preview_image for files.remote.add API method is not properly supported - Thanks &#64;seratch</p></li>
+<li><p>[Maintenance] #618 Add py.typed file to package distribution - Thanks &#64;JKillian</p></li>
+<li><p>[WebClient] #599 Strip token string parameters of whitespace - Thanks &#64;TheFrozenFire</p></li>
+</ol>
+</div>
 <div class="section" id="v2-5-0-2019-12-09">
 <h2>v2.5.0 (2019-12-09)<a class="headerlink" href="#v2-5-0-2019-12-09" title="Permalink to this headline">¶</a></h2>
 <p><strong>New Features</strong></p>

docs/genindex.html

@@ -163,6 +163,7 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-6-0rc1-2020-05-14">v2.6.0rc1 (2020-05-14)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-5-0-2019-12-09">v2.5.0 (2019-12-09)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-4-0-2019-11-27">v2.4.0 (2019-11-27)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-3-1-2019-10-29">v2.3.1 (2019-10-29)</a></li>

docs/index.html

@@ -162,6 +162,7 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="changelog.html">Changelog</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-6-0rc1-2020-05-14">v2.6.0rc1 (2020-05-14)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-5-0-2019-12-09">v2.5.0 (2019-12-09)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-4-0-2019-11-27">v2.4.0 (2019-11-27)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="changelog.html#v2-3-1-2019-10-29">v2.3.1 (2019-10-29)</a></li>