Merge pull request #30 from Colin-b/develop

Release 0.10.0
Colin-b · Apr 27, 2021 · db8ff73 · db8ff73
2 parents d71a448 + 1d73516
commit db8ff73
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2021-04-27
+### Changed
+- Requires [`httpx`](https://www.python-httpx.org)==0.18.\*
+
 ## [0.9.0] - 2021-03-01
 ### Changed
 - Requires [`httpx`](https://www.python-httpx.org)==0.17.\*
@@ -99,7 +103,8 @@ Note that a few changes were made:
 ### Added
 - Placeholder for port of requests_auth to httpx
 
-[Unreleased]: https://github.com/Colin-b/httpx_auth/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/Colin-b/httpx_auth/compare/v0.10.0...HEAD
+[0.10.0]: https://github.com/Colin-b/httpx_auth/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/Colin-b/httpx_auth/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/Colin-b/httpx_auth/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/Colin-b/httpx_auth/compare/v0.6.0...v0.7.0

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Colin Bounouar
+Copyright (c) 2021 Colin Bounouar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/httpx_auth/authentication.py b/httpx_auth/authentication.py
@@ -565,7 +565,7 @@ def __init__(self, authorization_url: str, token_url: str, **kwargs):
         # As described in https://tools.ietf.org/html/rfc6749#section-4.1.3
         # include the PKCE code verifier used in the second part of the flow
         self.token_data = {
-            "code_verifier": code_verifier,
+            "code_verifier": code_verifier.decode("ascii"),
             "grant_type": "authorization_code",
             "redirect_uri": self.redirect_uri,
         }
@@ -1152,8 +1152,8 @@ def __init__(self, api_key: str, query_parameter_name: str = None):
     def auth_flow(
         self, request: httpx.Request
     ) -> Generator[httpx.Request, httpx.Response, None]:
-        request.url = httpx.URL(
-            request.url, params={self.query_parameter_name: self.api_key}
+        request.url = request.url.copy_merge_params(
+            {self.query_parameter_name: self.api_key}
         )
         yield request
 

diff --git a/httpx_auth/version.py b/httpx_auth/version.py
@@ -3,4 +3,4 @@
 # Major should be incremented in case there is a breaking change. (eg: 2.5.8 -> 3.0.0)
 # Minor should be incremented in case there is an enhancement. (eg: 2.5.8 -> 2.6.0)
 # Patch should be incremented in case there is a bug fix. (eg: 2.5.8 -> 2.5.9)
-__version__ = "0.9.0"
+__version__ = "0.10.0"
diff --git a/setup.py b/setup.py
@@ -36,14 +36,14 @@
     packages=find_packages(exclude=["tests*"]),
     install_requires=[
         # Used for Base Authentication and to communicate with OAuth2 servers
-        "httpx==0.17.*"
+        "httpx==0.18.*"
     ],
     extras_require={
         "testing": [
             # Used to generate test tokens
             "pyjwt==1.*",
             # Used to mock httpx
-            "pytest_httpx==0.11.*",
+            "pytest_httpx==0.12.*",
             # Used to check coverage
             "pytest-cov==2.*",
         ]