From 4f3a296651727f00482edfdf3d0fee56fed5bfe3 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Sat, 14 Mar 2020 14:53:25 -0400 Subject: [PATCH 1/3] Revert "Fix issue #636, pass request object to authenticate function. (#643)" This reverts commit d5e6645184edc1b91371fc17b73c3e11cd33b0c3. --- oauth2_provider/oauth2_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauth2_provider/oauth2_validators.py b/oauth2_provider/oauth2_validators.py index 9027a4841..b02b98075 100644 --- a/oauth2_provider/oauth2_validators.py +++ b/oauth2_provider/oauth2_validators.py @@ -608,7 +608,7 @@ def validate_user(self, username, password, client, request, *args, **kwargs): """ Check username and password correspond to a valid and active User """ - u = authenticate(request, username=username, password=password) + u = authenticate(username=username, password=password) if u is not None and u.is_active: request.user = u return True From 10a05d0816c65f158a1a93fa7ead7946b2934df2 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Sat, 14 Mar 2020 15:04:22 -0400 Subject: [PATCH 2/3] document revert of #643 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b23d5364..83ba76062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security --> +## [1.3.1] unrelease +### Fixed +* #812: Reverts #643 pass wrong request object to authenticate function. + +### Security + ## [1.3.0] 2020-03-02 ### Added From 7e978d13a2bf25dc366d66190d9f2955f908ba66 Mon Sep 17 00:00:00 2001 From: Alan Crosswell Date: Sat, 14 Mar 2020 15:06:12 -0400 Subject: [PATCH 3/3] fix sloppy changelog edits --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83ba76062..cfbc66190 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,12 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security --> -## [1.3.1] unrelease +## [1.3.1] unreleased ### Fixed * #812: Reverts #643 pass wrong request object to authenticate function. -### Security - ## [1.3.0] 2020-03-02 ### Added