Bump to new social-auth
cf https://github.com/omab/python-social-auth/blob/master/MIGRATING_TO_SOCIAL.md
This commit is contained in:
parent
cfe9ce39dd
commit
f87fca3588
3 changed files with 16 additions and 15 deletions
|
@ -3,5 +3,6 @@ django-compressor==2.1
|
|||
django-leaflet-storage==0.8.0rc13
|
||||
Pillow==4.0.0
|
||||
psycopg2==2.6.2
|
||||
python-social-auth==0.2.21
|
||||
requests==2.12.4
|
||||
social-auth-app-django==0.1.0
|
||||
social-auth-core==0.2.1
|
||||
|
|
|
@ -59,7 +59,7 @@ INSTALLED_APPS = (
|
|||
'leaflet_storage',
|
||||
'umap',
|
||||
'compressor',
|
||||
'social.apps.django_app.default',
|
||||
'social_django',
|
||||
)
|
||||
|
||||
# =============================================================================
|
||||
|
@ -118,8 +118,8 @@ TEMPLATES = [
|
|||
'django.template.context_processors.media',
|
||||
'django.template.context_processors.static',
|
||||
'django.template.context_processors.tz',
|
||||
'social.apps.django_app.context_processors.backends',
|
||||
'social.apps.django_app.context_processors.login_redirect',
|
||||
'social_django.context_processors.backends',
|
||||
'social_django.context_processors.login_redirect',
|
||||
'umap.context_processors.settings',
|
||||
'umap.context_processors.version',
|
||||
)
|
||||
|
@ -180,14 +180,14 @@ SOCIAL_AUTH_ASSOCIATE_BY_EMAIL = True
|
|||
LOGIN_URL = "login"
|
||||
SOCIAL_AUTH_LOGIN_REDIRECT_URL = "/login/popup/end/"
|
||||
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.social_auth.associate_by_email',
|
||||
'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_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.social_auth.associate_by_email',
|
||||
'social_core.pipeline.user.get_username',
|
||||
'social_core.pipeline.user.create_user',
|
||||
'social_core.pipeline.social_auth.associate_user',
|
||||
'social_core.pipeline.social_auth.load_extra_data',
|
||||
'social_core.pipeline.user.user_details'
|
||||
)
|
||||
|
|
|
@ -15,7 +15,7 @@ admin.autodiscover()
|
|||
|
||||
urlpatterns = [
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url('', include('social.apps.django_app.urls', namespace='social')),
|
||||
url('', include('social_django.urls', namespace='social')),
|
||||
url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='umap_short_url'),
|
||||
url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy),
|
||||
name='ajax-proxy'),
|
||||
|
|
Loading…
Reference in a new issue