Merge lp:~maxiberta/canonical-identity-provider/remove-reset-pwd-confirm-code into lp:canonical-identity-provider/release

[Maximiliano Bertacchini]

Remove references to unused token in password reset views (fixes #1568299).

Remove references to unused token in password reset views (fixes #1568299).

[Daniel Manrique (roadmr)]

Looks OK to me, I wonder if we should more thoroughly test that the string is gone, but that'd be just a test artifact of us knowing it was there *before*, so I think this is ok.

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good. Would you please confirm that grepping to "confirmation code" does not show any other code that needs updating?

Thanks!

review: Approve

[Maximiliano Bertacchini (maxiberta)]

All appearances of "confirmation code" (case insensitive) seem to be in error messages, which don't need updating in my opinion.

=== modified file 'src/identityprovider/templates/email/forgottenpassword.txt'
--- src/identityprovider/templates/email/forgottenpassword.txt	2014-12-09 21:32:43 +0000
+++ src/identityprovider/templates/email/forgottenpassword.txt	2016-04-26 18:09:58 +0000
@@ -2,11 +2,7 @@
 
 You have requested a new password for your Ubuntu One account.
 
-Here is your confirmation code:{% endblocktrans %}
-
-{{ token }}
-
-{% blocktrans %}Enter this code into the password-reset form, or click the following link to automatically confirm your reset:{% endblocktrans %}
+Click the following link to automatically confirm your reset:{% endblocktrans %}
 
 {{ token_url }}
 

=== modified file 'src/webui/tests/test_views_registration.py'
--- src/webui/tests/test_views_registration.py	2016-03-08 20:20:58 +0000
+++ src/webui/tests/test_views_registration.py	2016-04-26 18:09:58 +0000
@@ -370,7 +370,6 @@
         ctx = response.context_data
         self.assertEqual(ctx['form']['email'].value(), None)
         self.assertEqual(ctx['rpconfig'], None)
-        self.assertEqual(ctx['token'], None)
         self.assert_form_displayed(response)
         self.assert_stat_calls(['requested'])
 
@@ -395,7 +394,6 @@
         token = '12345678' * 2
         response = self.post(token=token, data=dict(email="111"))
 
-        self.assertEqual(response.context_data['token'], token)
         self.assert_form_displayed(response)
         self.assert_stat_calls(['error.form'])
 

=== modified file 'src/webui/views/registration.py'
--- src/webui/views/registration.py	2016-03-08 20:20:58 +0000
+++ src/webui/views/registration.py	2016-04-26 18:09:58 +0000
@@ -259,8 +259,7 @@
                 heading = 'Reset password'
                 reason = _(
                     'We have sent an email to %(email_to)s. To continue, '
-                    'click on the link in your email, or enter the '
-                    'confirmation code below.') % msgs
+                    'click on the link in your email.') % msgs
 
                 return display_email_sent(
                     request,
@@ -269,7 +268,6 @@
                     reason,
                     _("Check that you’ve actually "
                       "entered a subscribed email address."),
-                    token=token,
                     rpconfig=rpconfig,
                 )
 
@@ -282,7 +280,7 @@
         return HttpResponseNotAllowed(['GET', 'POST'])
 
     context = RequestContext(
-        request, dict(form=form, rpconfig=rpconfig, token=token))
+        request, dict(form=form, rpconfig=rpconfig))
     template = 'registration/forgot_password.html'
     return TemplateResponse(request, template, context)