Merge lp:~salgado/launchpad/bug-527985 into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

When the user doesn't authorize the OpenID provider to send their
details to the RP, the user will end up at the +openid-callback page,
which has a login link.

Currently, the link will be something like /+openid-callback/+login,
which causes LP to believe the user wants to be sent to +openid-callback
once the login is completed, but that's obviously not true -- that was
just a page the user ended up at after a failed login. The fix here
will just drop the /+openid-callback bit from the login link, similarly
to what we already do for the +logout page.

[Gary Poster (gary)]

Thanks, Salgado!

review: Approve

[Tim Penhey (thumper)]

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
--- lib/canonical/launchpad/browser/launchpad.py	2010-02-23 19:40:45 +0000
+++ lib/canonical/launchpad/browser/launchpad.py	2010-03-01 19:52:20 +0000
@@ -474,8 +474,14 @@
         if full_url.endswith('/'):
             full_url = full_url[:-1]
         logout_url_end = '/+logout'
+        openid_callback_url_end = '/+openid-callback'
         if full_url.endswith(logout_url_end):
             full_url = full_url[:-len(logout_url_end)]
+        elif full_url.endswith(openid_callback_url_end):
+            full_url = full_url[:-len(openid_callback_url_end)]
+        else:
+            # No need to remove anything from full_url.
+            pass
         return '%s/+login%s' % (full_url, query_string)
 
 
 
=== modified file 'lib/canonical/launchpad/doc/loginstatus-pages.txt'
--- lib/canonical/launchpad/doc/loginstatus-pages.txt	2009-08-13 13:33:26 +0000
+++ lib/canonical/launchpad/doc/loginstatus-pages.txt	2010-03-01 19:52:20 +0000
@@ -81,6 +81,19 @@
     >>> status.login_url
     'http://localhost/+login'
 
+The +openid-callback page.
+
+    >>> request = DummyRequest(
+    ...     'http://localhost', '/+openid-callback', '')
+    >>> context = object()
+    >>> status = LoginStatus(context, request)
+    >>> status.logged_in
+    False
+    >>> status.login_shown
+    True
+    >>> status.login_url
+    'http://localhost/+login'
+
 Logging in.
 
     >>> login('[e-mail]')