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, \
- 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
+ invite as invite_func, logout as auth_logout, activate as activate_func, switch_account_to_shibboleth
+from astakos.im.settings import DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, COOKIE_NAME, COOKIE_DOMAIN, IM_MODULES, SITENAME, LOGOUT_NEXT, LOGGING_LEVEL
logger = logging.getLogger(__name__)
"""
Allows a user to create a local account.
- In case of GET request renders a form for providing the user information.
+ In case of GET request renders a form for entering the user information.
In case of POST handles the signup.
The user activation will be delegated to the backend specified by the ``backend`` keyword argument
if settings.ASTAKOS_INVITATIONS_ENABLED is True or ``astakos.im.activation_backends.SimpleBackend`` if not
(see activation_backends);
- Upon successful user creation if ``next`` url parameter is present the user is redirected there
+ Upon successful user creation, if ``next`` url parameter is present the user is redirected there
otherwise renders the same page with a success message.
On unsuccessful creation, renders ``template_name`` with an error message.
A custom template to render. This is optional;
if not specified, this will default to ``im/signup.html``.
-
``on_success``
A custom template to render in case of success. This is optional;
if not specified, this will default to ``im/signup_complete.html``.
im/signup_complete.html or ``on_success`` keyword argument.
"""
if request.user.is_authenticated():
- return HttpResponseRedirect(reverse('astakos.im.views.index'))
+ return HttpResponseRedirect(reverse('astakos.im.views.edit_profile'))
provider = get_query(request).get('provider', 'local')
try:
additional_email = form.cleaned_data['additional_email']
if additional_email != user.email:
user.additionalmail_set.create(email=additional_email)
+ msg = 'Additional email: %s saved for user %s.' % (additional_email, user.email)
+ logger._log(LOGGING_LEVEL, msg, [])
if user and user.is_active:
next = request.POST.get('next', '')
return prepare_response(request, user, next=next)
"""
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, [])
next = request.GET.get('next')
if next:
response['Location'] = next
return response
@transaction.commit_manually
-def activate(request, email_template_name='im/welcome_email.txt', on_failure='im/signup.html'):
+def activate(request, email_template_name='im/welcome_email.txt', helpdesk_email_template_name='im/helpdesk_notification.txt'):
"""
Activates the user identified by the ``auth`` request parameter, sends a welcome email
and renews the user token.
return HttpResponseBadRequest(_('No such user'))
if user.is_active:
- message = 'Account already active.'
+ message = _('Account already active.')
messages.add_message(request, messages.ERROR, message)
- return render_response(on_failure)
+ return index(request)
try:
local_user = AstakosUser.objects.get(~Q(id = user.id), 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)
+ activate_func(user, 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:
- # switch the existing account to shibboleth one
- if user.provider == 'shibboleth':
- 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 SendMailError, e:
- message = e.message
- messages.add_message(request, messages.ERROR, message)
- transaction.rollback()
- 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)
+ try:
+ user = switch_account_to_shibboleth(user, local_user)
+ send_greeting(user, 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)
def approval_terms(request, term_id=None, template_name='im/approval_terms.html', extra_context={}):
term = None
projects / astakos / blobdiff