from functools import wraps
from django.core.mail import send_mail
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseBadRequest
from django.shortcuts import redirect
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
from django.contrib.auth.decorators import login_required
from django.contrib import messages
from django.db import transaction
-from django.contrib.auth import logout as auth_logout
from django.utils.http import urlencode
from django.http import HttpResponseRedirect, HttpResponseBadRequest
from django.db.utils import IntegrityError
from django.contrib.auth.views import password_change
+from django.core.exceptions import ValidationError
from astakos.im.models import AstakosUser, Invitation, ApprovalTerms
from astakos.im.activation_backends import get_backend, SimpleBackend
-from astakos.im.util import get_context, prepare_response, set_cookie, has_signed_terms
+from astakos.im.util import get_context, prepare_response, set_cookie, get_query
from astakos.im.forms import *
-from astakos.im.functions import send_greeting, send_feedback, SendMailError
+from astakos.im.functions import send_greeting, send_feedback, SendMailError, \
+ invite as invite_func, logout as auth_logout
from astakos.im.settings import DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, COOKIE_NAME, COOKIE_DOMAIN, IM_MODULES, SITENAME, LOGOUT_NEXT
-from astakos.im.functions import invite as invite_func
logger = logging.getLogger(__name__)
"""
@wraps(func)
def wrapper(request, *args, **kwargs):
- if request.user.is_authenticated() and not has_signed_terms(request.user):
+ if request.user.is_authenticated() and not request.user.signed_terms():
params = urlencode({'next': request.build_absolute_uri(),
'show_form':''})
terms_uri = reverse('latest_terms') + '?' + params
if request.user.is_authenticated():
return HttpResponseRedirect(reverse('astakos.im.views.edit_profile'))
return render_response(template_name,
- login_form = LoginForm(),
+ login_form = LoginForm(request=request),
context_instance = get_context(request, extra_context))
@login_required
next = request.POST.get('next')
if next:
return redirect(next)
- msg = _('Profile has been updated successfully')
+ msg = _('<p>Profile has been updated successfully</p>')
messages.add_message(request, messages.SUCCESS, msg)
except ValueError, ve:
messages.add_message(request, messages.ERROR, ve)
if request.user.is_authenticated():
return HttpResponseRedirect(reverse('astakos.im.views.index'))
- query_dict = request.__getattribute__(request.method)
- provider = query_dict.get('provider', 'local')
+ provider = get_query(request).get('provider', 'local')
try:
if not backend:
backend = get_backend(request)
form = backend.get_signup_form(provider)
- except (Invitation.DoesNotExist, ValueError), e:
+ except Exception, e:
form = SimpleBackend(request).get_signup_form(provider)
messages.add_message(request, messages.ERROR, e)
if request.method == 'POST':
status = messages.SUCCESS
message = result.message
user.save()
+ if 'additional_email' in form.cleaned_data:
+ additional_email = form.cleaned_data['additional_email']
+ if additional_email != user.email:
+ user.additionalmail_set.create(email=additional_email)
if user and user.is_active:
next = request.POST.get('next', '')
return prepare_response(request, user, next=next)
status = messages.ERROR
message = _('Something went wrong.')
messages.add_message(request, status, message)
+ logger.exception(e)
return render_response(template_name,
signup_form = form,
+ provider = provider,
context_instance=get_context(request, extra_context))
@login_required
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, _('<p>You have successfully logged out.</p>'))
context = get_context(request, extra_context)
response.write(render_to_string(template, context_instance=context))
return response
@transaction.commit_manually
-def activate(request, email_template_name='im/welcome_email.txt', on_failure=''):
+def activate(request, email_template_name='im/welcome_email.txt', on_failure='im/signup.html'):
"""
Activates the user identified by the ``auth`` request parameter, sends a welcome email
and renews the user token.
user = AstakosUser.objects.get(auth_token=token)
except AstakosUser.DoesNotExist:
return HttpResponseBadRequest(_('No such user'))
-
- user.is_active = True
- user.email_verified = True
- user.save()
+
+ try:
+ local_user = AstakosUser.objects.get(email=user.email, is_active=True)
+ except AstakosUser.DoesNotExist:
+ user.is_active = True
+ user.email_verified = True
+ try:
+ user.save()
+ except ValidationError, e:
+ return HttpResponseBadRequest(e)
+ else:
+ # switch the existing account to shibboleth one
+ local_user.provider = 'shibboleth'
+ local_user.set_unusable_password()
+ local_user.third_party_identifier = user.third_party_identifier
+ try:
+ local_user.save()
+ except ValidationError, e:
+ return HttpResponseBadRequest(e)
+ user.delete()
+ user = local_user
+
try:
send_greeting(user, email_template_name)
response = prepare_response(request, user, next, renew=True)
transaction.commit()
return response
- except SendEmailError, e:
+ except SendMailError, e:
message = e.message
messages.add_message(request, messages.ERROR, message)
transaction.rollback()
- return signup(request, on_failure='im/signup.html')
+ return render_response(on_failure)
except BaseException, e:
status = messages.ERROR
message = _('Something went wrong.')
+ messages.add_message(request, messages.ERROR, message)
logger.exception(e)
transaction.rollback()
- return signup(request, on_failure='im/signup.html')
+ return signup(request, on_failure)
def approval_terms(request, term_id=None, template_name='im/approval_terms.html', extra_context={}):
term = None
return HttpResponseRedirect(next)
else:
form = None
- if request.user.is_authenticated() and not has_signed_terms(request.user):
+ if request.user.is_authenticated() and not request.user.signed_terms():
form = SignApprovalTermsForm(instance=request.user)
return render_response(template_name,
terms = terms,
@signed_terms_required
def change_password(request):
return password_change(request, post_change_redirect=reverse('astakos.im.views.edit_profile'))
+
+@transaction.commit_manually
+def change_email(request, activation_key=None,
+ email_template_name='registration/email_change_email.txt',
+ form_template_name='registration/email_change_form.html',
+ confirm_template_name='registration/email_change_done.html',
+ extra_context={}):
+ if activation_key:
+ try:
+ user = EmailChange.objects.change_email(activation_key)
+ if request.user.is_authenticated() and request.user == user:
+ msg = _('Email changed successfully.')
+ messages.add_message(request, messages.SUCCESS, msg)
+ auth_logout(request)
+ response = prepare_response(request, user)
+ transaction.commit()
+ return response
+ except ValueError, e:
+ messages.add_message(request, messages.ERROR, e)
+ return render_response(confirm_template_name,
+ modified_user = user if 'user' in locals() else None,
+ context_instance = get_context(request,
+ extra_context))
+
+ if not request.user.is_authenticated():
+ path = quote(request.get_full_path())
+ url = request.build_absolute_uri(reverse('astakos.im.views.index'))
+ return HttpResponseRedirect(url + '?next=' + path)
+ form = EmailChangeForm(request.POST or None)
+ if request.method == 'POST' and form.is_valid():
+ try:
+ ec = form.save(email_template_name, request)
+ except SendMailError, e:
+ status = messages.ERROR
+ msg = e
+ transaction.rollback()
+ except IntegrityError, e:
+ status = messages.ERROR
+ msg = _('There is already a pending change email request.')
+ else:
+ status = messages.SUCCESS
+ msg = _('Change email request has been registered succefully.\
+ You are going to receive a verification email in the new address.')
+ transaction.commit()
+ messages.add_message(request, status, msg)
+ return render_response(form_template_name,
+ form = form,
+ context_instance = get_context(request,
+ extra_context))
projects / astakos / blobdiff