Merge branch 'master' into BP-778/Issue-125/improve-swagger-support-f…

…or-authenticators
plangrid · Sep 20, 2019 · a0b07b9 · a0b07b9
2 parents 5bb7a9e + 075d1bf
commit a0b07b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.10.1
+current_version = 1.10.2
 commit = True
 tag = True
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@ Changelog
 =========
 
 
+v1.10.2 (2019-09-19)
+--------------------
+
+Fix
+~~~
+- Update authenticators to catch Forbidden exception (#133) [Marc-Éric]
+
+
 v1.10.1 (2019-09-19)
 --------------------
 

diff --git a/flask_rebar/rebar.py b/flask_rebar/rebar.py
@@ -125,7 +125,7 @@ def wrapped(*args, **kwargs):
                 try:
                     authenticator.authenticate()
                     break  # Short-circuit on first successful authentication
-                except errors.Unauthorized as e:
+                except (errors.Unauthorized, errors.Forbidden) as e:
                     first_error = first_error or e
             else:
                 raise first_error or errors.Unauthorized

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 if __name__ == "__main__":
     setup(
         name="flask-rebar",
-        version="1.10.1",
+        version="1.10.2",
         author="Barak Alon",
         author_email="[email protected]",
         description="Flask-Rebar combines flask, marshmallow, and swagger for robust REST services.",