Merge pull request #5 from lra/french

[osqa.git] / forum / views / auth.py

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 75095a6c3aba5e59347f94c94c3d00574ad9ce5c..00b67dc2a7f1553ea7fdac52a1b43833dcb720f5 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -1,37 +1,47 @@
+# -*- coding: utf-8 -*-
+
+import datetime
+import logging
+import urllib
+from urlparse import urlparse
+

 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.core.urlresolvers import reverse

-from forum.models import User

 from django.http import HttpResponseRedirect, Http404
 from django.http import HttpResponseRedirect, Http404

-from forum.http_responses import HttpResponseUnauthorized

 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _

-from django.utils.http import urlquote_plus
-from django.contrib.auth.decorators import login_required
+from django.utils.encoding import smart_unicode

 from django.contrib.auth import login, logout
 from django.contrib.auth import login, logout

-from django.http import get_host
-from forum.actions import SuspendAction
-from forum.utils import html
-from forum import settings
-from writers import manage_pending_data
-import types
-import datetime
-import logging

 
 

-from forum.forms import SimpleRegistrationForm, SimpleEmailSubscribeForm, \
-        TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm
-from forum.utils.mail import send_email, send_template_email
+from django.contrib import messages

 
 

+from writers import manage_pending_data
+
+from forum.actions import EmailValidationAction
+from forum.utils import html
+from forum.views.decorators import login_required
+from forum.modules import decorate
+from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm
+from forum.http_responses import HttpResponseUnauthorized
+from forum.utils.mail import send_template_email

 from forum.authentication.base import InvalidAuthentication
 from forum.authentication import AUTH_PROVIDERS
 from forum.authentication.base import InvalidAuthentication
 from forum.authentication import AUTH_PROVIDERS

+from forum.models import User, AuthKeyUserAssociation, ValidationHash
+from forum.actions import UserJoinsAction, UserLoginAction
+from forum import settings

 
 

-from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer
-from forum.actions import UserJoinsAction
+from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR

 
 def signin_page(request):
 
 def signin_page(request):

-    request.session['on_signin_url'] = request.META.get('HTTP_REFERER', '/')
+    referer = request.META.get('HTTP_REFERER', '/')

 
 

-    all_providers = [provider.context for provider in AUTH_PROVIDERS.values()]
+    # If the referer is equal to the sign up page, e. g. if the previous login attempt was not successful we do not
+    # change the sign in URL. The user should go to the same page.
+    if not referer.replace(settings.APP_URL, '') == reverse('auth_signin'):
+        request.session[ON_SIGNIN_SESSION_ATTR] = referer
+
+    all_providers = [provider.context for provider in AUTH_PROVIDERS.values() if provider.context]

 
     sort = lambda c1, c2: c1.weight - c2.weight
     can_show = lambda c: not request.user.is_authenticated() or c.show_to_logged_in_user
 
     sort = lambda c1, c2: c1.weight - c2.weight
     can_show = lambda c: not request.user.is_authenticated() or c.show_to_logged_in_user


@@ -79,7 +89,7 @@ def prepare_provider_signin(request, provider):
 
         try:
             request_url = provider_class.prepare_authentication_request(request,
 
         try:
             request_url = provider_class.prepare_authentication_request(request,

-                                                                        reverse('auth_provider_done',
+                                                                        reverse('auth_provider_done', prefix='/',

                                                                                 kwargs={'provider': provider}))
 
             return HttpResponseRedirect(request_url)
                                                                                 kwargs={'provider': provider}))
 
             return HttpResponseRedirect(request_url)


@@ -124,8 +134,7 @@ def process_provider_signin(request, provider):
                 except:
                     uassoc = AuthKeyUserAssociation(user=request.user, key=assoc_key, provider=provider)
                     uassoc.save()
                 except:
                     uassoc = AuthKeyUserAssociation(user=request.user, key=assoc_key, provider=provider)
                     uassoc.save()

-                    request.user.message_set.create(
-                            message=_('The new credentials are now associated with your account'))
+                    messages.info(request, _('The new credentials are now associated with your account'))

                     return HttpResponseRedirect(reverse('user_authsettings', args=[request.user.id]))
 
             return HttpResponseRedirect(reverse('auth_signin'))
                     return HttpResponseRedirect(reverse('user_authsettings', args=[request.user.id]))
 
             return HttpResponseRedirect(reverse('auth_signin'))


