Fix missing comma(????)

.git-blame-ignore-revs

@@ -1 +0,0 @@
-c0db7215c95dbd31770ade1fc6ea65aa426d4590

.github/workflows/pypi.yml

@@ -1,33 +0,0 @@
-name: Publish package to PyPI
-
-on: 
-  push:
-    branches: [master]
-  release:
-    types: [created]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-
-    - name: Build and publish distribution
-      if: (github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')) || github.event_name == 'release'
-      env: 
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*

AUTHORS

@@ -10,4 +10,3 @@ Jason Dorweiler
 Pierre-Alain Dupont
 Karl Goetz
 Alex Kerney
-Gustav <https://github.com/dkgv>

HISTORY.rst

@@ -3,26 +3,15 @@
 Release history
 ===============
 
-1.1.2
------
+1.0.0 (2019-12-04)
+------------------
 
-- Fix for Discourse users API change
+This is a *potentially* breaking change if you're working with a significantly older Discourse deployment.
+It's not entirely clear if header based authentication has been available since day 1 or was introduced in
+a recent version (you should be fine! ... but caveat emptor).
 
-1.1.1
------
-
-- Fix for empty dictionary and 413 API response
-- Fix for getting member groups
-
-1.1.0
------
-
-- Added ability to follow redirects in requests
-
-1.0.0
------
-
-- Authenticate with headers
+- Adds new invitation methods
+- Hard switch from query param based authorization to header-based authorization
 
 0.9.0
 -----

docs/conf.py

@@ -51,9 +51,9 @@ copyright = u'2014, Marc Sibson'
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pydiscourse/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "1.1.2"
+__version__ = "1.0.0"
 
 from pydiscourse.client import DiscourseClient

pydiscourse/client.py

@@ -147,7 +147,7 @@ class DiscourseClient(object):
             ????
 
         """
-        r = self._get("/session/hp.json")
+        r = self._get("/users/hp.json")
         challenge = r["challenge"][::-1]  # reverse challenge, discourse security check
         confirmations = r["value"]
         return self._post(
@@ -489,11 +489,7 @@ class DiscourseClient(object):
             JSON API response
 
         """
-        return self._get(
-            "/c/{0}.json".format(category_id),
-            override_request_kwargs={"allow_redirects": True},
-            **kwargs
-        )
+        return self._get("/c/{0}.json".format(category_id), **kwargs)
 
     def hot_topics(self, **kwargs):
         """
@@ -949,7 +945,7 @@ class DiscourseClient(object):
         """
         Get all infos of a group by group name
         """
-        return self._get("/groups/{0}.json".format(group_name))
+        return self._get("/groups/{0}/members.json".format(group_name))
 
     def create_group(
         self,
@@ -1285,7 +1281,7 @@ class DiscourseClient(object):
         kwargs["parent_tag_name"] = parent_tag_name
         return self._post("/tag_groups", json=True, **kwargs)["tag_group"]
 
-    def _get(self, path, override_request_kwargs=None, **kwargs):
+    def _get(self, path, **kwargs):
         """
 
         Args:
@@ -1295,9 +1291,9 @@ class DiscourseClient(object):
         Returns:
 
         """
-        return self._request(GET, path, params=kwargs, override_request_kwargs=override_request_kwargs)
+        return self._request(GET, path, params=kwargs)
 
-    def _put(self, path, json=False, override_request_kwargs=None, **kwargs):
+    def _put(self, path, json=False, **kwargs):
         """
 
         Args:
@@ -1308,12 +1304,12 @@ class DiscourseClient(object):
 
         """
         if not json:
-            return self._request(PUT, path, data=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(PUT, path, data=kwargs)
 
         else:
-            return self._request(PUT, path, json=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(PUT, path, json=kwargs)
 
-    def _post(self, path, files=None, json=False, override_request_kwargs=None, **kwargs):
+    def _post(self, path, files={}, json=False, **kwargs):
         """
 
         Args:
@@ -1324,12 +1320,12 @@ class DiscourseClient(object):
 
         """
         if not json:
-            return self._request(POST, path, files=files, data=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(POST, path, files=files, data=kwargs)
 
         else:
-            return self._request(POST, path, files=files, json=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(POST, path, files=files, json=kwargs)
 
-    def _delete(self, path, override_request_kwargs=None, **kwargs):
+    def _delete(self, path, **kwargs):
         """
 
         Args:
@@ -1339,11 +1335,9 @@ class DiscourseClient(object):
         Returns:
 
         """
-        return self._request(DELETE, path, params=kwargs, override_request_kwargs=override_request_kwargs)
+        return self._request(DELETE, path, params=kwargs)
 
-    def _request(
-        self, verb, path, params=None, files=None, data=None, json=None, override_request_kwargs=None
-    ):
+    def _request(self, verb, path, params={}, files={}, data={}, json={}):
         """
         Executes HTTP request to API and handles response
 
@@ -1351,14 +1345,11 @@ class DiscourseClient(object):
             verb: HTTP verb as string: GET, DELETE, PUT, POST
             path: the path on the Discourse API
             params: dictionary of parameters to include to the API
-            override_request_kwargs: dictionary of requests.request keyword arguments to override defaults
 
         Returns:
             dictionary of response body data or None
 
         """
-        override_request_kwargs = override_request_kwargs or {}
-
         url = self.host + path
 
         headers = {
@@ -1373,7 +1364,9 @@ class DiscourseClient(object):
         retry_backoff = 1
 
         while retry_count > 0:
-            request_kwargs = dict(
+            response = requests.request(
+                verb,
+                url,
                 allow_redirects=False,
                 params=params,
                 files=files,
@@ -1383,10 +1376,6 @@ class DiscourseClient(object):
                 timeout=self.timeout,
             )
 
-            request_kwargs.update(override_request_kwargs)
-
-            response = requests.request(verb, url, **request_kwargs)
-
             log.debug("response %s: %s", response.status_code, repr(response.text))
             if response.ok:
                 break