Accepting incoming merge of the jambazov feature branch. Mostly includes new bug...

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

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 7f9b91e6e0b33c4a9000b41b042223596467357b..ad4785dcef53e6a273702ea9b7d8abe78ddaff86 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -7,17 +7,21 @@ from forum.http_responses import HttpResponseUnauthorized
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 from django.utils.http import urlquote_plus
 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 forum.views.decorators import login_required
+from forum.modules import decorate

 from django.contrib.auth import login, logout
 from django.http import get_host
 from forum.actions import SuspendAction
 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
 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 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


@@ -25,12 +29,11 @@ from forum.authentication import AUTH_PROVIDERS
 from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer
 from forum.actions import UserJoinsAction
 
 from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer
 from forum.actions import UserJoinsAction
 

-def signin_page(request, action=None):
-    if action is None:
-        request.session['on_signin_url'] = request.META.get('HTTP_REFERER', '/')
-    else:
-        request.session['on_signin_action'] = action
-        request.session['on_signin_url'] = reverse('auth_action_signin', kwargs={'action': action})
+def signin_page(request):
+    request.session['on_signin_url'] = request.META.get('HTTP_REFERER', '/')
+    
+    if reverse('auth_signin') == request.session['on_signin_url'].replace(settings.APP_URL, ''):
+        request.session['on_signin_url'] = reverse('index')

 
     all_providers = [provider.context for provider in AUTH_PROVIDERS.values()]
 
 
     all_providers = [provider.context for provider in AUTH_PROVIDERS.values()]
 


@@ -227,22 +230,24 @@ def request_temp_login(request):
         form = TemporaryLoginRequestForm(request.POST)
 
         if form.is_valid():
         form = TemporaryLoginRequestForm(request.POST)
 
         if form.is_valid():

-            user = form.user_cache
+            users = form.user_cache

 
 

-            if user.is_suspended():
-                return forward_suspended_user(request, user, False)
+            for u in users:
+                if u.is_suspended():
+                    return forward_suspended_user(request, u, False)

 
 

-            try:
-                hash = get_object_or_404(ValidationHash, user=user, type='templogin')
-                if hash.expiration < datetime.datetime.now():
-                    hash.delete()
-                    return request_temp_login(request)
-            except:
-                hash = ValidationHash.objects.create_new(user, 'templogin', [user.id])
+            for u in users:
+                try:
+                    hash = get_object_or_404(ValidationHash, user=u, type='templogin')
+                    if hash.expiration < datetime.datetime.now():
+                        hash.delete()
+                        return request_temp_login(request)
+                except:
+                    hash = ValidationHash.objects.create_new(u, 'templogin', [u.id])

 
 

-            send_template_email([user], "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"))
+                request.user.message_set.create(message=_("An email has been sent with your temporary login key"))

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


@@ -256,6 +261,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."


@@ -263,17 +273,37 @@ def temp_signin(request, user, code):
     else:
         raise Http404()
 
     else:
         raise Http404()
 

+def send_validation_email(request):
+    if not request.user.is_authenticated():
+        return HttpResponseUnauthorized(request)
+    else:
+        try:
+            hash = ValidationHash.objects.get(user=request.user, type='email')
+            hash.delete()
+            
+            # If we were able to get a previous validation hash we should raise an
+            # Exception immediately. Otherwise new validation hash will not be created
+            # and users will not receive the desired e-mail vaidation link.
+            raise Exception("Validation has already been sent")
+        except:
+            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."))
+        return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
+
+        
+

 def validate_email(request, user, code):
     user = get_object_or_404(User, id=user)
 
     if (ValidationHash.objects.validate(code, user, 'email', [user.email])):
         user.email_isvalid = True
         user.save()
 def validate_email(request, user, code):
     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."))
+        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)
 


@@ -327,6 +357,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):


@@ -338,19 +369,6 @@ def remove_external_provider(request, id):
     association.delete()
     return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': association.user.id}))
 
     association.delete()
     return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': association.user.id}))
 

-def newquestion_signin_action(user):
-    question = Question.objects.filter(author=user).order_by('-added_at')[0]
-    return question.get_absolute_url()
-
-def newanswer_signin_action(user):
-    answer = Answer.objects.filter(author=user).order_by('-added_at')[0]
-    return answer.get_absolute_url()
-
-POST_SIGNIN_ACTIONS = {
-'newquestion': newquestion_signin_action,
-'newanswer': newanswer_signin_action,
-}
-

 def login_and_forward(request, user, forward=None, message=None):
     if user.is_suspended():
         return forward_suspended_user(request, user)
 def login_and_forward(request, user, forward=None, message=None):
     if user.is_suspended():
         return forward_suspended_user(request, user)


@@ -358,35 +376,29 @@ 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)
 

-    temp_data = request.session.pop('temp_node_data', None)
-    if temp_data:
-        request.POST = temp_data
-        node_type = request.session.pop('temp_node_type')
+    if message is None:
+        message = _("Welcome back %s, you are now logged in") % user.username

 
 

-        if node_type == "question":
-            from forum.views.writers import ask
-            return ask(request)
-        elif node_type == "answer":
-            from forum.views.writers import answer
-            return answer(request, request.session.pop('temp_question_id'))
+    request.user.message_set.create(message=message)

 
     if not forward:
 
     if not forward:

-        signin_action = request.session.get('on_signin_action', None)
-        if not signin_action:
-            forward = request.session.get('on_signin_url', None)
-
-            if not forward:
-                forward = reverse('index')
+        forward = request.session.get('on_signin_url', reverse('index'))
+        
+    pending_data = request.session.get('pending_submission_data', 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)):
+            del request.session['pending_submission_data']
+        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" % (
+                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"))
+            ))

         else:
         else:

-            try:
-                forward = POST_SIGNIN_ACTIONS[signin_action](user)
-            except:
-                forward = reverse('index')
+            return manage_pending_data(request, _('save'), forward)

 
 

-    if message is None:
-        message = _("Welcome back %s, you are now logged in") % user.username
-
-    request.user.message_set.create(message=message)

     return HttpResponseRedirect(forward)
 
 def forward_suspended_user(request, user, show_private_msg=True):
     return HttpResponseRedirect(forward)
 
 def forward_suspended_user(request, user, show_private_msg=True):


@@ -403,7 +415,7 @@ def forward_suspended_user(request, user, show_private_msg=True):
     request.user.message_set.create(message)
     return HttpResponseRedirect(reverse('index'))
 
     request.user.message_set.create(message)
     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'))