Commit 152e5597 by Clinton Blackburn Committed by Clinton Blackburn

Revert "Upgraded edx-auth-backends to 1.0.2"

This reverts commit 7ddb62c0.
parent 7d05d67b
......@@ -342,7 +342,29 @@ SOCIAL_AUTH_REDIRECT_IS_HTTPS = False
SOCIAL_AUTH_ADMIN_USER_SEARCH_FIELDS = ['username', 'email']
SOCIAL_AUTH_STRATEGY = 'auth_backends.strategies.EdxDjangoStrategy'
SOCIAL_AUTH_PIPELINE = (
'social.pipeline.social_auth.social_details',
'social.pipeline.social_auth.social_uid',
'social.pipeline.social_auth.auth_allowed',
'social.pipeline.social_auth.social_user',
# By default python-social-auth will simply create a new user/username if the username
# from the provider conflicts with an existing username in this system. This custom pipeline function
# loads existing users instead of creating new ones.
'auth_backends.pipeline.get_user_if_exists',
'social.pipeline.user.get_username',
'social.pipeline.user.create_user',
'social.pipeline.social_auth.associate_user',
'social.pipeline.social_auth.load_extra_data',
'social.pipeline.user.user_details'
)
SOCIAL_AUTH_USER_FIELDS = ['username', 'email', 'first_name', 'last_name']
# Always raise auth exceptions so that they are properly logged. Otherwise, the PSA middleware will redirect to an
# auth error page and attempt to display the error message to the user (via Django's message framework). We do not
# want the uer to see the message; but, we do want our downstream exception handlers to log the message.
SOCIAL_AUTH_RAISE_EXCEPTIONS = True
# Set these to the correct values for your OAuth2/OpenID Connect provider
SOCIAL_AUTH_EDX_OIDC_KEY = None
......
......@@ -14,7 +14,7 @@ django-crispy-forms==1.6.0 # MIT
django-soapbox==1.3 # BSD
django-waffle==0.11.1 # BSD
pinax-announcements==2.0.4 # MIT
edx-auth-backends==1.0.2
edx-auth-backends==0.7.0
edx-django-release-util==0.3.0
edx-i18n-tools==0.3.5
edx-rest-api-client>=1.5.0, <1.6.0 # Apache
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment