Merge branch 'master' of https://code.grnet.gr/git/astakos

[astakos] / snf-astakos-app / astakos / im / views.py

diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py
index e538a22..7a1fe37 100644 (file)
--- a/snf-astakos-app/astakos/im/views.py
+++ b/snf-astakos-app/astakos/im/views.py
@@ -59,7 +59,7 @@ from astakos.im.activation_backends import get_backend, SimpleBackend
 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, send_helpdesk_notification
+    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__)
@@ -262,7 +262,7 @@ def edit_profile(request, template_name='im/profile.html', extra_context={}):
                 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)
@@ -425,14 +425,13 @@ 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, _('<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='im/signup.html', 
-                helpdesk_email_template_name='im/helpdesk_notification.txt'):
+def activate(request, greeting_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.
@@ -448,53 +447,48 @@ def activate(request, email_template_name='im/welcome_email.txt', on_failure='im
         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)
     
-    notify_helpdesk = False
     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)
-        notify_helpdesk = True
+            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:
-        # 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:
-        if notify_helpdesk:
-            send_helpdesk_notification(user, helpdesk_email_template_name)
-        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, 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)
 
 def approval_terms(request, term_id=None, template_name='im/approval_terms.html', extra_context={}):
     term = None
@@ -538,7 +532,9 @@ def approval_terms(request, term_id=None, template_name='im/approval_terms.html'
 
 @signed_terms_required
 def change_password(request):
-    return password_change(request, post_change_redirect=reverse('astakos.im.views.edit_profile'))
+    return password_change(request,
+                            post_change_redirect=reverse('astakos.im.views.edit_profile'),
+                            password_change_form=ExtendedPasswordChangeForm)
 
 @transaction.commit_manually
 def change_email(request, activation_key=None,
@@ -587,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))