From f6082a21b43fb71d065e0b91f8342a3bd6348e9d Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Thu, 11 Jun 2015 12:21:48 +0200
Subject: [PATCH] registration: use messages framework to display errors
 (#7533)

---
 src/authentic2/registration_backend/urls.py                   |  6 ------
 src/authentic2/registration_backend/views.py                  | 10 ++++++----
 src/authentic2/templates/registration/activation_expired.html | 11 -----------
 src/authentic2/templates/registration/activation_failed.html  | 11 -----------
 4 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 src/authentic2/templates/registration/activation_expired.html
 delete mode 100644 src/authentic2/templates/registration/activation_failed.html

diff --git a/src/authentic2/registration_backend/urls.py b/src/authentic2/registration_backend/urls.py
index d29db7f..ab12005 100644
--- a/src/authentic2/registration_backend/urls.py
+++ b/src/authentic2/registration_backend/urls.py
@@ -7,12 +7,6 @@ from django.contrib.auth.decorators import login_required
 from .views import RegistrationView, registration_completion, DeleteView
 
 urlpatterns = patterns('',
-    url(r'^activate/expired/$',
-        TemplateView.as_view(template_name='registration/activation_expired.html'),
-        name='registration_activation_expired'),
-    url(r'^activate/failed/$',
-        TemplateView.as_view(template_name='registration/activation_failed.html'),
-        name='registration_activation_failed'),
     url(r'^activate/(?P<registration_token>[\w:-]+)/$',
 	registration_completion, name='registration_activate'),
     url(r'^register/$',
diff --git a/src/authentic2/registration_backend/views.py b/src/authentic2/registration_backend/views.py
index e0a8e0f..00b9167 100644
--- a/src/authentic2/registration_backend/views.py
+++ b/src/authentic2/registration_backend/views.py
@@ -26,9 +26,11 @@ def valid_token(method):
             request.token = signing.loads(kwargs['registration_token'],
                                                 max_age=settings.ACCOUNT_ACTIVATION_DAYS*3600*24)
         except signing.SignatureExpired:
-            return redirect(request, 'registration_activation_expired')
+            messages.warning(request, _('Your activation key is expired'))
+            return redirect(request, 'registration_register')
         except signing.BadSignature:
-            return redirect(request, 'registration_activation_failed')
+            messages.warning(request, _('Activation failed'))
+            return redirect(request, 'registration_register')
         return method(request, *args, **kwargs)
     return f
 
@@ -56,7 +58,7 @@ class RegistrationCompletionView(CreateView):
 
     def dispatch(self, request, *args, **kwargs):
         self.token = request.token
-        self.email = request.token['email'] 
+        self.email = request.token['email']
         self.users = User.objects.filter(email__iexact=self.email) \
             .order_by('date_joined')
         self.email_is_unique = app_settings.A2_EMAIL_IS_UNIQUE \
@@ -95,7 +97,7 @@ class RegistrationCompletionView(CreateView):
                     validators=[validators.UsernameValidator()])
             form_class = type('RegistrationForm', (form_class,), {'username': field})
         return form_class
-    
+
 
     def get_form_kwargs(self, **kwargs):
         '''Initialize mail from token'''
diff --git a/src/authentic2/templates/registration/activation_expired.html b/src/authentic2/templates/registration/activation_expired.html
deleted file mode 100644
index fd94b79..0000000
--- a/src/authentic2/templates/registration/activation_expired.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "authentic2/base-page.html" %}
-{% load i18n %}
-
-{% block title %}
-{% trans "Account activation expired" %}
-{% endblock %}
-
-{% block content %}
-<h2>{% trans "Account activation" %}</h2>
-<p>{% trans "Your activation key is expired" %}</p>
-{% endblock %}
diff --git a/src/authentic2/templates/registration/activation_failed.html b/src/authentic2/templates/registration/activation_failed.html
deleted file mode 100644
index 0f26de2..0000000
--- a/src/authentic2/templates/registration/activation_failed.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "authentic2/base-page.html" %}
-{% load i18n %}
-
-{% block title %}
-{% trans "Account activation failed" %}
-{% endblock %}
-
-{% block content %}
-<h2>{% trans "Account activation" %}</h2>
-<p>{% trans "Activation failed" %}</p>
-{% endblock %}
-- 
2.1.4