Merge lp:~canonical-isd-hackers/canonical-identity-provider/bug_528389_new_account_conf into lp:canonical-identity-provider/release

[Danny Tamez]

When a user attempts to confirm a token to create a new account if they are already logged in they will now receive a polite error message instead of the app silently failing.

[Stuart Metcalfe (stuartmetcalfe)]

Typos in identityprovider/templates/registration/logout_to_confirm.html:

 * {% block "title" %}{% trans "Can not cofirm token while logged in" %}{% endblock %}
   should be:
   {% block "title" %}{% trans "Can not confirm token while logged in" %}{% endblock %}

 * <p>{% blocktrans %}You can not confrim this token because you are logged in as
   should be:
   <p>{% blocktrans %}You can not confirm this token because you are logged in as

review: Needs Fixing

[Łukasz Czyżykowski (lukasz-czyzykowski)]

All OK

review: Approve

=== added file 'identityprovider/templates/registration/logout_to_confirm.html'
--- identityprovider/templates/registration/logout_to_confirm.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/registration/logout_to_confirm.html	2010-05-11 13:11:25 +0000
@@ -0,0 +1,15 @@
+<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE). -->
+
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block "title" %}{% trans "Can not confirm token while logged in" %}{% endblock %}
+
+{% block "content" %}
+	<h1 class="main">{% trans "Can not confirm token while logged in" %}</h1>
+
+	<p>{% blocktrans %}You can not confirm this token because you are logged in as
+	a different user. Please log out and try again.{% endblocktrans %}</p>
+{% endblock %}
+

=== modified file 'identityprovider/tests/test_views_ui.py'
--- identityprovider/tests/test_views_ui.py	2010-05-10 16:59:23 +0000
+++ identityprovider/tests/test_views_ui.py	2010-05-11 13:11:25 +0000
@@ -205,10 +205,29 @@
 
     def test_confirm_account_with_bad_token(self):
         token = self.create_token(at.LoginTokenType.NEWPERSONLESSACCOUNT)
+        self.authenticate()
+        r = self.client.get('/+logout')
 
         r = self.client.get('/token/%s/+newaccount' % token.token)
         self.assertRedirects(r, '/+bad-token')
 
+    def test_logout_to_confirm(self):
+        r = self.client.get('/+logout-to-confirm')
+        self.assertEquals(r.status_code, 200)
+
+    def test_confirm_account_while_logged_in(self):
+        token = self.create_token(at.LoginTokenType.NEWPERSONLESSACCOUNT)
+        self.authenticate()
+        r = self.client.get('/token/%s/' % token.token)
+        location = None
+        for item in r.items():
+            if item[0] == 'Location':
+                location = item[1]
+                break
+        location = location[len('http://testserver'):]
+        r = self.client.get(location)
+        self.assertRedirects(r,  '/+logout-to-confirm')
+
     def test_forgot_password_when_captcha_verification_fails(self):
         r = self.request_when_captcha_fails('/+forgot_password',
                                             {'email': '[e-mail]'})

=== modified file 'identityprovider/urls.py'
--- identityprovider/urls.py	2010-05-04 13:30:27 +0000
+++ identityprovider/urls.py	2010-05-11 13:11:25 +0000
@@ -35,6 +35,7 @@
      'confirm_account'),
     (r'^token/(?P<authtoken>[A-Za-z0-9]{20})/\+newemail$', 'confirm_email'),
     (r'^\+bad-token', 'bad_token'),
+    (r'^\+logout-to-confirm', 'logout_to_confirm'),
     (r'^%(optional_token)s\+email-sent$' % repls, 'email_sent'),
     (r'^debug-token/(?P<email>.*\@.*\..*)$', 'token_from_email'),
     (r'^\+deactivated$', 'deactivated'),

=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2010-05-05 13:11:46 +0000
+++ identityprovider/views/ui.py	2010-05-11 13:11:25 +0000
@@ -204,9 +204,10 @@
     return None
 
 
-@guest_required
 @check_readonly
 def confirm_account(request, authtoken):
+    if request.user.is_authenticated():
+        return HttpResponseRedirect('/+logout-to-confirm')
     atrequest = get_object_or_404(AuthToken, token=authtoken,
         token_type=LoginTokenType.NEWPERSONLESSACCOUNT)
     session_token = request.session.get('token_newaccount')
@@ -299,6 +300,8 @@
     })
     return render_to_response('registration/bad_token.html', context)
 
+def logout_to_confirm(request):
+    return render_to_response('registration/logout_to_confirm.html')
 
 def deactivated(request):
     context = RequestContext(request, {