Juniper Upgrade - Changed inheritance for OrganizationMemberBackend #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnbaldwin
force-pushed
the
john/juniper-upgrade/fix-not-is_active
branch
from
39b0e7d to
690a43b
Compare
OmarIthawi
reviewed
Mar 30, 2021
There was a problem hiding this comment.
First, thank you for debugging through this very difficult issue! This is a very challenging part of Open edX! I read the comments and reviewed the PR and I think this is the way to go.
I have one suggestion and it should be good to be merged:
- Import
from django.contrib.auth.backends import AllowAllUsersModelBackendinstead ofModelBackend AllowAllUsersModelBackendshould be used instead ofNoActiveCanAuthenticateMixin
organizations/backends.py
Outdated
| return None | ||
|
|
||
|
|
||
| class OrganizationMemberBackend(ModelBackend): | ||
| class OrganizationMemberBackend(NoActiveCanAuthenticateMixin, ModelBackend): |
There was a problem hiding this comment.
Suggested change
| class OrganizationMemberBackend(NoActiveCanAuthenticateMixin, ModelBackend): | |
| class OrganizationMemberBackend(AllowAllUsersModelBackend): |
organizations/backends.py
Outdated
| @@ -11,6 +11,66 @@ | |||
| ) | |||
|
|
|||
|
|
|||
| class NoActiveCanAuthenticateMixin: | |||
There was a problem hiding this comment.
I've read the documentation the pointers you've posted which lead me to lms/envs/common.py:
AUTHENTICATION_BACKENDS = [
'rules.permissions.ObjectPermissionBackend',
'openedx.core.djangoapps.oauth_dispatch.dot_overrides.backends.EdxRateLimitedAllowAllUsersModelBackend',
'bridgekeeper.backends.RulePermissionBackend',
]Looking at EdxRateLimitedAllowAllUsersModelBackend it turns out it extends AllowAllUsersModelBackend which does exactly what NoActiveCanAuthenticateMixin does.
# Standard Django backend.
# see https://docs.djangoproject.com/en/3.1/ref/contrib/auth/#django.contrib.auth.backends.AllowAllUsersModelBackend
class AllowAllUsersModelBackend(ModelBackend):
def user_can_authenticate(self, user):
return True
johnbaldwin
force-pushed
the
john/juniper-upgrade/fix-not-is_active
branch
from
690a43b to
66faaf6
Compare
This commit changes the base model to AllowAllUsersModelBackend from ModelBackend for which Organizations.backends.OrganizationMemberBackend inherits. The purpose of this is to address an architectural issue with how Open edX handles authentication and authorization on email vericification. See the source code in this commit for more details
johnbaldwin
force-pushed
the
john/juniper-upgrade/fix-not-is_active
branch
from
66faaf6 to
5e264ce
Compare
|
@OmarIthawi Great find and suggestion! Implemented and also updated documentation. Please review and approve if you don't see anything else |
johnbaldwin
changed the title
OmarIthawi
approved these changes
Mar 31, 2021
OmarIthawi
added a commit
to appsembler/edx-platform
that referenced
this pull request
Apr 1, 2021
Show better error message for inactive users and ask them to check email as described in RED-1864 . Brings over changes from appsembler/edx-organizations#13
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit changes the base model to AllowAllUsersModelBackend from
ModelBackend for which Organizations.backends.OrganizationMemberBackend
inherits. The purpose of this is to address an architectural issue with how
Open edX handles authentication and authorization on email vericification.
See the source code in this commit for more details
https://appsembler.atlassian.net/browse/RED-1864