@@ -137,7 +146,7 @@ def process_provider_signin(request, provider):
             assoc = AuthKeyUserAssociation.objects.get(key=assoc_key)
             user_ = assoc.user
             return login_and_forward(request, user_)
             assoc = AuthKeyUserAssociation.objects.get(key=assoc_key)
             user_ = assoc.user
             return login_and_forward(request, user_)

-        except:
+        except AuthKeyUserAssociation.DoesNotExist:

             request.session['assoc_key'] = assoc_key
             request.session['auth_provider'] = provider
             return HttpResponseRedirect(reverse('auth_external_register'))
             request.session['assoc_key'] = assoc_key
             request.session['auth_provider'] = provider
             return HttpResponseRedirect(reverse('auth_external_register'))


@@ -147,10 +156,9 @@ def process_provider_signin(request, provider):
 def external_register(request):
     if request.method == 'POST' and 'bnewaccount' in request.POST:
         form1 = SimpleRegistrationForm(request.POST)
 def external_register(request):
     if request.method == 'POST' and 'bnewaccount' in request.POST:
         form1 = SimpleRegistrationForm(request.POST)

-        email_feeds_form = SimpleEmailSubscribeForm(request.POST)

 
 

-        if (form1.is_valid() and email_feeds_form.is_valid()):
-            user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'])
+        if form1.is_valid():
+            user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'], real_name=form1.cleaned_data['real_name'])

             user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email']
             user_.set_unusable_password()
 
             user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email']
             user_.set_unusable_password()
 


@@ -175,10 +183,6 @@ def external_register(request):
             uassoc = AuthKeyUserAssociation(user=user_, key=assoc_key, provider=auth_provider)
             uassoc.save()
 
             uassoc = AuthKeyUserAssociation(user=user_, key=assoc_key, provider=auth_provider)
             uassoc.save()
 

-            if email_feeds_form.cleaned_data['subscribe'] == 'n':
-                user_.subscription_settings.enable_notifications = False
-                user_.subscription_settings.save()
-

             del request.session['assoc_key']
             del request.session['auth_provider']
 
             del request.session['assoc_key']
             del request.session['auth_provider']
 


@@ -193,13 +197,19 @@ def external_register(request):
             return HttpResponseRedirect(reverse('auth_signin'))
 
         provider_class = AUTH_PROVIDERS[auth_provider].consumer
             return HttpResponseRedirect(reverse('auth_signin'))
 
         provider_class = AUTH_PROVIDERS[auth_provider].consumer

-        user_data = provider_class.get_user_data(request.session['assoc_key'])
+
+        if provider_class.__class__.__name__ == 'FacebookAuthConsumer':
+            user_data = provider_class.get_user_data(request.session['access_token'])
+        else:
+            user_data = provider_class.get_user_data(request.session['assoc_key'])
+

 
         if not user_data:
             user_data = request.session.get('auth_consumer_data', {})
 
         username = user_data.get('username', '')
         email = user_data.get('email', '')
 
         if not user_data:
             user_data = request.session.get('auth_consumer_data', {})
 
         username = user_data.get('username', '')
         email = user_data.get('email', '')

+        real_name = user_data.get('real_name', '')

 
         if email:
             request.session['auth_validated_email'] = email
 
         if email:
             request.session['auth_validated_email'] = email


@@ -208,15 +218,14 @@ def external_register(request):
         'next': '/',
         'username': username,
         'email': email,
         'next': '/',
         'username': username,
         'email': email,

+        'real_name': real_name,

         })
         })

-        email_feeds_form = SimpleEmailSubscribeForm()

 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
 
     return render_to_response('auth/complete.html', {
     'form1': form1,
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
 
     return render_to_response('auth/complete.html', {
     'form1': form1,

-    'email_feeds_form': email_feeds_form,
-    'provider':mark_safe(provider_context.human_name),
+    'provider':provider_context and mark_safe(provider_context.human_name) or _('unknown'),

     'login_type':provider_context.id,
     'gravatar_faq_url':reverse('faq') + '#gravatar',
     }, context_instance=RequestContext(request))
     'login_type':provider_context.id,
     'gravatar_faq_url':reverse('faq') + '#gravatar',
     }, context_instance=RequestContext(request))


@@ -243,7 +252,7 @@ def request_temp_login(request):
 
                 send_template_email([u], "auth/temp_login_email.html", {'temp_login_code': hash})
 
 
                 send_template_email([u], "auth/temp_login_email.html", {'temp_login_code': hash})
 

