diff --git a/requirements.txt b/requirements.txt index 36ab7318a7..1ccc355035 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # Implicit dependencies (optional dependencies of dependencies) elasticsearch-dsl==5.4.0 elasticsearch==5.5.3 -social-auth-app-django==5.3.0 +social-auth-app-django==5.4.0 # Explicit dependencies (references in code) beautifulsoup4==4.12.2 diff --git a/zds/settings/abstract_base/requirements.py b/zds/settings/abstract_base/requirements.py index c34df71cd3..d6191176d3 100644 --- a/zds/settings/abstract_base/requirements.py +++ b/zds/settings/abstract_base/requirements.py @@ -15,17 +15,17 @@ SOCIAL_AUTH_FACEBOOK_SCOPE = ["email"] 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", - "social.pipeline.user.get_username", - "social.pipeline.social_auth.associate_by_email", - "social.pipeline.user.create_user", + "social_core.pipeline.social_auth.social_details", + "social_core.pipeline.social_auth.social_uid", + "social_core.pipeline.social_auth.auth_allowed", + "social_core.pipeline.social_auth.social_user", + "social_core.pipeline.user.get_username", + "social_core.pipeline.social_auth.associate_by_email", + "social_core.pipeline.user.create_user", "zds.member.models.save_profile", - "social.pipeline.social_auth.associate_user", - "social.pipeline.social_auth.load_extra_data", - "social.pipeline.user.user_details", + "social_core.pipeline.social_auth.associate_user", + "social_core.pipeline.social_auth.load_extra_data", + "social_core.pipeline.user.user_details", ) # Before adding new providers such as Facebook and Google, diff --git a/zds/settings/prod.py b/zds/settings/prod.py index dfc5ce977c..f399dbedde 100644 --- a/zds/settings/prod.py +++ b/zds/settings/prod.py @@ -122,23 +122,6 @@ def _get_version(): } -# python-social-auth -# http://psa.matiasaguirre.net/docs/configuration/django.html -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", - "social.pipeline.user.get_username", - "social.pipeline.social_auth.associate_by_email", - "social.pipeline.user.create_user", - "zds.member.models.save_profile", - "social.pipeline.social_auth.associate_user", - "social.pipeline.social_auth.load_extra_data", - "social.pipeline.user.user_details", -) - - ############################################################################### # ZESTE DE SAVOIR SETTINGS