+# -*- 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 forum.models import User
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.http import urlquote_plus
-from forum.views.decorators import login_required
-from forum.modules import decorate
+from django.utils.encoding import smart_unicode
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, 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.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):
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()
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', '')
+ real_name = user_data.get('real_name', '')
if email:
request.session['auth_validated_email'] = email
'next': '/',
'username': username,
'email': email,
+ 'real_name': real_name,
})
provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
# 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', '/'))
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))
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") % user.username
+ message = _("Welcome back %s, you are now logged in") % smart_unicode(user.username)
request.user.message_set.create(message=message)
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")
projects / osqa.git / blobdiff