Renvoi d'email de confirmation

assets/js/forgot-password.js → assets/js/form-email-username.js

@@ -1,5 +1,5 @@
 /**
- * Display the form for recorvering a password.
+ * Used by recovering password and send again validation email functionality.
  */
 (function($, undefined){
     "use strict";
@@ -8,7 +8,7 @@
     else
         $("#form-email").removeClass("hidden");
 
-    $("[data-forgot-password-button=email]").on("click", function(e) {
+    $("[data-email-button=email]").on("click", function(e) {
         $("#form-email").toggleClass("hidden");
         $("#form-username").addClass("hidden");
 
@@ -22,7 +22,7 @@
     else
         $("#form-username").removeClass("hidden");
 
-    $("[data-forgot-password-button=username]").on("click", function(e) {
+    $("[data-username-button=username]").on("click", function(e) {
         $("#form-username").toggleClass("hidden");
         $("#form-email").addClass("hidden");
 

templates/member/forgot_password/index.html

@@ -42,8 +42,8 @@
 
             <p>Comment souhaitez vous retrouvez votre mot de passe ?
                 <ul>
-                    <li><a href="#" data-forgot-password-button="email">En saisissant votre adresse de courriel</a></li>
-                    <li><a href="#" data-forgot-password-button="username">En saisissant votre nom d'utilisateur</a></li>
+                    <li><a href="#" data-email-button="email">En saisissant votre adresse de courriel</a></li>
+                    <li><a href="#" data-username-button="username">En saisissant votre nom d'utilisateur</a></li>
                 </ul>
             </p>
         {% endblocktrans %}

templates/member/login.html

@@ -40,6 +40,15 @@
                 <div class="content-col-2">
                     <h2>{% trans "Connexion classique" %}</h2>
                     {% crispy form %}
+                    <p>
+                        <a href="{% url "zds.member.views.forgot_password" %}" class="form-sub-link">
+                            Mot de passe oublié ?
+                        </a>
+                        <br />
+                        <a href="{% url "send-validation-email" %}" class="form-sub-link">
+                            Vous n'avez pas reçu le mail d'activation ?
+                        </a>
+                    </p>
                 </div>
                 <div class="content-col-2">
                     <h2>{% trans "Connexion via réseaux sociaux" %}</h2>

templates/member/register/send_validation_email.html

@@ -0,0 +1,49 @@
+{% extends "member/base.html" %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+
+{% block title %}
+    {% trans "Renvois de l'email de confirmation" %}
+{% endblock %}
+
+
+
+{% block headline %}
+    {% trans "Renvois de l'email de confirmation" %}
+{% endblock %}
+
+
+
+{% block breadcrumb %}
+    <li>{% trans "Envois d'un email de confirmation" %}</li>
+{% endblock %}
+
+
+{% block content %}
+
+    {% if not user.is_authenticated %}
+        {% if error %}
+            {{ error }}
+        {% endif %}
+
+        {% blocktrans %}
+            <p>
+                Vous n'avez pas reçu le mail de confirmation ? nous pouvons vous le renvoyer, nous avons
+                besoin des informations suivantes : saisissez votre nom d'utilisateur ou votre adresse de courriel
+                dans les champs ci-dessous.
+            </p>
+
+            <p>Comment souhaitez vous retrouvez votre mot de passe ?
+                <ul>
+                    <li><a href="#" data-email-button="email">En saisissant votre adresse de courriel</a></li>
+                    <li><a href="#" data-username-button="username">En saisissant votre nom d'utilisateur</a></li>
+                </ul>
+            </p>
+        {% endblocktrans %}
+
+        {% crispy form %}
+    {% else %}
+        <p>{% trans "Vous êtes connecté" %}</p>
+    {% endif %}
+{% endblock %}

templates/member/register/send_validation_email_success.html

@@ -0,0 +1,27 @@
+{% extends "member/register/base.html" %}
+{% load i18n %}
+
+
+{% block title %}
+    {% trans "Renvois de l'email de confirmation" %}
+{% endblock %}
+
+
+
+{% block headline %}
+    {% trans "Renvois de l'email de confirmation" %}
+{% endblock %}
+
+
+
+{% block breadcrumb %}
+    <li>{% trans "Renvois de l'email de confirmation" %}</li>
+{% endblock %}
+
+
+
+{% block content %}
+    <p>
+        {% trans "Vous allez recevoir un courriel contenant le lien d'activation. Veuillez cliquer sur celui-ci avant toute tentative de connexion" %}.
+    </p>
+{% endblock %}

zds/member/forms.py

@@ -51,7 +51,7 @@ def __init__(self, profile, *args, **kwargs):
 
 class LoginForm(forms.Form):
     """
-    The login form, including the "remember me" checkbox and the "password forget" link.
+    The login form, including the "remember me" checkbox.
     """
     username = forms.CharField(
         label=_(u"Nom d'utilisateur"),
@@ -91,9 +91,7 @@ def __init__(self, next=None, *args, **kwargs):
             HTML('{% csrf_token %}'),
             ButtonHolder(
                 StrictButton(_(u'Se connecter'), type='submit'),
-            ),
-            HTML(u'<a href="{% url "zds.member.views.forgot_password" %}" '
-                 u'class="form-sub-link">Mot de passe oublié ?</a>'),
+            )
         )
 
 
@@ -466,8 +464,7 @@ def clean(self):
         return cleaned_data
 
 
-# TODO Asks for a new password --> Requires a better name
-class ForgotPasswordForm(forms.Form):
+class UsernameAndEmailForm(forms.Form):
     username = forms.CharField(
         label=_(u'Nom d\'utilisateur'),
         required=False
@@ -479,7 +476,7 @@ class ForgotPasswordForm(forms.Form):
     )
 
     def __init__(self, *args, **kwargs):
-        super(ForgotPasswordForm, self).__init__(*args, **kwargs)
+        super(UsernameAndEmailForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
         self.helper.form_class = 'content-wrapper'
         self.helper.form_method = 'post'
@@ -502,7 +499,7 @@ def __init__(self, *args, **kwargs):
         )
 
     def clean(self):
-        cleaned_data = super(ForgotPasswordForm, self).clean()
+        cleaned_data = super(UsernameAndEmailForm, self).clean()
 
         # Clean data
         username = cleaned_data.get('username')

zds/member/tests/tests_forms.py

@@ -4,8 +4,8 @@
 from zds.member.factories import ProfileFactory, NonAsciiProfileFactory
 from zds.member.forms import LoginForm, RegisterForm, \
     MiniProfileForm, ProfileForm, ChangeUserForm, \
-    ChangePasswordForm, ForgotPasswordForm, NewPasswordForm, \
-    KarmaForm
+    ChangePasswordForm, NewPasswordForm, \
+    KarmaForm, UsernameAndEmailForm
 
 stringof77chars = "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789-----"
 stringof129chars = u'http://www.01234567890123456789123456789' \
@@ -440,63 +440,63 @@ def test_valid_forgot_password_form(self):
             'username': self.user1.user.username,
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_non_valid_non_ascii_forgot_password_form(self):
         data = {
             'username': self.userNonAscii.user.username,
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_non_valid_non_ascii_email_forgot_password_form(self):
         data = {
             'username': '',
             'email': self.userNonAscii.user.email
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_valid_email_forgot_password_form(self):
         data = {
             'email': self.user1.user.email,
             'username': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_empty_name_forgot_password_form(self):
         data = {
             'username': '',
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
     def test_full_forgot_password_form(self):
         data = {
             'username': 'John Doe',
             'email': 'john.doe@gmail.com'
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
     def test_unknow_username_forgot_password_form(self):
         data = {
             'username': 'John Doe',
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
     def test_unknow_email_forgot_password_form(self):
         data = {
             'email': 'john.doe@gmail.com',
             'username': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
 

zds/member/tests/tests_views.py

@@ -427,7 +427,7 @@ def test_unregister(self):
     def test_forgot_password(self):
         """To test nominal scenario of a lost password."""
 
-        # Empty the test outbox
+        # empty the test outbox
         mail.outbox = []
 
         result = self.client.post(
@@ -443,7 +443,7 @@ def test_forgot_password(self):
         # check email has been sent
         self.assertEquals(len(mail.outbox), 1)
 
-        # clic on the link which has been sent in mail
+        # click on the link which has been sent in mail
         user = User.objects.get(username=self.mas.user.username)
 
         token = TokenForgotPassword.objects.get(user=user)
@@ -453,6 +453,38 @@ def test_forgot_password(self):
 
         self.assertEqual(result.status_code, 200)
 
+    def test_send_email_validation(self):
+        """To test nominal scenario of a email validation."""
+
+        # create a non activate user
+        profile = ProfileFactory()
+        profile.is_active = 0
+        profile.save()
+
+        # empty the test outbox
+        mail.outbox = []
+
+        result = self.client.post(
+            reverse('send-validation-email'),
+            {
+                'username': profile.user.username,
+                'email': '',
+            },
+            follow=False)
+
+        self.assertEqual(result.status_code, 200)
+
+        # check email has been sent
+        self.assertEquals(len(mail.outbox), 1)
+
+        # click on the link which has been sent in mail
+        token = TokenRegister.objects.get(user=profile.user)
+        result = self.client.get(
+            settings.ZDS_APP['site']['url'] + token.get_absolute_url(),
+            follow=False)
+
+        self.assertEqual(result.status_code, 200)
+
     def test_sanctions(self):
         """
         Test various sanctions.

zds/member/urls.py

@@ -3,7 +3,7 @@
 from django.conf.urls import patterns, url
 
 from views import MemberList, MemberDetail, UpdateMember, UpdateAvatarMember, UpdatePasswordMember, \
-    UpdateUsernameEmailMember, RegisterView
+    UpdateUsernameEmailMember, RegisterView, SendValidationEmailView
 
 urlpatterns = patterns('',
                         #list
@@ -40,6 +40,7 @@
                        url(r'^deconnexion/$', 'zds.member.views.logout_view'),
                        url(r'^inscription/$', RegisterView.as_view(), name='register-member'),
                        url(r'^reinitialisation/$', 'zds.member.views.forgot_password'),
+                       url(r'^email_validation/$', SendValidationEmailView.as_view(), name='send-validation-email'),
                        url(r'^new_password/$', 'zds.member.views.new_password'),
                        url(r'^activation/$', 'zds.member.views.active_account'),
                        url(r'^envoi_jeton/$', 'zds.member.views.generate_token_account'),