-                request.user.message_set.create(message=_("An email has been sent with your temporary login key"))
+                messages.info(request, _("An email has been sent with your temporary login key"))

 
             return HttpResponseRedirect(reverse('index'))
     else:
 
             return HttpResponseRedirect(reverse('index'))
     else:


@@ -257,6 +266,11 @@ def temp_signin(request, user, code):
     user = get_object_or_404(User, id=user)
 
     if (ValidationHash.objects.validate(code, user, 'templogin', [user.id])):
     user = get_object_or_404(User, id=user)
 
     if (ValidationHash.objects.validate(code, user, 'templogin', [user.id])):

+        
+        # If the user requests temp_signin he must have forgotten his password. So we mark it as unusable.
+        user.set_unusable_password()
+        user.save()
+        

         return login_and_forward(request, user, reverse('user_authsettings', kwargs={'id': user.id}),
                                  _(
                                          "You are logged in with a temporary access key, please take the time to fix your issue with authentication."
         return login_and_forward(request, user, reverse('user_authsettings', kwargs={'id': user.id}),
                                  _(
                                          "You are logged in with a temporary access key, please take the time to fix your issue with authentication."


@@ -268,16 +282,23 @@ def send_validation_email(request):
     if not request.user.is_authenticated():
         return HttpResponseUnauthorized(request)
     else:
     if not request.user.is_authenticated():
         return HttpResponseUnauthorized(request)
     else:

+        # We check if there are some old validation hashes. If there are -- we delete them.

         try:
             hash = ValidationHash.objects.get(user=request.user, type='email')
         try:
             hash = ValidationHash.objects.get(user=request.user, type='email')

-            if hash.expiration < datetime.datetime.now():
-                hash.delete()
-                return send_validation_email(request)
+            hash.delete()

         except:
         except:

-            hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
+            pass

 
 

-        send_template_email([request.user], "auth/mail_validation.html", {'validation_code': hash})
-        request.user.message_set.create(message=_("A message with an email validation link was just sent to your address."))
+        # We don't care if there are previous cashes in the database... In every case we have to create a new one
+        hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
+
+        additional_get_params = urllib.urlencode(dict([k, v.encode('utf-8')] for k, v in request.GET.items()))
+        send_template_email([request.user], "auth/mail_validation.html", {
+            'validation_code': hash,
+            'additional_get_params' : additional_get_params
+        })
+
+        messages.info(request, _("A message with an email validation link was just sent to your address."))

         return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
         
         return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
         


@@ -286,13 +307,11 @@ def validate_email(request, user, code):
     user = get_object_or_404(User, id=user)
 
     if (ValidationHash.objects.validate(code, user, 'email', [user.email])):
     user = get_object_or_404(User, id=user)
 
     if (ValidationHash.objects.validate(code, user, 'email', [user.email])):

-        user.email_isvalid = True
-        user.save()
-        return login_and_forward(request, user, None, _("Thank you, your email is now validated."))
+        EmailValidationAction(user=user, ip=request.META['REMOTE_ADDR']).save()
+        return login_and_forward(request, user, reverse('index'), _("Thank you, your email is now validated."))

     else:
     else:

-        raise Http404()
+        return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request))

 
 

-@login_required

 def auth_settings(request, id):
     user_ = get_object_or_404(User, id=id)
 
 def auth_settings(request, id):
     user_ = get_object_or_404(User, id=id)
 


@@ -314,11 +333,11 @@ def auth_settings(request, id):
             user_.save()
 
             if is_new_pass:
             user_.save()
 
             if is_new_pass:

-                request.user.message_set.create(message=_("New password set"))
+                messages.info(request, _("New password set"))

                 if not request.user.is_superuser:
                     form = ChangePasswordForm(user=user_)
             else:
                 if not request.user.is_superuser:
                     form = ChangePasswordForm(user=user_)
             else:

-                request.user.message_set.create(message=_("Your password was changed"))
+                messages.info(request, _("Your password was changed"))

 
             return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': user_.id}))
     else:
 
             return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': user_.id}))
     else:


@@ -346,6 +365,7 @@ def auth_settings(request, id):
     'form': form,
     'has_password': user_.has_usable_password(),
     'auth_keys': auth_keys_list,
     'form': form,
     'has_password': user_.has_usable_password(),
     'auth_keys': auth_keys_list,

+    'allow_local_auth': AUTH_PROVIDERS.get('local', None),

     }, context_instance=RequestContext(request))
 
 def remove_external_provider(request, id):
     }, context_instance=RequestContext(request))
 
 def remove_external_provider(request, id):


