Merge pull request #26 from udacity/remove_dj_version

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

diff --git a/forum/views/auth.py b/forum/views/auth.py
index c0fecc1d5c0a315cfde32af24a0ec85705fc4aeb..01f62105e167792ca358a1d992808fe31c77f7d1 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -1,36 +1,36 @@
+# -*- 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.utils.encoding import smart_unicode
 from django.utils.encoding import smart_unicode

-from forum.views.decorators import login_required
-from forum.modules import decorate

 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 django.contrib import messages
+

 from writers import manage_pending_data
 from writers import manage_pending_data

-import types
-import datetime
-import logging

 
 

-from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, \
-        ChangePasswordForm, SetPasswordForm
+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.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 forum.settings import REP_GAIN_BY_EMAIL_VALIDATION

 from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR
 
 def signin_page(request):
 from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR
 
 def signin_page(request):


@@ -134,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'))


@@ -159,7 +158,7 @@ def external_register(request):
         form1 = SimpleRegistrationForm(request.POST)
 
         if form1.is_valid():
         form1 = SimpleRegistrationForm(request.POST)
 
         if form1.is_valid():

-            user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'])
+            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()
 


@@ -199,17 +198,18 @@ def external_register(request):
 
         provider_class = AUTH_PROVIDERS[auth_provider].consumer
 
 
         provider_class = AUTH_PROVIDERS[auth_provider].consumer
 

-        # Pass the cookies to the Facebook authentication class get_user_data method. We need them to take the access token.

         if provider_class.__class__.__name__ == 'FacebookAuthConsumer':
         if provider_class.__class__.__name__ == 'FacebookAuthConsumer':

-            user_data = provider_class.get_user_data(request.COOKIES)
+            user_data = provider_class.get_user_data(request.session['access_token'])

         else:
             user_data = provider_class.get_user_data(request.session['assoc_key'])
 
         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


@@ -218,6 +218,7 @@ def external_register(request):
         'next': '/',
         'username': username,
         'email': email,
         'next': '/',
         'username': username,
         'email': email,

+        'real_name': real_name,

         })
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
         })
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context


@@ -251,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:


@@ -291,8 +292,13 @@ def send_validation_email(request):
         # 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])
 
         # 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])
 

-        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."))
+        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', '/'))
 
         


@@ -301,8 +307,7 @@ 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()
+        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:
         return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request))
         return login_and_forward(request, user, reverse('index'), _("Thank you, your email is now validated."))
     else:
         return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request))


@@ -328,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:


@@ -368,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}))
 


@@ -379,10 +384,13 @@ 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:
         message = _("Welcome back %s, you are now logged in") % smart_unicode(user.username)
 
     if message is None:
         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:
         forward = request.session.get(ON_SIGNIN_SESSION_ATTR, reverse('index'))
 
     if not forward:
         forward = request.session.get(ON_SIGNIN_SESSION_ATTR, reverse('index'))


@@ -394,7 +402,7 @@ def login_and_forward(request, user, forward=None, message=None):
         if submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.HOLD_PENDING_POSTS_MINUTES)):
             del request.session[PENDING_SUBMISSION_SESSION_ATTR]
         elif submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.WARN_PENDING_POSTS_MINUTES)):
         if submission_time < datetime.datetime.now() - datetime.timedelta(minutes=int(settings.HOLD_PENDING_POSTS_MINUTES)):
             del request.session[PENDING_SUBMISSION_SESSION_ATTR]
         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"))


@@ -402,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")


@@ -415,7 +433,7 @@ 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'))
 
 @decorate.withfn(login_required)
     return HttpResponseRedirect(reverse('index'))
 
 @decorate.withfn(login_required)