X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/fde7cb966d7d3580cdd016d41e157278e8a00bf9..50637480556844227df0b01d911302110eed70a3:/forum/views/auth.py?ds=sidebyside

diff --git a/forum/views/auth.py b/forum/views/auth.py
index c9f3111..3b78eed 100644
--- 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
@@ -155,7 +157,7 @@ def external_register(request):
         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()
 
@@ -195,17 +197,18 @@ 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', {})
 
         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
@@ -214,6 +217,7 @@ def external_register(request):
         'next': '/',
         'username': username,
         'email': email,
+        'real_name': real_name,
         })
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
@@ -287,7 +291,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', '/'))
 
@@ -400,7 +409,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")