Migration auf dne neuen Social-Auth Code.
This commit is contained in:
@@ -15,7 +15,8 @@ markdown
|
|||||||
pillow
|
pillow
|
||||||
psycopg2
|
psycopg2
|
||||||
PyJWT
|
PyJWT
|
||||||
python-social-auth<0.3
|
#python-social-auth ## deprecated
|
||||||
|
social-auth-app-django
|
||||||
pytz==2013d
|
pytz==2013d
|
||||||
requests
|
requests
|
||||||
requests-oauthlib
|
requests-oauthlib
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ PREREQ_APPS = [
|
|||||||
'ckeditor',
|
'ckeditor',
|
||||||
'ckeditor_uploader',
|
'ckeditor_uploader',
|
||||||
'easy_thumbnails',
|
'easy_thumbnails',
|
||||||
'social.apps.django_app.default',
|
'social_django',
|
||||||
]
|
]
|
||||||
PROJECT_APPS = [
|
PROJECT_APPS = [
|
||||||
'kasu',
|
'kasu',
|
||||||
@@ -135,9 +135,9 @@ DEFAULT_FROM_EMAIL = ""
|
|||||||
# Login Settings
|
# Login Settings
|
||||||
ACCOUNT_ACTIVATION_DAYS = 5
|
ACCOUNT_ACTIVATION_DAYS = 5
|
||||||
AUTH_USER_MODEL = 'membership.Membership'
|
AUTH_USER_MODEL = 'membership.Membership'
|
||||||
AUTHENTICATION_BACKENDS = ('social.backends.facebook.FacebookOAuth2',
|
AUTHENTICATION_BACKENDS = ('social_core.backends.facebook.FacebookOAuth2',
|
||||||
'social.backends.google.GoogleOAuth2',
|
'social_core.backends.google.GoogleOAuth2',
|
||||||
'social.backends.twitter.TwitterOAuth',
|
'social_core.backends.twitter.TwitterOAuth',
|
||||||
'django.contrib.auth.backends.ModelBackend',)
|
'django.contrib.auth.backends.ModelBackend',)
|
||||||
LOGIN_URL = '/membership/login/'
|
LOGIN_URL = '/membership/login/'
|
||||||
LOGIN_ERROR_URL = '/membership/login/error/'
|
LOGIN_ERROR_URL = '/membership/login/error/'
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ from . import views
|
|||||||
|
|
||||||
urlpatterns = patterns(
|
urlpatterns = patterns(
|
||||||
'',
|
'',
|
||||||
url('', include('social.apps.django_app.urls', namespace='social')),
|
url('', include('social_django.urls', namespace='social')),
|
||||||
url('', include('django.contrib.auth.urls')),
|
url('', include('django.contrib.auth.urls')),
|
||||||
url(r'^register/$',
|
url(r'^register/$',
|
||||||
views.RegisterForm.as_view(),
|
views.RegisterForm.as_view(),
|
||||||
|
|||||||
Reference in New Issue
Block a user