Merge branch 'master' into obrazy

[wolnelektury.git] / wolnelektury / settings / auth.py

diff --git a/wolnelektury/settings/auth.py b/wolnelektury/settings/auth.py
index 21210c0..4d3ea22 100644 (file)
--- a/wolnelektury/settings/auth.py
+++ b/wolnelektury/settings/auth.py
@@ -2,9 +2,18 @@ AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
     'allauth.account.auth_backends.AuthenticationBackend',
 ]
     'django.contrib.auth.backends.ModelBackend',
     'allauth.account.auth_backends.AuthenticationBackend',
 ]

-EMAIL_CONFIRMATION_DAYS = 2
+ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 2

 LOGIN_URL = '/uzytkownik/login/'
 
 LOGIN_REDIRECT_URL = '/'
 
 LOGIN_URL = '/uzytkownik/login/'
 
 LOGIN_REDIRECT_URL = '/'
 

-SOCIALACCOUNT_AUTO_SIGNUP = False
\ No newline at end of file
+SOCIALACCOUNT_AUTO_SIGNUP = False
+SOCIALACCOUNT_QUERY_EMAIL = True
+
+
+SOCIALACCOUNT_PROVIDERS = \
+    { 'openid':
+        { 'SERVERS':
+            [dict(id='google',
+                  name='Google',
+                  openid_url='https://www.google.com/accounts/o8/id')]}}