Skip to content

Fix issue 636, pass request object to authenticate function. #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 20, 2019
Merged

Fix issue 636, pass request object to authenticate function. #643

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a68e7c7
Fix issue 636, pass request object to authenticate function.
W0126 Sep 9, 2018
79012ec
Merge branch 'master' into fix-issue-636
W0126 Oct 18, 2018
22bd0d8
Merge branch 'master' into fix-issue-636
auvipy Jul 8, 2019
ff27e22
Merge branch 'master' into fix-issue-636
IvanAnishchuk Oct 19, 2019
f6f9bb7
Merge branch 'master' into fix-issue-636
IvanAnishchuk Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oauth2_provider/oauth2_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def validate_user(self, username, password, client, request, *args, **kwargs):
"""
Check username and password correspond to a valid and active User
"""
u = authenticate(username=username, password=password)
u = authenticate(request, username=username, password=password)
if u is not None and u.is_active:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_active is already checked in django (>=1.11 I think) do we need to check this here again?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix make sure request as a parameter to authenticate function, so authentication module can get request information.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cleder I agree regarding is_active, in fact Django also skips the check if user model doesn't implement is_active. Let's remove this part.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could be a separate PR though. Approving as the fix is correct.

request.user = u
return True
Expand Down