@@ -353,7 +373,7 @@ def remove_external_provider(request, id):
     if not (request.user.is_superuser or request.user == association.user):
         return HttpResponseUnauthorized(request)
 
     if not (request.user.is_superuser or request.user == association.user):
         return HttpResponseUnauthorized(request)
 

-    request.user.message_set.create(message=_("You removed the association with %s") % association.provider)
+    messages.info(request, _("You removed the association with %s") % association.provider)

     association.delete()
     return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': association.user.id}))
 
     association.delete()
     return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': association.user.id}))
 


@@ -364,22 +384,25 @@ def login_and_forward(request, user, forward=None, message=None):
     user.backend = "django.contrib.auth.backends.ModelBackend"
     login(request, user)
 
     user.backend = "django.contrib.auth.backends.ModelBackend"
     login(request, user)
 

+    # Store the login action
+    UserLoginAction(user=user, ip=request.META['REMOTE_ADDR']).save()
+

     if message is None:
     if message is None:

-        message = _("Welcome back %s, you are now logged in") % user.username
+        message = _("Welcome back %s, you are now logged in") % smart_unicode(user.username)

 
 

-    request.user.message_set.create(message=message)
+    messages.info(request, message)

 
     if not forward:
 
     if not forward:

-        forward = request.session.get('on_signin_url', reverse('index'))
-        
-    pending_data = request.session.get('pending_submission_data', None)
+        forward = request.session.get(ON_SIGNIN_SESSION_ATTR, reverse('index'))
+
+    pending_data = request.session.get(PENDING_SUBMISSION_SESSION_ATTR, None)

 
     if pending_data and (user.email_isvalid or pending_data['type'] not in settings.REQUIRE_EMAIL_VALIDATION_TO):
         submission_time = pending_data['time']
         if submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.HOLD_PENDING_POSTS_MINUTES)):
 
     if pending_data and (user.email_isvalid or pending_data['type'] not in settings.REQUIRE_EMAIL_VALIDATION_TO):
         submission_time = pending_data['time']
         if submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.HOLD_PENDING_POSTS_MINUTES)):

-            del request.session['pending_submission_data']
+            del request.session[PENDING_SUBMISSION_SESSION_ATTR]

         elif submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.WARN_PENDING_POSTS_MINUTES)):
         elif submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.WARN_PENDING_POSTS_MINUTES)):

-            user.message_set.create(message=(_("You have a %s pending submission.") % pending_data['data_name']) + " %s, %s, %s" % (
+            messages.info(request, (_("You have a %s pending submission.") % pending_data['data_name']) + " %s, %s, %s" % (

                 html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('save')}), _("save it")),
                 html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('review')}), _("review")),
                 html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('cancel')}), _("cancel"))
                 html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('save')}), _("save it")),
                 html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('review')}), _("review")),
                 html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('cancel')}), _("cancel"))


@@ -387,7 +410,17 @@ def login_and_forward(request, user, forward=None, message=None):
         else:
             return manage_pending_data(request, _('save'), forward)
 
         else:
             return manage_pending_data(request, _('save'), forward)
 

-    return HttpResponseRedirect(forward)
+    additional_get_params = urllib.urlencode(dict([k, v.encode('utf-8')] for k, v in request.GET.items()))
+
+    parsed_forward = urlparse(forward)
+
+    # If there is already some parsed query in the URL then change the forward URL
+    if parsed_forward.query:
+        forward_url = forward + "&%s" % additional_get_params
+    else:
+        forward_url = forward + "?%s" % additional_get_params
+
+    return HttpResponseRedirect(forward_url)

 
 def forward_suspended_user(request, user, show_private_msg=True):
     message = _("Sorry, but this account is suspended")
 
 def forward_suspended_user(request, user, show_private_msg=True):
     message = _("Sorry, but this account is suspended")


@@ -400,10 +433,10 @@ def forward_suspended_user(request, user, show_private_msg=True):
     if suspension:
         message += (":<br />" + suspension.extra.get(msg_type, ''))
 
     if suspension:
         message += (":<br />" + suspension.extra.get(msg_type, ''))
 

-    request.user.message_set.create(message)
+    messages.info(request, message)

     return HttpResponseRedirect(reverse('index'))
 
     return HttpResponseRedirect(reverse('index'))
 

-@login_required
+@decorate.withfn(login_required)

 def signout(request):
     logout(request)
 def signout(request):
     logout(request)

-    return HttpResponseRedirect(reverse('index'))
\ No newline at end of file
+    return HttpResponseRedirect(reverse('index'))