fix openid login callback, change the forward URL after authentication if there are...

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

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 1b18d6c08ee459315430155677af0ed7d617da87..92aa894c817ad870f5765debd30dfad061026dca 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -2,6 +2,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
@@ -14,6 +16,7 @@ from django.contrib.auth import login, logout
 
 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
@@ -194,12 +197,12 @@ def external_register(request):
 
         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':
-            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'])
 
+
         if not user_data:
             user_data = request.session.get('auth_consumer_data', {})
 
@@ -286,7 +289,12 @@ 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])
 
-        send_template_email([request.user], "auth/mail_validation.html", {'validation_code': hash})
+        additional_get_params = urllib.urlencode(request.GET)
+        send_template_email([request.user], "auth/mail_validation.html", {
+            'validation_code': hash,
+            'additional_get_params' : additional_get_params
+        })
+
         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', '/'))
 
@@ -296,8 +304,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.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))
@@ -400,7 +407,17 @@ def login_and_forward(request, user, forward=None, message=None):
         else:
             return manage_pending_data(request, _('save'), forward)
 
-    return HttpResponseRedirect(forward)
+    additional_get_params = urllib.urlencode(request.GET)
+
+    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")