Profile has been updated successfully
') messages.add_message(request, messages.SUCCESS, msg) except ValueError, ve: messages.add_message(request, messages.ERROR, ve) @@ -275,6 +284,7 @@ def edit_profile(request, template_name='im/profile.html', extra_context={}): context_instance = get_context(request, extra_context)) +@require_http_methods(["GET", "POST"]) def signup(request, template_name='im/signup.html', on_success='im/signup_complete.html', extra_context={}, backend=None): """ Allows a user to create a local account. @@ -346,6 +356,7 @@ def signup(request, template_name='im/signup.html', on_success='im/signup_comple message = e.message messages.add_message(request, status, message) except BaseException, e: + logger.exception(e) status = messages.ERROR message = _('Something went wrong.') messages.add_message(request, status, message) @@ -355,6 +366,7 @@ def signup(request, template_name='im/signup.html', on_success='im/signup_comple provider = provider, context_instance=get_context(request, extra_context)) +@require_http_methods(["GET", "POST"]) @login_required @signed_terms_required def feedback(request, template_name='im/feedback.html', email_template_name='im/feedback_mail.txt', extra_context={}): @@ -407,15 +419,18 @@ def feedback(request, template_name='im/feedback.html', email_template_name='im/ feedback_form = form, context_instance = get_context(request, extra_context)) +@require_http_methods(["GET", "POST"]) def logout(request, template='registration/logged_out.html', extra_context={}): """ Wraps `django.contrib.auth.logout` and delete the cookie. """ - msg = 'Cookie deleted for %s' % (request.user.email) - auth_logout(request) response = HttpResponse() - response.delete_cookie(COOKIE_NAME, path='/', domain=COOKIE_DOMAIN) - logger._log(LOGGING_LEVEL, msg, []) + if request.user.is_authenticated(): + email = request.user.email + auth_logout(request) + response.delete_cookie(COOKIE_NAME, path='/', domain=COOKIE_DOMAIN) + msg = 'Cookie deleted for %s' % email + logger._log(LOGGING_LEVEL, msg, []) next = request.GET.get('next') if next: response['Location'] = next @@ -425,11 +440,12 @@ def logout(request, template='registration/logged_out.html', extra_context={}): response['Location'] = LOGOUT_NEXT response.status_code = 301 return response - messages.add_message(request, messages.SUCCESS, _('You have successfully logged out.')) + messages.add_message(request, messages.SUCCESS, _('You have successfully logged out.
')) context = get_context(request, extra_context) response.write(render_to_string(template, context_instance=context)) return response +@require_http_methods(["GET", "POST"]) @transaction.commit_manually def activate(request, greeting_email_template_name='im/welcome_email.txt', helpdesk_email_template_name='im/helpdesk_notification.txt'): """ @@ -452,44 +468,24 @@ def activate(request, greeting_email_template_name='im/welcome_email.txt', helpd return index(request) try: - local_user = AstakosUser.objects.get(~Q(id = user.id), email=user.email, is_active=True) - except AstakosUser.DoesNotExist: - try: - activate_func(user, greeting_email_template_name, helpdesk_email_template_name, verify_email=True) - response = prepare_response(request, user, next, renew=True) - transaction.commit() - return response - except SendMailError, e: - message = e.message - messages.add_message(request, messages.ERROR, message) - transaction.rollback() - return index(request) - except BaseException, e: - status = messages.ERROR - message = _('Something went wrong.') - messages.add_message(request, messages.ERROR, message) - logger.exception(e) - transaction.rollback() - return index(request) - else: - try: - user = switch_account_to_shibboleth(user, local_user, greeting_email_template_name) - response = prepare_response(request, user, next, renew=True) - transaction.commit() - return response - except SendMailError, e: - message = e.message - messages.add_message(request, messages.ERROR, message) - transaction.rollback() - return index(request) - except BaseException, e: - status = messages.ERROR - message = _('Something went wrong.') - messages.add_message(request, messages.ERROR, message) - logger.exception(e) - transaction.rollback() - return index(request) + activate_func(user, greeting_email_template_name, helpdesk_email_template_name, verify_email=True) + response = prepare_response(request, user, next, renew=True) + transaction.commit() + return response + except SendMailError, e: + message = e.message + messages.add_message(request, messages.ERROR, message) + transaction.rollback() + return index(request) + except BaseException, e: + status = messages.ERROR + message = _('Something went wrong.') + messages.add_message(request, messages.ERROR, message) + logger.exception(e) + transaction.rollback() + return index(request) +@require_http_methods(["GET", "POST"]) def approval_terms(request, term_id=None, template_name='im/approval_terms.html', extra_context={}): term = None terms = None @@ -530,12 +526,16 @@ def approval_terms(request, term_id=None, template_name='im/approval_terms.html' approval_terms_form = form, context_instance = get_context(request, extra_context)) +@require_http_methods(["GET", "POST"]) @signed_terms_required def change_password(request): return password_change(request, post_change_redirect=reverse('astakos.im.views.edit_profile'), password_change_form=ExtendedPasswordChangeForm) +@require_http_methods(["GET", "POST"]) +@login_required +@signed_terms_required @transaction.commit_manually def change_email(request, activation_key=None, email_template_name='registration/email_change_email.txt', @@ -583,4 +583,4 @@ def change_email(request, activation_key=None, return render_response(form_template_name, form = form, context_instance = get_context(request, - extra_context)) \ No newline at end of file + extra_context))