X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/2444d6ffd7995be782615589fb1d5aef2c8277ce..745f67c37acdb9574c5297004adde2b9a7da5fdb:/forum/views/auth.py diff --git a/forum/views/auth.py b/forum/views/auth.py index ad4785d..f17d6d2 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -27,15 +27,22 @@ from forum.authentication.base import InvalidAuthentication from forum.authentication import AUTH_PROVIDERS from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer -from forum.actions import UserJoinsAction +from forum.actions import UserJoinsAction, EmailValidationAction +from forum.models.action import ActionRepute + + +from forum.settings import REP_GAIN_BY_EMAIL_VALIDATION +from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR 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') + referer = request.META.get('HTTP_REFERER', '/') + + # If the referer is equal to the sign up page, e. g. if the previous login attempt was not successful we do not + # change the sign in URL. The user should go to the same page. + if not referer.replace(settings.APP_URL, '') == reverse('auth_signin'): + request.session[ON_SIGNIN_SESSION_ATTR] = referer - all_providers = [provider.context for provider in AUTH_PROVIDERS.values()] + all_providers = [provider.context for provider in AUTH_PROVIDERS.values() if provider.context] sort = lambda c1, c2: c1.weight - c2.weight can_show = lambda c: not request.user.is_authenticated() or c.show_to_logged_in_user @@ -141,7 +148,7 @@ def process_provider_signin(request, provider): assoc = AuthKeyUserAssociation.objects.get(key=assoc_key) user_ = assoc.user return login_and_forward(request, user_) - except: + except AuthKeyUserAssociation.DoesNotExist: request.session['assoc_key'] = assoc_key request.session['auth_provider'] = provider return HttpResponseRedirect(reverse('auth_external_register')) @@ -220,7 +227,7 @@ def external_register(request): return render_to_response('auth/complete.html', { 'form1': form1, 'email_feeds_form': email_feeds_form, - 'provider':mark_safe(provider_context.human_name), + 'provider':provider_context and mark_safe(provider_context.human_name) or _('unknown'), 'login_type':provider_context.id, 'gravatar_faq_url':reverse('faq') + '#gravatar', }, context_instance=RequestContext(request)) @@ -277,16 +284,15 @@ def send_validation_email(request): if not request.user.is_authenticated(): return HttpResponseUnauthorized(request) else: + # We check if there are some old validation hashes. If there are -- we delete them. 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]) + pass + + # 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.")) @@ -298,9 +304,14 @@ 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, reverse('index'), _("Thank you, your email is now validated.")) + EmailValidationAction(user=user, ip=request.META['REMOTE_ADDR']).save() + if REP_GAIN_BY_EMAIL_VALIDATION > 0: + message = _("Thank you, your email is now validated and you've got %d points." % int(REP_GAIN_BY_EMAIL_VALIDATION)) + + else: + message = _("Thank you, your email is now validated.") + + return login_and_forward(request, user, reverse('index'), message) else: return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request)) @@ -382,14 +393,14 @@ def login_and_forward(request, user, forward=None, message=None): request.user.message_set.create(message=message) if not forward: - forward = request.session.get('on_signin_url', reverse('index')) - - pending_data = request.session.get('pending_submission_data', None) + forward = request.session.get(ON_SIGNIN_SESSION_ATTR, reverse('index')) + + pending_data = request.session.get(PENDING_SUBMISSION_SESSION_ATTR, 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'] + 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" % ( html.hyperlink(reverse('manage_pending_data', kwargs={'action': _('save')}), _("save it")),