Merge lp:~salgado/launchpad/remove-login-and-password-reset into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

Remove the views for the old login and reset password forms, together with tests that were exercising them.

[Francis J. Lacoste (flacoste)]

Removing >2k lines... that must have felt good!

review: Approve

=== removed file 'lib/canonical/launchpad/browser/tests/test_registration.py'
--- lib/canonical/launchpad/browser/tests/test_registration.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/browser/tests/test_registration.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-import unittest
-
-from zope.component import getUtility
-
-from canonical.launchpad.browser.tests.registration import (
-    finish_registration_through_the_web, start_registration_through_the_web)
-from canonical.launchpad.interfaces.authtoken import LoginTokenType
-from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
-from lp.registry.interfaces.person import IPerson
-from lp.testing import TestCaseWithFactory
-from canonical.launchpad.testing.pages import get_feedback_messages
-from canonical.testing import DatabaseFunctionalLayer
-
-
-class TestEmailsOfPersonlessAccountsCantBeUsedToRegister(TestCaseWithFactory):
-    # If a user tries to create a LP account using an email address that
-    # is already associated with a personless account, we'll just tell them
-    # they should use their SSO credentials to login.
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        TestCaseWithFactory.setUp(self)
-        self.email = u'[e-mail]'
-        self.expected_error = (
-            'The email address %s is already registered in the '
-            'Launchpad Login Service (used by the Ubuntu shop and '
-            'other OpenID sites). Please use the same email and '
-            'password to log into Launchpad.' % self.email)
-        self.personless_account = self.factory.makeAccount(
-            'Test account', email=self.email)
-
-    def test_first_step(self):
-        # The +login page will prevent users from attempting to register a new
-        # account using an email address associated with an existing
-        # SSO (personless) account and instead tell them to use the SSO
-        # account's credentials to login.
-        browser = start_registration_through_the_web(self.email)
-        errors = get_feedback_messages(browser.contents)
-        self.assertIn(self.expected_error, errors)
-
-    def test_last_step(self):
-        # Just like the +login page, the +newaccount page of a LoginToken will
-        # render an error if the email address stored on the token is
-        # associated with an existing SSO account.
-        self.assertIs(IPerson(self.personless_account, None), None)
-        # Need to manually create the token here because the check on the
-        # +login page (shown by the test above) prevents us from creating it
-        # using the web UI.
-        self.token = getUtility(ILoginTokenSet).new(
-            requester=None, requesteremail=None, email=self.email,
-            tokentype=LoginTokenType.NEWACCOUNT, redirection_url=None)
-        browser = finish_registration_through_the_web(self.token)
-        errors = get_feedback_messages(browser.contents)
-        self.assertIn(self.expected_error, errors)
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== removed file 'lib/canonical/launchpad/doc/login-pages.txt'
--- lib/canonical/launchpad/doc/login-pages.txt	2009-04-17 10:32:16 +0000
+++ lib/canonical/launchpad/doc/login-pages.txt	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-= Login pages =
-
-The LoginOrRegister view is responsible for the login form and how it
-operates within the Launchpad workflows.
-
-    # Import some stuff we'll use througout the test.
-    >>> from zope.component import getMultiAdapter, getUtility
-    >>> from zope.security.proxy import removeSecurityProxy
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from canonical.launchpad.webapp.publisher import rootObject
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> person_set = getUtility(IPersonSet)
-
-    >>> def create_request(form):
-    ...     return LaunchpadTestRequest(
-    ...         SERVER_URL='http://launchpad.dev',
-    ...         PATH_INFO='/+login', method='POST', form=form)
-
-
-== Unregistered email addresses can't be used to login ==
-
-Trying to login with an email address that is not registered in Launchpad will
-cause an error message to be displayed.
-
-    >>> request = create_request(
-    ...     form={'loginpage_email': '[e-mail]',
-    ...           'loginpage_password': u'test',
-    ...           'loginpage_submit_login': 'Log In'})
-    >>> login_view = getMultiAdapter(
-    ...     (rootObject, request), name="+login")
-    >>> login_view.process_login_form()
-    >>> login_view.login_success()
-    False
-    >>> print login_view.login_error
-    The email address and password do not match.
-
-
-== Can't login if using the wrong password ==
-
-If a user tries to login using a password that is not the correct one for the
-account with the given email address, an error message is displayed.
-
-This is what happens if you have a full-fledged account:
-
-    >>> person = factory.makePerson()
-    >>> request = create_request(
-    ...     form={'loginpage_email': person.preferredemail.email,
-    ...           'loginpage_password': person.password + 'foo',
-    ...           'loginpage_submit_login': 'Log In'})
-    >>> login_view = getMultiAdapter(
-    ...     (rootObject, request), name="+login")
-    >>> login_view.process_login_form()
-    >>> login_view.login_success()
-    False
-    >>> print login_view.login_error
-    The email address and password do not match.
-
-Or a personless one:
-
-    >>> account = factory.makeAccount(
-    ...     'Personless account', email='[e-mail]', password='foo')
-    >>> request = create_request(
-    ...     form={'loginpage_email': '[e-mail]',
-    ...           'loginpage_password': u'wrong password',
-    ...           'loginpage_submit_login': 'Log In'})
-    >>> login_view = getMultiAdapter(
-    ...     (rootObject, request), name="+login")
-    >>> login_view.process_login_form()
-    >>> login_view.login_success()
-    False
-    >>> print login_view.login_error
-    The email address and password do not match.
-
-
-== Deactivated accounts cannot login ==
-
-A deactivated account cannot use the LoginOrRegister view to login.
-The login_error message explains the situation to the user. Former User
-is an example of a user with a DEACTIVATED account.
-
-    >>> former_user = person_set.getByEmail('[e-mail]')
-    >>> former_user_account = removeSecurityProxy(former_user.account)
-    >>> former_user_account.status
-    <DBItem AccountStatus.DEACTIVATED, ...>
-
-    # Set the person's password so that we can try logging in.
-    >>> from canonical.launchpad.interfaces.launchpad import IPasswordEncryptor
-    >>> former_user_account.password = getUtility(
-    ...     IPasswordEncryptor).encrypt('foo')
-
-    >>> request = create_request(
-    ...     form={'loginpage_email': '[e-mail]',
-    ...           'loginpage_password': u'foo',
-    ...           'loginpage_submit_login': 'Log In'})
-    >>> login_view = getMultiAdapter(
-    ...     (rootObject, request), name="+login")
-    >>> login_view.process_login_form()
-    >>> login_view.login_success()
-    False
-    >>> print login_view.login_error
-    The email address belongs to a deactivated account.
-    Use the "Forgotten your password" link to reactivate it.
-
-The user can use +resetpassword to reactivate his account.
-See "Reactivating an account using reset password" in `logintoken-pages`.
-
-
-== Suspended account cannot login ==
-
-A user with a suspended account cannot login. The view's login_error
-explains the problem.
-
-    >>> from canonical.launchpad.interfaces.account import AccountStatus
-
-    # Only admins can suspend an account.
-    >>> login('[e-mail]')
-    >>> bad_user = factory.makePerson(
-    ...     email='[e-mail]',
-    ...     name='bad-user',
-    ...     password='password')
-    >>> from canonical.launchpad.interfaces import IMasterObject
-    >>> IMasterObject(bad_user.account).status = AccountStatus.SUSPENDED
-    >>> import transaction
-    >>> transaction.commit()
-
-    >>> login(ANONYMOUS, request)
-    >>> request = create_request(
-    ...     form={'loginpage_email': '[e-mail]',
-    ...           'loginpage_password': u'password',
-    ...           'loginpage_submit_login': 'Log In'})
-    >>> login_view = getMultiAdapter(
-    ...     (rootObject, request), name="+login")
-    >>> login_view.process_login_form()
-    >>> login_view.login_success()
-    False
-    >>> print login_view.login_error
-    The email address belongs to a suspended account.
-    Contact a <a href="mailto:[e-mail]?subject=SU...">Launchpad
-    admin</a> about this issue.

=== removed file 'lib/canonical/launchpad/pagetests/standalone/xx-invalid-people-cant-login.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-invalid-people-cant-login.txt	2009-07-23 17:49:31 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-invalid-people-cant-login.txt	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-We need to ensure that an invalid account, such as the result of an
-account merge, can no longer authenticate using their existing
-credentials. See Bug #33427
-
-First we log in via cookie
-
-    >>> browser.open('http://launchpad.dev/+login')
-    >>> browser.url
-    'http://launchpad.dev/+login'
-    >>> browser.getControl('E-mail', index=0).value = '[e-mail]'
-    >>> browser.getControl('Password').value = 'test'
-    >>> browser.getControl('Log In').click()
-    >>> browser.url
-    'http://launchpad.dev'
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    Foo Bar...
-
-Now invalidate that person
-
-    >>> from canonical.launchpad.interfaces import AccountStatus
-    >>> from lp.registry.model.person import Person
-    >>> foobar = Person.byName('name16')
-    >>> from canonical.launchpad.interfaces import IMasterObject
-    >>> IMasterObject(foobar.account).status = AccountStatus.DEACTIVATED
-    >>> import transaction
-    >>> transaction.commit()
-
-Now if we reload the front page, we should be logged out.
-
-    >>> browser.open('http://launchpad.dev')
-    >>> browser.url
-    'http://launchpad.dev'
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    Log in / Register
-
-We also can only connect via Basic auth when then user is valid
-
-    >>> IMasterObject(foobar.account).status = AccountStatus.ACTIVE
-    >>> transaction.commit()
-
-    >>> browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> browser.open('http://launchpad.dev')
-    >>> browser.url
-    'http://launchpad.dev'
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    Foo Bar...
-
-    >>> IMasterObject(foobar.account).status = AccountStatus.SUSPENDED
-    >>> transaction.commit()
-
-    >>> browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> browser.open('http://launchpad.dev')
-    >>> browser.url
-    'http://launchpad.dev'
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    Log in / Register

=== removed file 'lib/canonical/launchpad/pagetests/standalone/xx-login-and-join-links.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-login-and-join-links.txt	2008-10-12 00:44:28 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-login-and-join-links.txt	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-Check that a page in launchpad has a login link.
-
-  >>> print http(r"""
-  ... GET /bugs HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-  ...<a href=".../bugs/+login">...
-  ...
-
-Check that a page in launchpad that is given query parameters has a login link
-that preserves those parameters.
-
-  >>> print http(r"""
-  ... GET /bugs?foo=14&bar=23 HTTP/1.1
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-  ...<a href=".../bugs/+login?bar=23&amp;foo=14">...
-  ...
-
-The login page preserves all the query parameters it is given
-
-  >>> result = http(r"""
-  ... GET /bugs/+login?foo=mandrill&foo=bonobo&bar=tsimpson HTTP/1.1
-  ... """).getBody()
-  >>> '<input type="hidden" name="foo" value="mandrill" />' in result
-  True
-  >>> '<input type="hidden" name="foo" value="bonobo" />' in result
-  True
-  >>> '<input type="hidden" name="bar" value="tsimpson" />' in result
-  True
-
-Check that basic auth works.
-
-  >>> print http(r"""
-  ... GET /bugs HTTP/1.1
-  ... Authorization: Basic Zm9vLmJhckBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-  ...<input type="submit" name="logout" value="Log Out" />...
-  ...
-
-Check that the logout page redirects appropriately.
-
-  >>> print http(r"""
-  ... GET /+logout HTTP/1.1
-  ... Authorization: Basic Zm9vLmJhckBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://localhost/?loggingout=1
-  ...
-
-Check that the logout page redirects appropriately from a more interesting url.
-
-  >>> print http(r"""
-  ... GET /firefox/+logout HTTP/1.1
-  ... Authorization: Basic Zm9vLmJhckBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 303 See Other
-  ...
-  Location: http://localhost/firefox/?loggingout=1
-  ...

=== removed file 'lib/canonical/launchpad/pagetests/standalone/xx-login-without-preferredemail.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-login-without-preferredemail.txt	2009-09-09 23:16:08 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-login-without-preferredemail.txt	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-This test ensures that a user cannot login without a preferred email
-address.
-
-First, we need to set the password to something I know
-
-    >>> import transaction
-    >>> from canonical.launchpad.interfaces import IMasterStore
-    >>> from canonical.launchpad.database.account import AccountPassword
-    >>> IMasterStore(AccountPassword).execute("""
-    ...     UPDATE AccountPassword
-    ...         SET password='K7Qmeansl6RbuPfulfcmyDQOzp70OxVh5Fcf'
-    ...     FROM Person, Account
-    ...     WHERE name='martin-pitt' AND Person.account = Account.id
-    ...         AND Account.id = AccountPassword.account
-    ...     """, noresult=True)
-    >>> transaction.commit()
-
-'martin-pitt' doesn't have a preferred email address.
-He can't login without first validating his email address.
-
-  >>> browser.open('http://launchpad.dev/+login')
-  >>> browser.getControl('E-mail', index=0).value = '[e-mail]'
-  >>> browser.getControl('Password').value = 'test'
-  >>> browser.getControl('Log In').click()
-  >>> print '\n' + browser.contents
-  <BLANKLINE>
-  ...
-  ...The email address '[e-mail]', which you're...
-  ...trying to use to login has not yet been validated to use in Launchpad...
-  ...We sent an email to that address with instructions on how to confirm...
-  ...that it belongs to you...
-  ...
-
-
-  When this happens, we automatically send an email to that address so the
-  user can validate it and login.
-
-  >>> import email, re
-  >>> from lp.services.mail import stub
-  >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-
-  Check if the email was sent to the right address.
-
-  >>> to_addrs
-  ['[e-mail]']
-
-  Get the token from the email address, in order to confirm the email address
-  and then be able to login.
-
-  >>> msg = email.message_from_string(raw_msg)
-  >>> body = msg.get_payload()
-  >>> link = re.findall(r'http.*/token/.*', body)[0]
-  >>> token = re.sub(r'.*token/', '', link)
-  >>> base_path = 'http://launchpad.dev/token/%s' % token
-
-  >>> path = "%s/+validateemail" % base_path
-  >>> browser.open(path)
-  >>> print browser.title
-  Confirm e-mail address
-
-  >>> browser.getControl('Continue').click()
-  >>> browser.url
-  'http://launchpad.dev/~martin-pitt'
-  >>> print '\n' + browser.contents
-  <BLANKLINE>
-  ...informational message">Email address successfully confirmed...
-  ...
-
-  This is the first email 'martin-pitt' is validating, it must be set as the
-  preferred one.
-
-  >>> from canonical.launchpad.database import EmailAddressSet
-  >>> [to_addr] = to_addrs
-  >>> e = EmailAddressSet().getByEmail(to_addr)
-  >>> e.status.title
-  'Preferred Email Address'

=== removed file 'lib/canonical/launchpad/pagetests/standalone/xx-new-account-redirection-url.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-new-account-redirection-url.txt	2009-10-16 16:13:00 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-new-account-redirection-url.txt	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-= Redirecting users after the registration process =
-
-We want to be nice with your users (the new ones, at least ;) and redirect
-them to any page they were trying to access before they were asked to create
-the new account.
-
-The most important case for us is when people get a file-bug URL from apport
-on an Ubuntu system. When this happens we need to make sure they're
-redirected to exactly the same URL they got from apport.
-
-Let's say Granny was playing around with Evolution (everybody's #1 MUA) and
-it crashed. Apport then gave her the following URL (which she promptly
-clicked): http://launchpad.dev/firefox/+filebug/121212
-
-    >>> anon_browser.handleErrors = True
-    >>> anon_browser.open('http://launchpad.dev/firefox/+filebug/121212')
-    >>> anon_browser.url
-    'http://launchpad.dev/firefox/+filebug/121212/+login'
-
-    >>> anon_browser.getControl(name='redirection_url').value
-    'http://launchpad.dev/firefox/+filebug/121212'
-
-
-Similarly, if she wants to join a launchpad team, we'll try hard to redirect
-them back to that same team, after the registration is complete.
-
-    >>> anon_browser.open('http://launchpad.dev/~ubuntu-team/+join')
-    >>> anon_browser.url
-    'http://launchpad.dev/%7Eubuntu-team/+join/+login'
-
-    >>> anon_browser.getControl(name='redirection_url').value
-    'http://launchpad.dev/%7Eubuntu-team/+join'
-
-    # Clean up stub.test_emails to make sure other tests don't fuck us over.
-    >>> from lp.services.mail import stub
-    >>> stub.test_emails = []
-
-
-If she now creates a new account, we'll certainly redirect her back to
-whatever we had stored on the redirection_url hidden field.
-
-    >>> from lp.testing.registration import set_captcha_answer
-    >>> anon_browser.getControl('E-mail address:', index=1).value = (
-    ...     '[e-mail]')
-    >>> set_captcha_answer(anon_browser, prefix='loginpage_')
-    >>> anon_browser.getControl('Register').click()
-    >>> print anon_browser.contents
-    <...
-    <h1>Registration mail sent</h1>
-    ...
-
-    >>> from canonical.launchpad.ftests.logintoken import (
-    ...     get_token_url_from_email)
-    >>> from_addr, to_addr, msg = stub.test_emails.pop()
-    >>> url = get_token_url_from_email(msg)
-    >>> anon_browser.open(url)
-
-    >>> anon_browser.getControl('Display Name').value = 'Granny'
-    >>> anon_browser.getControl(name='field.password').value = 'foo'
-    >>> anon_browser.getControl(name='field.password_dupe').value = 'foo'
-    >>> anon_browser.getControl('Continue').click()
-
-    >>> anon_browser.url
-    'http://launchpad.dev/%7Eubuntu-team/+join'

=== removed file 'lib/canonical/launchpad/templates/launchpad-forgottenpassword.pt'
--- lib/canonical/launchpad/templates/launchpad-forgottenpassword.pt	2009-11-23 03:10:04 +0000
+++ lib/canonical/launchpad/templates/launchpad-forgottenpassword.pt	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-<tal:do-this-first tal:content="view/process_form" />
-<html
-  metal:use-macro="view/macro:page/main_only">
-  <head metal:fill-slot="head_epilogue">
-    <meta name="robots" content="noindex" />
-  </head>
-
-<body>
-
-  <div class="top-portlet" metal:fill-slot="main">
-
-  <div>
-
-    <h1>Need a new Launchpad password?</h1>
-
-    <div tal:condition="not: view/success">
-
-      <tal:block condition="view/errortext">
-        <h1>Your password reset request was unsuccessful</h1>
-        <p class="error message"
-           style="margin-top: 2em;"
-           tal:content="structure view/errortext" />
-      </tal:block>
-
-      <p>
-        Enter your e-mail address, and we will send you instructions
-        on how to reset your password.  You'll also need to answer a simple
-        question so we know that you're human.
-      </p>
-
-      <form name="forgottenpassword" method="POST">
-        <input type="hidden"
-               tal:attributes="name view/captcha_hash;
-                               value view/get_captcha_hash" />
-      <div class="field">
-        <table>
-          <tr>
-            <th>
-              <label for="email">Email address:</label>
-            </th>
-            <td>
-              <input type="text" size="50" name="email" />
-            </td>
-          </tr>
-          <tr>
-            <th>
-              <label>Random question:</label>
-            </th>
-            <td>
-              <span id="problem" tal:content="view/captcha_problem" />
-              <input type="text" size="5"
-                     id="captcha_submission" value=""
-                     tal:attributes="name view/captcha_submission"
-                     />
-            </td>
-          </tr>
-        </table>
-        <div class="formHelp">
-          <p>
-          Enter the email address registered for your Launchpad account.
-          </p>
-          <p>
-          If you are claiming an existing account but don't know the email
-          address that was used, <a href="/feedback">contact a
-          Launchpad administrator</a>.
-          </p>
-        </div>
-        <div class="formControls">
-          <input type="submit" value="Request Reset" />
-        </div>
-      </div>
-      </form>
-      </div>
-    </div>
-
-    <div tal:condition="view/success">
-      <br />
-      <p>We have sent you an email with instructions to reset your
-      password.</p>
-    </div>
-
-  </div>
-
-</body>
-</html>
-</tal:root>

=== removed file 'lib/canonical/launchpad/templates/launchpad-login.pt'
--- lib/canonical/launchpad/templates/launchpad-login.pt	2009-11-18 08:09:58 +0000
+++ lib/canonical/launchpad/templates/launchpad-login.pt	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-<tal:do-this-first tal:content="view/process_form" />
-<html
-  metal:use-macro="view/macro:page/locationless"
->
-  <head metal:fill-slot="head_epilogue">
-    <meta name="robots" content="noindex" />
-  </head>
-  <body>
-    <tal:comment condition="nothing">
-      This page handles cases in this order:
-      1.  already logged in and shouldn't be here
-      2.  just logged in successfully
-      3.  just applied for registration successfully
-      4.  might want to log in
-          4a. didn't try to log in last time
-          4b. just tried to log in and failed
-      5.  might want to register
-          5a. didn't try to register last time
-          5b. just tried to register and failed.
-      The usual case is 4 + 5.
-
-      See also launchpad-restictedlogin.pt, which also uses
-      these numbers in comments.
-    </tal:comment>
-    <div class="top-portlet" metal:fill-slot="main">
-
-      <!-- 1. already logged in and shouldn't be here: -->
-      <tal:block condition="request/lp:person">
-
-        <!-- 2. just logged in successfully: -->
-        <p tal:condition="view/login_success">
-          You are now logged in as <strong
-          tal:content="request/lp:person/displayname">Person Name</strong>.
-        </p>
-
-        <tal:block condition="not: view/login_success">
-          <h1>You&#8217;re already logged in</h1>
-          <p>
-            You are already logged in as
-            <strong tal:content="request/lp:person/displayname">person
-            name</strong>.  If this is not you, please
-            <a href="/+logout">log out now</a>.
-          </p>
-        </tal:block>
-      </tal:block>
-
-      <tal:block condition="not: request/lp:person">
-
-        <tal:block condition="not: view/login_success">
-
-          <!-- 3. just registered successfully: -->
-          <tal:registered condition="view/registration_success">
-            <h1>Registration mail sent</h1>
-            <p id="address">
-              Instructions on completing your registration have been sent to
-              <strong><code tal:content="view/email"
-                >[e-mail]</code></strong>.
-            </p>
-            <p>
-              If you don&rsquo;t receive the instructions within a few
-              minutes, it might be because:
-            </p>
-            <ul>
-              <li>
-                <p>
-                  Your mail provider uses &ldquo;greylisting&rdquo; to reduce
-                  spam. If so, you&rsquo;ll need to wait an hour or two
-                  for the message to arrive.
-                </p>
-              </li>
-              <li>
-                <p>
-                  Your mail provider mistakenly blocks messages from Launchpad.
-                  Try signing up using a service like
-                  <a href="http://gmail.com/">Gmail</a> or
-                  <a href="http://mail.yahoo.com/">Yahoo Mail</a>.
-                  If that works, complain to your usual mail provider.
-                </p>
-              </li>
-              <li>
-                <p>
-                  If neither of those work, Launchpad might be broken somehow.
-                  Let us know by sending a message to
-                  <a href="mailto:[e-mail]"
-                     >[e-mail]</a>.
-                </p>
-              </li>
-            </ul>
-          </tal:registered>
-
-          <tal:block condition="not: view/registration_success">
-            <!-- 4a. didn't try to log in last time: -->
-            <h1 tal:condition="not: view/login_error">
-              Already registered?
-            </h1>
-            <!-- 4b. just tried to log in and failed: -->
-            <div tal:condition="view/login_error">
-              <h1>Your login was unsuccessful</h1>
-              <p class="error message" tal:content="structure view/login_error" />
-            </div>
-            <!-- 4. might want to log in: -->
-            <p>
-              To log in, enter your e-mail address
-              and Launchpad password.
-            </p>
-            <form name="login" method="POST">
-              <table>
-                <tr>
-                  <th>
-                    <label for="email">E-mail address:</label>
-                  </th>
-                  <td>
-                    <input type="text"
-                      name="loginpage_email"
-                      id="email"
-                      size="30"
-                      tal:attributes="value request/email | nothing"
-                    />
-                    <script>
-                    <!--
-                        document.forms['login'].loginpage_email.focus();
-                    //-->
-                    </script>
-                  </td>
-                </tr>
-                <tr>
-                  <th><label for="password">Password:</label></th>
-                  <td>
-                    <input
-                      type="password"
-                      id="password"
-                      name="loginpage_password"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th></th>
-                  <td>
-                    <div>
-                      <input
-                        type="submit"
-                        name="loginpage_submit_login"
-                        value="Log In" />
-                      [<a href="/+forgottenpassword">Forgotten your password?</a>]
-                    </div>
-                  </td>
-                </tr>
-              </table>
-              <!-- Preserve extra query parameters as hidden fields. -->
-              <tal:replacement tal:replace="structure view/preserve_query" />
-            </form>
-            <p><strong>Note:</strong> You must enable cookies in your browser
-              to log into or register for Launchpad.</p>
-            <!-- 5a. didn't try to register last time: -->
-            <h1 tal:condition="not: view/registration_error">
-              Not registered yet?
-            </h1>
-            <!-- 5b. just tried to register and failed: -->
-            <tal:block condition="view/registration_error">
-              <h1>Your registration was unsuccessful</h1>
-              <p class="error message"
-                 style="margin-top: 2em;"
-                 tal:content="structure view/registration_error" />
-            </tal:block>
-            <!-- 5. might want to register: -->
-            <p>
-              Creating your Launchpad account is easy. Here's what to do:</p>
-
-            <ol class="subordinate">
-                <li>Make sure cookies are enabled in your browser.</li>
-                <li>Enter your e-mail address and answer our random question
-                    so we know that you're human.
-                </li>
-                <li>Follow the URL in the confirmation e-mail that Launchpad sends and you're done!</li>
-            </ol>
-
-
-
-            <form name="join" method="POST">
-              <input type="hidden" name="redirection_url"
-                     tal:condition="not: request/form/redirection_url|nothing"
-                     tal:attributes="value view/getRedirectionURL" />
-              <input type="hidden"
-                     tal:attributes="name view/captcha_hash;
-                                     value view/get_captcha_hash" />
-              <table>
-                <tr>
-                  <th>
-                    <label for="registeremail">E-mail address:</label>
-                  </th>
-                  <td>
-                    <input type="text" size="30" name="loginpage_email"
-                      id="registeremail"
-                      tal:attributes="value view/email|nothing"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>
-                    <label>Random question:</label>
-                  </th>
-                  <td>
-                    <span id="problem" tal:content="view/captcha_problem" />
-                    <input type="text" size="5"
-                           id="captcha_submission" value=""
-                           tal:attributes="name view/captcha_submission"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th></th>
-                  <td>
-                    <input
-                      type="submit"
-                      name="loginpage_submit_registration"
-                      value="Register" />
-                  </td>
-                </tr>
-              </table>
-              <p><strong>Note:</strong> We will never disclose, share or sell your
-              personal information, nor send you e-mail not
-              directly related to Launchpad.</p>
-              <!-- Preserve extra query parameters as hidden fields. -->
-              <tal:replacement tal:replace="structure view/preserve_query" />
-            </form>
-          </tal:block>
-        </tal:block>
-      </tal:block>
-    </div>
-  </body>
-</html>
-</tal:root>

=== removed file 'lib/canonical/launchpad/templates/launchpad-restrictedinfo.pt'
--- lib/canonical/launchpad/templates/launchpad-restrictedinfo.pt	2009-10-13 20:59:13 +0000
+++ lib/canonical/launchpad/templates/launchpad-restrictedinfo.pt	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  i18n:domain="launchpad"
->
-  <head>
-    <title>Launchpad</title>
-    <style type="text/css">
-      html {
-        font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
-        font-size: 8pt;
-      }
-      h1 {background: none; color: #83ad23; font-size: 3em; font-weight: normal;}
-    </style>
-  </head>
-  <body>
-    <tal:block condition="view/isTeamRestrictedServer"
-               define="non_restricted_url request/form/production|nothing">
-      <h1>Restricted Launchpad test site</h1>
-
-      <p>This site is accessible by launchpad admins and members of the
-        <a tal:attributes="href view/getAllowedTeamURL"
-           tal:content="view/getAllowedTeamDescription" />
-       team only.
-      </p>
-      <p tal:condition="non_restricted_url">You may be able to
-      access this page
-      <a tal:attributes="href non_restricted_url">on the main
-      Launchpad site</a> instead.</p>
-
-      <p tal:condition="not:non_restricted_url">You may use
-      <a href="https://launchpad.net/">the main Launchpad site</a> instead.</p>
-
-      <p>You can <a href="/+logout">log out</a>.</p>
-    </tal:block>
-    <tal:block condition="not: view/isTeamRestrictedServer">
-      <p>This server is open to anonymous access and registered users.</p>
-    </tal:block>
-  </body>
-</html>

=== removed file 'lib/canonical/launchpad/templates/launchpad-restrictedlogin.pt'
--- lib/canonical/launchpad/templates/launchpad-restrictedlogin.pt	2009-10-13 20:59:13 +0000
+++ lib/canonical/launchpad/templates/launchpad-restrictedlogin.pt	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  i18n:domain="launchpad"
->
-<tal:do-this-first tal:content="view/process_restricted_form" />
-  <head>
-    <title>Log in to Launchpad</title>
-    <style type="text/css">
-      html {
-        font-family: bitstream vera sans, dejavu sans, verdana, sans-serif;
-        font-size: 8pt;
-      }
-      h1 {background: none; color: #83ad23; font-size: 3em; font-weight: normal;}
-      th {font-weight: normal; text-align: right;}
-      .oopsid {color: #cc0000; font-weight: bold;}
-    </style>
-  </head>
-  <body>
-    <h1>Log in to a Launchpad test site</h1>
-
-    <tal:comment condition="nothing">
-      See launchpad-login.pt for an explanation of the numbered comments.
-    </tal:comment>
-
-    <!-- 1. already logged in and shouldn't be here: -->
-    <tal:block condition="request/lp:person">
-
-      <!-- 2. just logged in successfully: -->
-      <p tal:condition="view/login_success">
-        You are now logged in as <strong
-        tal:content="request/lp:person/displayname">Person Name</strong>.
-      </p>
-
-      <tal:block condition="not: view/login_success">
-        <h1>You&#8217;re already logged in</h1>
-        <p>
-          You are already logged in as
-          <strong tal:content="request/lp:person/displayname">person
-          name</strong>.  If this is not you, please
-          <a href="/+logout">log out now</a>.
-        </p>
-      </tal:block>
-    </tal:block>
-
-    <tal:block condition="not: request/lp:person">
-
-      <h1 tal:condition="not: view/login_error">
-        Already registered?
-      </h1>
-      <!-- 4b. just tried to log in and failed: -->
-      <div tal:condition="view/login_error">
-        <h1>Your login was unsuccessful</h1>
-        <p class="error message" tal:content="view/login_error" />
-      </div>
-      <!-- 4. might want to log in: -->
-      <p>
-        To log in, enter your e-mail address
-        and Launchpad password.
-      </p>
-      <form name="login" method="POST">
-        <table>
-          <tr>
-            <th>
-              <label for="email">E-mail address:</label>
-            </th>
-            <td>
-              <input type="text"
-                name="loginpage_email"
-                id="email"
-                size="30"
-                tal:attributes="value request/email | nothing"
-              />
-              <script>
-              <!--
-                  document.forms['login'].loginpage_email.focus();
-              //-->
-              </script>
-            </td>
-          </tr>
-          <tr>
-            <th><label for="password">Password:</label></th>
-            <td>
-              <input
-                type="password"
-                id="password"
-                name="loginpage_password"
-              />
-            </td>
-          </tr>
-          <tr>
-            <th></th>
-            <td>
-              <div>
-                <input
-                  type="submit"
-                  name="loginpage_submit_login"
-                  value="Log In" />
-              </div>
-            </td>
-          </tr>
-        </table>
-      </form>
-
-      <p tal:define="non_restricted_url request/form/production|nothing"
-         tal:condition="non_restricted_url">
-        You may be able to access this page
-        <a tal:attributes="href non_restricted_url">on the main
-        Launchpad site</a> instead.
-      </p>
-    </tal:block>
-  </body>
-</html>
-

=== modified file 'lib/canonical/launchpad/webapp/login.py'
--- lib/canonical/launchpad/webapp/login.py	2010-02-18 11:01:16 +0000
+++ lib/canonical/launchpad/webapp/login.py	2010-02-18 11:01:19 +0000
@@ -5,9 +5,6 @@
 
 __metaclass__ = type
 
-import cgi
-import hashlib
-import random
 import urllib
 
 from datetime import datetime, timedelta
@@ -34,16 +31,9 @@
 from canonical.config import config
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.account import AccountStatus, IAccountSet
-from canonical.launchpad.interfaces.authtoken import (
-    IAuthTokenSet, LoginTokenType)
-from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
-from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
 from canonical.launchpad.interfaces.openidconsumer import IOpenIDConsumerStore
-from lp.registry.interfaces.person import (
-    IPerson, IPersonSet, PersonCreationRationale)
-from canonical.launchpad.interfaces.validation import valid_password
+from lp.registry.interfaces.person import IPerson, PersonCreationRationale
 from canonical.launchpad.readonly import is_read_only
-from canonical.launchpad.validators.email import valid_email
 from canonical.launchpad.webapp.error import SystemErrorView
 from canonical.launchpad.webapp.interfaces import (
     CookieAuthLoggedInEvent, ILaunchpadApplication, ILaunchpadPrincipal,
@@ -164,60 +154,6 @@
             name='+basiclogin')
 
 
-class RestrictedLoginInfo:
-    """On a team-restricted launchpad server, show who may access the server.
-
-    Otherwise, show that this is an unrestricted server.
-    """
-
-    def isTeamRestrictedServer(self):
-        return bool(config.launchpad.restrict_to_team)
-
-    def getAllowedTeamURL(self):
-        return 'https://launchpad.net/people/%s' % (
-            config.launchpad.restrict_to_team)
-
-    def getAllowedTeamDescription(self):
-        return getUtility(IPersonSet).getByName(
-            config.launchpad.restrict_to_team).title
-
-class CaptchaMixin:
-    """Mixin class to provide simple captcha capabilities."""
-    def validateCaptcha(self):
-        """Validate the submitted captcha value matches what we expect."""
-        expected = self.request.form.get(self.captcha_hash)
-        submitted = self.request.form.get(self.captcha_submission)
-        if expected is not None and submitted is not None:
-            return hashlib.md5(submitted).hexdigest() == expected
-        return False
-
-    @cachedproperty
-    def captcha_answer(self):
-        """Get the answer for the current captcha challenge.
-
-        With each failed attempt a new challenge will be given.  Our answer
-        space is acknowledged to be ridiculously small but is chosen in the
-        interest of ease-of-use.  We're not trying to create an iron-clad
-        challenge but only a minimal obstacle to dumb bots.
-        """
-        return random.randint(10, 20)
-
-    @property
-    def get_captcha_hash(self):
-        """Get the captcha hash.
-
-        The hash is the value we put in the form for later comparison.
-        """
-        return hashlib.md5(str(self.captcha_answer)).hexdigest()
-
-    @property
-    def captcha_problem(self):
-        """Create the captcha challenge."""
-        op1 = random.randint(1, self.captcha_answer - 1)
-        op2 = self.captcha_answer - op1
-        return '%d + %d =' % (op1, op2)
-
-
 # The Python OpenID package uses pycurl by default, but pycurl chokes on
 # self-signed certificates (like the ones we use when developing), so we
 # change the default to urllib2 here.  That's also a good thing because it
@@ -372,252 +308,6 @@
     template = ViewPageTemplateFile("../templates/login-already.pt")
 
 
-class LoginOrRegister(CaptchaMixin):
-    """Merges the former CookieLoginPage and JoinLaunchpadView classes
-    to allow the two forms to appear on a single page.
-
-    This page is a self-posting form.  Actually, there are two forms
-    on the page.  The first time this page is loaded, when there's been
-    no POST of its form, we want to preserve any query parameters, and put
-    them into hidden inputs.
-    """
-
-    # Names used in the template's HTML form.
-    form_prefix = 'loginpage_'
-    submit_login = form_prefix + 'submit_login'
-    submit_registration = form_prefix + 'submit_registration'
-    input_email = form_prefix + 'email'
-    input_password = form_prefix + 'password'
-    captcha_submission = form_prefix + 'captcha_submission'
-    captcha_hash = form_prefix + 'captcha_hash'
-
-    # Instance variables that represent the state of the form.
-    login_error = None
-    registration_error = None
-    submitted = False
-    email = None
-
-    def process_restricted_form(self):
-        """Entry-point for the team-restricted login page.
-
-        If we're not running in team-restricted mode, then redirect to a
-        regular login page.  Otherwise, process_form as usual.
-        """
-        if config.launchpad.restrict_to_team:
-            self.process_form()
-        else:
-            self.request.response.redirect('/+login',
-                                           temporary_if_possible=True)
-
-    def process_form(self):
-        """Determines whether this is the login form or the register
-        form, and delegates to the appropriate function.
-        """
-        if self.request.method != "POST":
-            return
-
-        self.submitted = True
-        if self.request.form.get(self.submit_login):
-            self.process_login_form()
-        elif self.request.form.get(self.submit_registration):
-            self.process_registration_form()
-
-    def getRedirectionURL(self):
-        """Return the URL we should redirect the user to, after finishing a
-        registration or password reset process.
-
-        IOW, the current URL without the "/+login" bit.
-        """
-        return self.request.getURL(1)
-
-    def process_login_form(self):
-        """Process the form data.
-
-        If there is an error, assign a string containing a description
-        of the error to self.login_error for presentation to the user.
-        """
-        email = self.request.form.get(self.input_email)
-        password = self.request.form.get(self.input_password)
-        if not email or not password:
-            self.login_error = _("Enter your email address and password.")
-            return
-
-        # XXX matsubara 2006-05-08 bug=43675: This class should inherit from
-        # LaunchpadFormView, that way we could take advantage of Zope's widget
-        # validation, instead of checking manually for password validity.
-        if not valid_password(password):
-            self.login_error = _(
-                "The password provided contains non-ASCII characters.")
-            return
-
-        loginsource = getUtility(IPlacelessLoginSource)
-        principal = loginsource.getPrincipalByLogin(email)
-        if principal is None or not principal.validate(password):
-            self.login_error = "The email address and password do not match."
-        elif principal.person is None:
-            logInPrincipalAndMaybeCreatePerson(self.request, principal, email)
-            self.redirectMinusLogin()
-        elif principal.person.account_status == AccountStatus.DEACTIVATED:
-            self.login_error = _(
-                'The email address belongs to a deactivated account. '
-                'Use the "Forgotten your password" link to reactivate it.')
-        elif principal.person.account_status == AccountStatus.SUSPENDED:
-            email_link = (
-                'mailto:[e-mail]?subject=SUSPENDED%20account')
-            self.login_error = _(
-                'The email address belongs to a suspended account. '
-                'Contact a <a href="%s">Launchpad admin</a> '
-                'about this issue.' % email_link)
-        else:
-            person = getUtility(IPersonSet).getByEmail(email)
-            if person.preferredemail is None:
-                self.login_error = _(
-                    "The email address '%s', which you're trying to use to "
-                    "login has not yet been validated to use in Launchpad. "
-                    "We sent an email to that address with instructions on "
-                    "how to confirm that it belongs to you. As soon as we "
-                    "have that confirmation you'll be able to log into "
-                    "Launchpad."
-                    ) % email
-                token = getUtility(ILoginTokenSet).new(
-                    person, email, email, LoginTokenType.VALIDATEEMAIL)
-                token.sendEmailValidationRequest()
-                return
-            if person.is_valid_person:
-                logInPrincipal(self.request, principal, email)
-                self.redirectMinusLogin()
-            else:
-                # Normally invalid accounts will have a NULL password
-                # so this will be rarely seen, if ever. An account with no
-                # valid email addresses might end up in this situation,
-                # such as having them flagged as OLD by a email bounce
-                # processor or manual changes by the DBA.
-                self.login_error = "This account cannot be used."
-
-    def process_registration_form(self):
-        """A user has asked to join launchpad.
-
-        Check if everything is ok with the email address and send an email
-        with a link to the user complete the registration process.
-        """
-        request = self.request
-        # For some reason, redirection_url can sometimes be a list, and
-        # sometimes a string.  See OOPS-68D508, where redirection_url has
-        # the following value:
-        # [u'https://launchpad.net/.../it/+translate/+login', u'']
-        redirection_url = request.form.get('redirection_url')
-        if isinstance(redirection_url, list):
-            # Remove blank entries.
-            redirection_url_list = [url for url in redirection_url if url]
-            # XXX Guilherme Salgado 2006-09-27:
-            # Shouldn't this be an UnexpectedFormData?
-            assert len(redirection_url_list) == 1, redirection_url_list
-            redirection_url = redirection_url_list[0]
-
-        self.email = request.form.get(self.input_email).strip()
-
-        if not valid_email(self.email):
-            self.registration_error = (
-                "The email address you provided isn't valid. "
-                "Please verify it and try again.")
-            return
-
-        # Validate the user is human, more or less.
-        if not self.validateCaptcha():
-            self.registration_error = (
-                "The answer to the simple math question was incorrect "
-                "or missing.  Please try again.")
-            return
-
-        registered_email = getUtility(IEmailAddressSet).getByEmail(self.email)
-        if registered_email is not None:
-            person = registered_email.person
-            if person is not None:
-                if person.is_valid_person:
-                    self.registration_error = (
-                        "Sorry, someone with the address %s already has a "
-                        "Launchpad account. If this is you and you've "
-                        "forgotten your password, Launchpad can "
-                        '<a href="/+forgottenpassword">reset it for you.</a>'
-                        % cgi.escape(self.email))
-                    return
-                else:
-                    # This is an unvalidated profile; let's move on with the
-                    # registration process as if we had never seen it.
-                    pass
-            else:
-                account = registered_email.account
-                assert IPerson(account, None) is None, (
-                    "This email address should be linked to the person who "
-                    "owns it.")
-                self.registration_error = (
-                    'The email address %s is already registered in the '
-                    'Launchpad Login Service (used by the Ubuntu shop and '
-                    'other OpenID sites). Please use the same email and '
-                    'password to log into Launchpad.'
-                    % cgi.escape(self.email))
-                return
-
-        logintokenset = getUtility(ILoginTokenSet)
-        token = logintokenset.new(
-            requester=None, requesteremail=None, email=self.email,
-            tokentype=LoginTokenType.NEWACCOUNT,
-            redirection_url=redirection_url)
-        token.sendNewUserEmail()
-
-    def login_success(self):
-        return (self.submitted and
-                self.request.form.get(self.submit_login) and
-                not self.login_error)
-
-    def registration_success(self):
-        return (self.submitted and
-                self.request.form.get(self.submit_registration) and
-                not self.registration_error)
-
-    def redirectMinusLogin(self):
-        """Redirect to the URL with the '/+login' removed from the end.
-
-        Also, take into account the preserved query from the URL.
-        """
-        target = self.request.URL[-1]
-        query_string = urllib.urlencode(
-            list(self.iter_form_items()), doseq=True)
-        if query_string:
-            target = '%s?%s' % (target, query_string)
-        self.request.response.redirect(target, temporary_if_possible=True)
-
-    def iter_form_items(self):
-        """Iterate over keys and single values, excluding stuff we don't
-        want such as '-C' and things starting with self.form_prefix.
-        """
-        for name, value in self.request.form.items():
-            # XXX SteveAlexander 2005-04-11: Exclude '-C' because this is
-            #     left in from sys.argv in Zope3 using python's
-            #     cgi.FieldStorage to process requests.
-            if name == '-C' or name == 'loggingout':
-                continue
-            if name.startswith(self.form_prefix):
-                continue
-            if isinstance(value, list):
-                value_list = value
-            else:
-                value_list = [value]
-            for value_list_item in value_list:
-                yield (name, value_list_item)
-
-    def preserve_query(self):
-        """Return zero or more hidden inputs that preserve the URL's query."""
-        L = []
-        html = u'<input type="hidden" name="%s" value="%s" />'
-        for name, value in self.iter_form_items():
-            # Thanks to apport (https://launchpad.net/bugs/61171), we need to
-            # do this here.
-            value = UnicodeDammit(value).markup
-            L.append(html % (name, cgi.escape(value, quote=True)))
-        return '\n'.join(L)
-
-
 def logInPrincipal(request, principal, email):
     """Log the principal in. Password validation must be done in callsites."""
     session = ISession(request)
@@ -726,59 +416,6 @@
         return ''
 
 
-class ForgottenPasswordPage(CaptchaMixin):
-
-    errortext = None
-    submitted = False
-    captcha_submission = 'captcha_submission'
-    captcha_hash = 'captcha_hash'
-    page_title = 'Need a new Launchpad password?'
-
-    def process_form(self):
-        request = self.request
-        if request.method != "POST":
-            return
-
-        # Validate the user is human, more or less.
-        if not self.validateCaptcha():
-            self.errortext = (
-                "The answer to the simple math question was incorrect "
-                "or missing.  Please try again.")
-            return
-
-        email = request.form.get("email").strip()
-        email_address = getUtility(IEmailAddressSet).getByEmail(email)
-        if email_address is None:
-            self.errortext = ("Your account details have not been found. "
-                              "Please check your subscription email "
-                              "address and try again.")
-            return
-
-        person = email_address.person
-        if person is not None and person.isTeam():
-            self.errortext = ("The email address <strong>%s</strong> "
-                              "belongs to a team, and teams cannot log in to "
-                              "Launchpad." % email)
-            return
-
-        if person is None:
-            account = email_address.account
-            redirection_url = urlappend(
-                self.request.getApplicationURL(), '+login')
-            token = getUtility(IAuthTokenSet).new(
-                account, email, email, LoginTokenType.PASSWORDRECOVERY,
-                redirection_url=redirection_url)
-        else:
-            token = getUtility(ILoginTokenSet).new(
-                person, email, email, LoginTokenType.PASSWORDRECOVERY)
-        token.sendPasswordResetEmail()
-        self.submitted = True
-        return
-
-    def success(self):
-        return self.submitted and not self.errortext
-
-
 class FeedsUnauthorizedView(UnauthorizedView):
     """All users of feeds are anonymous, so don't redirect to login."""
 

=== removed file 'lib/canonical/launchpad/webapp/tests/test_login.py'
--- lib/canonical/launchpad/webapp/tests/test_login.py	2009-07-31 19:56:48 +0000
+++ lib/canonical/launchpad/webapp/tests/test_login.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-__metaclass__ = type
-
-import unittest
-
-from canonical.launchpad.ftests import logout
-from canonical.launchpad.testing.pages import setupBrowser
-from canonical.testing import DatabaseFunctionalLayer
-
-from lp.testing import TestCase
-
-
-class TestLoginOrRegister_preserve_query(TestCase):
-    layer = DatabaseFunctionalLayer
-
-    def test_non_ascii_characters_in_query_string_ascii_encoded(self):
-        # Apport can construct ASCII-encoded URLs containing non-ASCII
-        # characters (in the query string), where they send users to so that
-        # they can finish reporting bugs. Apport shouldn't do that but we
-        # can't OOPS when it does, so we use UnicodeDammit to figure out its
-        # original encoding and decode it back. If UnicodeDammit can't figure
-        # out the correct encoding, we replace those non-ASCII characters. For
-        # more details, see https://launchpad.net/bugs/61171.
-        logout()
-        browser = setupBrowser()
-        browser.open('http://launchpad.dev/+login?foo=subproc%E9s')
-        self.assertEquals(
-            'subproc\xc3\xa9s', browser.getControl(name='foo', index=0).value)
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
--- lib/canonical/launchpad/zcml/launchpad.zcml	2010-02-18 11:01:16 +0000
+++ lib/canonical/launchpad/zcml/launchpad.zcml	2010-02-18 11:01:19 +0000
@@ -212,22 +212,6 @@
       />
 
   <browser:page
-      for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
-      template="../templates/launchpad-login.pt"
-      class="canonical.launchpad.webapp.login.LoginOrRegister"
-      permission="zope.Public"
-      name="+login-old"
-      />
-
-  <browser:page
-      for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
-      template="../templates/launchpad-forgottenpassword.pt"
-      class="canonical.launchpad.webapp.login.ForgottenPasswordPage"
-      permission="zope.Public"
-      name="+forgottenpassword"
-      />
-
-  <browser:page
       for="*"
       attribute="logout"
       class="canonical.launchpad.webapp.login.CookieLogoutPage"
@@ -243,23 +227,6 @@
       permission="zope.Public"
       />
 
-  <!-- Special login and information pages for a site restricted so that just
-       one team given in launchpad.conf may access it.  -->
-  <browser:page
-      for="canonical.launchpad.interfaces.ILaunchpadRoot"
-      name="+restricted-login"
-      template="../templates/launchpad-restrictedlogin.pt"
-      permission="zope.Public"
-      class="canonical.launchpad.webapp.login.LoginOrRegister"
-      />
-  <browser:page
-      for="canonical.launchpad.interfaces.ILaunchpadRoot"
-      name="+restricted-info"
-      template="../templates/launchpad-restrictedinfo.pt"
-      permission="zope.Public"
-      class="canonical.launchpad.webapp.login.RestrictedLoginInfo"
-      />
-
   <!-- Other non-application-specific pages. -->
 
   <browser:page

=== removed file 'lib/lp/registry/stories/person/xx-changepassword.txt'
--- lib/lp/registry/stories/person/xx-changepassword.txt	2009-09-22 20:56:12 +0000
+++ lib/lp/registry/stories/person/xx-changepassword.txt	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-==================
-Changing passwords
-==================
-
-No Privileges Person wants to change his password.
-
-    >>> user_browser.open('http://launchpad.dev/~no-priv/+changepassword')
-
-He accidentally uses an illegal character in the new password.
-
-    >>> user_browser.getControl('Current password').value = 'test'
-    >>> user_browser.getControl('New password').value = 'tésté'
-    >>> user_browser.getControl(name='field.password_dupe').value = 'tésté'
-    >>> user_browser.getControl('Change Password').click()
-    >>> print_feedback_messages(user_browser.contents)
-    There is 1 error.
-    The password provided contains non-ASCII characters.
-
-No Priv tries again, but this time he enters the wrong password!
-
-    >>> user_browser.getControl('Current password').value = 'wrong'
-    >>> user_browser.getControl('New password').value = 'test'
-    >>> user_browser.getControl(name='field.password_dupe').value = 'test'
-    >>> user_browser.getControl('Change Password').click()
-    >>> print_feedback_messages(user_browser.contents)
-    There is 1 error.
-    The provided password doesn't match your current password.
-
-He uses an illegal character in his current password, which is also the wrong
-password.
-
-    >>> user_browser.getControl('Current password').value = 'ééé'
-    >>> user_browser.getControl('New password').value = 'test'
-    >>> user_browser.getControl(name='field.password_dupe').value = 'test'
-    >>> user_browser.getControl('Change Password').click()
-    >>> print_feedback_messages(user_browser.contents)
-    There is 1 error.
-    The provided password doesn't match your current password.
-
-And finally he uses a legal password, containing only ascii characters.
-
-    >>> user_browser.getControl('Current password').value = 'test'
-    >>> user_browser.getControl('New password').value = 'abc'
-    >>> user_browser.getControl(name='field.password_dupe').value = 'abc'
-    >>> user_browser.getControl('Change Password').click()
-    >>> print user_browser.url
-    http://launchpad.dev/~no-priv
-    >>> print_feedback_messages(user_browser.contents)
-    Password changed successfully
-
-Now, No Priv logs in with his new password.
-
-    >>> anon_browser.open('http://launchpad.dev/+login')
-    >>> anon_browser.getControl('E-mail address:', index=0).value = (
-    ...     '[e-mail]')
-    >>> anon_browser.getControl('Password:').value = 'abc'
-    >>> anon_browser.getControl('Log In').click()
-    >>> print anon_browser.url
-    http://launchpad.dev
-    >>> print extract_text(find_main_content(anon_browser.contents))
-    Recent Launchpad blog posts
-    ...

=== removed file 'lib/lp/registry/stories/person/xx-createaccount.txt'
--- lib/lp/registry/stories/person/xx-createaccount.txt	2009-10-16 16:13:00 +0000
+++ lib/lp/registry/stories/person/xx-createaccount.txt	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-=================
-Create an account
-=================
-
-Jane wants to register with Launchpad, so she goes to the registration/login
-page.
-
-    >>> browser = setupBrowser()
-    >>> browser.open('http://launchpad.dev/+login')
-    >>> print extract_text(find_main_content(browser.contents))
-    Already registered?
-    ...
-    Not registered yet?
-    ...
-
-She enters an invalid email address, and gets a warning message.
-
-    >>> browser.getControl(name='loginpage_email', index=1).value = 'ab'
-    >>> browser.getControl('Register').click()
-    >>> print_feedback_messages(browser.contents)
-    The email address you provided isn't valid.  Please verify it and try
-    again.
-
-Next she enters a valid email address but enters a wrong answer for
-the incredibly trivial math captcha.  She gets an error message.
-
-    >>> browser.getControl(name='loginpage_email', index=1).value = (
-    ...     '[e-mail]')
-    >>> browser.getControl(name='loginpage_captcha_submission').value = '-1'
-    >>> browser.getControl('Register').click()
-    >>> print_feedback_messages(browser.contents)
-    The answer to the simple math question was incorrect or missing.
-    Please try again.
-
-Jane tries again, providing a the correct captcha answer.  Her valid
-email address from before has been retained in the form.
-
-    >>> from lp.testing.registration import set_captcha_answer
-    >>> set_captcha_answer(browser, prefix='loginpage_')
-    >>> browser.getControl('Register').click()
-    >>> print_feedback_messages(browser.contents)
-    >>> print extract_text(find_main_content(browser.contents))
-    Registration mail sent
-    Instructions on completing your registration have been sent to
-    [e-mail].
-    ...
-
-Launchpad sends Jane an email message containing a token she must use to
-complete the registration process.
-
-    >>> import email
-    >>> from lp.services.mail import stub
-    >>> from canonical.launchpad.ftests.logintoken import (
-    ...     get_token_url_from_email)
-
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> token_url = get_token_url_from_email(raw_msg)
-
-The email was sent to the address Jane registered.
-
-    >>> to_addrs
-    ['[e-mail]']
-
-Jane follows the link, but gets distracted before she can complete the
-registration process.
-
-    >>> browser.open(token_url)
-    >>> print extract_text(find_main_content(browser.contents))
-    Display Name:
-    Your name as you would like it displayed throughout Launchpad.  Most
-    people use their full name here.
-    Hide my email addresses from other Launchpad users
-    Create password:
-    Retype the password:
-
-While Jane was deciding whether to hide her email address, Sneaky Salgado
-manages to register her email address out from under her.
-
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from zope.component import getUtility
-
-    >>> login('[e-mail]')
-    >>> salgado = getUtility(IPersonSet).getByName('salgado')
-    >>> email = factory.makeEmail('[e-mail]', salgado)
-    >>> transaction.commit()
-
-    >>> [email.email for email in salgado.validatedemails]
-    [u'[e-mail]']
-    >>> logout()
-
-Now Jane attempts completes the registration, but she gets an error.
-
-    >>> browser.getControl('Display Name').value = 'Janerie'
-    >>> browser.getControl('Create password').value = 'foo'
-    >>> browser.getControl('Retype the password').value = 'foo'
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    There is 1 error.
-    The email address [e-mail] is already registered.
-
-Jane tries again with a different email address.
-
-    >>> browser.open('http://launchpad.dev/+login')
-    >>> browser.getControl(name='loginpage_email', index=1).value = (
-    ...     '[e-mail]')
-    >>> set_captcha_answer(browser, prefix='loginpage_')
-    >>> browser.getControl('Register').click()
-
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> token_url = get_token_url_from_email(raw_msg)
-
-    >>> to_addrs
-    ['[e-mail]']
-
-Unfortunately, Jane forgets to enter her display name.
-
-    >>> browser.open(token_url)
-    >>> browser.getControl('Create password').value = 'foo'
-    >>> browser.getControl('Retype the password').value = 'foo'
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    There is 1 error.
-    Required input is missing.
-
-She tries again, but forgets to enter a password.
-
-    >>> browser.getControl('Display Name').value = 'Janerie'
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    There is 1 error.
-    You must enter a password.
-
-Third time's a charm?  No; she forgets to confirm her password.
-
-    >>> browser.getControl('Display Name').value = 'Janerie'
-    >>> browser.getControl('Create password').value = 'foo'
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    There is 1 error.
-    Passwords do not match.
-
-The fourth time she tries a non-ascii password, which isn't allowed.
-
-    >>> browser.getControl('Display Name').value = 'Janerie'
-    >>> browser.getControl('Create password').value = 'tésté'
-    >>> browser.getControl('Retype the password').value = 'tésté'
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    There is 1 error.
-    The password provided contains non-ASCII characters.
-
-Now Jane enters all the necessary information to create the new account.  She
-decides to hide her email address.
-
-    >>> browser.getControl('Display Name').value = 'Janerie'
-    >>> browser.getControl('Create password').value = 'foo'
-    >>> browser.getControl('Retype the password').value = 'foo'
-    >>> browser.getControl(
-    ...     'Hide my email addresses from other Launchpad users').click()
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    Registration completed successfully
-
-And now the account is created.
-
-    >>> login('[e-mail]')
-    >>> jane = getUtility(IPersonSet).getByEmail('[e-mail]')
-    >>> print jane.creation_rationale.name
-    OWNER_CREATED_LAUNCHPAD
-    >>> jane.hide_email_addresses
-    True
-    >>> logout()
-
-If we try to go to that token's page again, we'll see a message explaining
-that the confirmation that token was created for is already concluded, so we
-don't need to do anything else.
-
-    >>> browser.open(token_url)
-    >>> print_feedback_messages(browser.contents)

=== removed file 'lib/lp/registry/stories/person/xx-login.txt'
--- lib/lp/registry/stories/person/xx-login.txt	2009-12-23 20:29:05 +0000
+++ lib/lp/registry/stories/person/xx-login.txt	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-======
-Log in
-======
-
-New user Foo chooses to log into Launchpad.
-
-    >>> browser = setupBrowser()
-    >>> browser.open('http://launchpad.dev/')
-    >>> browser.getLink('Log in / Register').click()
-    >>> print browser.title
-    Log in or register with Launchpad
-
-If Foo inadvertently use a non-ascii character in his password, an error
-message is displayed.
-
-    >>> browser.getControl(
-    ...     'E-mail address:', index=0).value = '[e-mail]'
-    >>> browser.getControl('Password').value = 't\xC3\xA9st'
-    >>> browser.getControl('Log In').click()
-    >>> print browser.title
-    Log in or register with Launchpad
-
-    >>> print_feedback_messages(browser.contents)
-    The password provided contains non-ASCII characters.
-
-When the user logs in, his browser is redirected to the page he was on
-before the login page.
-
-    >>> browser.getControl('E-mail address:', index=0).value = '[e-mail]'
-    >>> browser.getControl('Password').value = 'f'
-    >>> browser.getControl('Log In').click()
-    >>> print browser.title
-    Log in or register with Launchpad
-
-
-Users with suspended account cannot log in
-==========================================
-
-Users with suspended accounts cannot log into Launchpad.
-
-    # Open up the black box and shine a light on the test's inner workings.
-    # Create a user with a SUSPENDED account.
-    >>> from canonical.launchpad.interfaces.account import AccountStatus
-
-    # Only admins can suspend an account.
-    >>> login('[e-mail]')
-    >>> bad_user = factory.makePerson(
-    ...     email='[e-mail]',
-    ...     name='bad-user',
-    ...     password='test')
-    >>> from canonical.launchpad.interfaces import IMasterObject
-    >>> IMasterObject(bad_user.account).status = AccountStatus.SUSPENDED
-    >>> logout()
-    >>> transaction.commit()
-
-Bad User has a suspended account. He discovers that his account is disabled
-when he visits his profile page.
-
-    >>> browser = setupBrowser()
-    >>> browser.handleErrors = True
-    >>> browser.raiseHttpErrors = False
-    >>> browser.open('http://launchpad.dev/~bad-user')
-    >>> print browser.title
-    Error: Page gone
-
-He believes he can still use his Launchpad profile because he knows his
-password.
-
-    >>> browser.getLink('Log in / Register').click()
-    >>> print browser.title
-    Log in or register with Launchpad
-
-    >>> browser.getControl('E-mail address:', index=0).value = (
-    ... '[e-mail]')
-    >>> browser.getControl('Password').value = 'test'
-    >>> browser.getControl('Log In').click()
-    >>> print browser.title
-    Log in or register with Launchpad
-
-But he cannot log in.  He sees a error message that states he needs to contact
-a Launchpad admin.
-
-    >>> print_errors(browser.contents)
-    The email address belongs to a suspended account. Contact a Launchpad
-    admin about this issue.

=== removed file 'lib/lp/registry/stories/person/xx-reg-with-existing-email.txt'
--- lib/lp/registry/stories/person/xx-reg-with-existing-email.txt	2009-12-23 16:17:12 +0000
+++ lib/lp/registry/stories/person/xx-reg-with-existing-email.txt	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-= Registering new accounts =
-
-When registering new accounts, we always check if the email address used
-is not already registered in Launchpad.
-
-
-== Email addresses cannot be registered twice ==
-
-If the email address is registered and assigned to an account that has
-been validated, we show a message and point the user to the forgotten
-password page.
-
-    >>> browser.open('http://launchpad.dev/')
-    >>> browser.getLink('Log in / Register').click()
-
-    >>> browser.getControl('E-mail address:', index=1).value = (
-    ...     '[e-mail]')
-    >>> from lp.testing.registration import set_captcha_answer
-    >>> set_captcha_answer(browser, prefix='loginpage_')
-    >>> browser.getControl('Register').click()
-
-    >>> for message in get_feedback_messages(browser.contents):
-    ...     print message
-    Sorry, someone with the address [e-mail] already has a
-    Launchpad account. If this is you and you've forgotten your password,
-    Launchpad can reset it for you.
-
-
-== Claiming a profile via registration ==
-
-On the other hand, if the email is assigned to a profile that has not
-been validated, we pretend that we have never seen this email and move
-on with the registration process.
-
-    >>> browser.getControl('E-mail address:', index=1).value = '[e-mail]'
-    >>> set_captcha_answer(browser, prefix='loginpage_')
-    >>> browser.getControl('Register').click()
-
-    >>> print extract_text(find_tag_by_id(browser.contents, 'address'))
-    Instructions on completing your registration have been sent to...
-
-    >>> from lp.services.mail import stub
-    >>> from canonical.launchpad.ftests.logintoken import (
-    ...     get_token_url_from_email)
-    >>> from_addr, to_addr, msg = stub.test_emails.pop()
-    >>> token_url = get_token_url_from_email(msg)
-    >>> token_url
-    'http://launchpad.dev/token/...'
-
-    >>> browser.open(token_url)
-    >>> browser.url == '%s/+newaccount' % token_url
-    True
-
-    >>> browser.getControl('Name').value = 'My name'
-    >>> label = 'Hide my email addresses from other Launchpad users'
-    >>> browser.getControl(label).selected = True
-    >>> browser.getControl(name='field.password').value = 'foo'
-    >>> browser.getControl(name='field.password_dupe').value = 'foo'
-
-    >>> browser.getControl('Continue').click()
-    >>> browser.url
-    'http://launchpad.dev'
-
-    >>> for message in get_feedback_messages(browser.contents):
-    ...     print message
-    Registration completed successfully
-
-It's also possible that a person tries to register a new account using an
-email address that is already set as the preferred email of an existing
-unvalidated profile, like some accounts imported from Ubuntu's bugzilla.
-Although these accounts are not considered valid (that's why we allow the
-users to proceed with the registration as if we haven't heard of the given
-email address before), they /do/ have a preferred email and we need to handle
-this.
-
-    (To see kiko's email we must be logged in, so we'll use user_browser)
-    >>> user_browser.open('http://launchpad.dev/~kiko')
-    >>> unregistered_user_info = find_tag_by_id(
-    ...     user_browser.contents, 'not-lp-user-or-team')
-    >>> unregistered_user_info.li.renderContents()
-    '[e-mail]...'
-
-    >>> anon_browser.open('http://launchpad.dev/')
-    >>> anon_browser.getLink('Log in / Register').click()
-
-    >>> anon_browser.getControl('E-mail address:', index=1).value = (
-    ...     '[e-mail]')
-    >>> set_captcha_answer(anon_browser, prefix='loginpage_')
-    >>> anon_browser.getControl('Register').click()
-
-    >>> from_addr, to_addr, msg = stub.test_emails.pop()
-    >>> to_addr
-    ['[e-mail]']
-    >>> token_url = get_token_url_from_email(msg)
-    >>> token_url
-    'http://launchpad.dev/token/...'
-
-    >>> anon_browser.open(token_url)
-    >>> anon_browser.url == "%s/+newaccount" % token_url
-    True
-
-    >>> anon_browser.getControl('Name').value = 'My name'
-    >>> anon_browser.getControl(name='field.password').value = 'foo'
-    >>> anon_browser.getControl(name='field.password_dupe').value = 'foo'
-    >>> anon_browser.getControl('Continue').click()
-
-    >>> anon_browser.url
-    'http://launchpad.dev'
-    >>> for message in get_feedback_messages(anon_browser.contents):
-    ...     print message
-    Registration completed successfully
-
-
-== Suspended email addresses cannot use registration ==
-
-Users with suspended accounts cannot reactivate their account using
-registration.
-
-    # Open up the black box and shine a light on the test's inner workings.
-    # Create a user with a SUSPENDED account.
-    >>> from canonical.launchpad.interfaces.account import AccountStatus
-
-    # Only admins can suspend an account.
-    >>> login('[e-mail]')
-    >>> bad_user = factory.makePerson(
-    ...     email='[e-mail]',
-    ...     name='bad-user',
-    ...     password='invalid')
-    >>> from canonical.launchpad.interfaces import IMasterObject
-    >>> IMasterObject(bad_user.account).status = AccountStatus.SUSPENDED
-    >>> logout()
-
-Bad User has a suspended account. He discovers that his account is disabled
-when he visits his profile page.
-
-    >>> browser = setupBrowser()
-    >>> browser.handleErrors = True
-    >>> browser.raiseHttpErrors = False
-    >>> browser.open('http://launchpad.dev/~bad-user')
-    >>> browser.title
-    'Error: Page gone'
-
-He believes he can reactivate his account by re-registering with his
-email address.
-
-    >>> browser.getLink('Log in / Register').click()
-    >>> browser.title
-    'Log in or register with Launchpad'
-
-    >>> browser.getControl('E-mail address:', index=1).value = (
-    ...     '[e-mail]')
-    >>> set_captcha_answer(browser, prefix='loginpage_')
-    >>> browser.getControl('Register').click()
-
-    >>> print extract_text(find_main_content(browser.contents).p)
-    Instructions on completing your registration have been sent to
-    [e-mail].
-
-Bad User retrieves the URL from the email and opens it in his browser.
-
-    >>> len(stub.test_emails)
-    1
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> link = get_token_url_from_email(raw_msg)
-    >>> to_addrs
-    ['[e-mail]']
-    >>> link
-    'http://launchpad.dev/token/...'
-
-    >>> browser.open(link)
-    >>> browser.url
-    'http://launchpad.dev/token/.../+newaccount'
-
-Bad User types his name and password twice to verify it and submits it with
-the Continue button. He is disappointed to see that his account is still
-suspended, and that he is instructed to contact an admin.
-
-    >>> browser.getControl('Name').value = 'Bad User'
-    >>> browser.getControl(name='field.password').value = 'test'
-    >>> browser.getControl(name='field.password_dupe').value = 'test'
-    >>> browser.getControl('Continue').click()
-    Traceback (most recent call last):
-     ...
-    HTTPError: HTTP Error 410: Gone
-
-    >>> for tag in find_tags_by_class(
-    ...     browser.contents, 'warning'):
-    ...     print tag
-    <div ...>This profile cannot be claimed because the account is suspended.
-    Contact a <a href="mailto:[e-mail]?subject=SU...">Launchpad
-    admin</a> about this issue.</div>

=== removed file 'lib/lp/registry/stories/person/xx-resetpassword.txt'
--- lib/lp/registry/stories/person/xx-resetpassword.txt	2009-10-29 15:09:28 +0000
+++ lib/lp/registry/stories/person/xx-resetpassword.txt	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-= Reset Password =
-
-David Allouche forgot his password and he's going to use the forgotten
-password form to reset it.
-
-He locates the forgotten password link on the login page to visit
-the page.
-
-    >>> browser.open('http://launchpad.dev/+login')
-    >>> browser.getLink('Forgotten your password?').click()
-
-    >>> browser.url
-    'http://launchpad.dev/+forgottenpassword'
-
-    >>> browser.title
-    'Need a new Launchpad password?'
-
-He types the email address registered in Launchpad and submits the form.
-
-    >>> from lp.testing.registration import set_captcha_answer
-    >>> browser.getControl(name='email').value = (
-    ...     '[e-mail]')
-    >>> set_captcha_answer(browser)
-    >>> browser.getControl('Request Reset').click()
-    >>> print extract_text(find_main_content(browser.contents))
-    Need a new Launchpad password?
-    We have sent you an email with instructions to reset your password.
-
-David receives an email from Launchpad.
-
-    # Get the to-addresses and link form the email.
-    >>> from lp.services.mail import stub
-    >>> from canonical.launchpad.ftests.logintoken import (
-    ...     get_token_url_from_email)
-    >>> len(stub.test_emails)
-    1
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> link = get_token_url_from_email(raw_msg)
-
-The email was sent to him.
-
-    >>> to_addrs
-    ['[e-mail]']
-
-David uses the link in the email to visit the reset password page.
-
-    >>> link
-    'http://launchpad.dev/token/...'
-    >>> browser.open(link)
-    >>> browser.url
-    'http://launchpad.dev/token/.../+resetpassword'
-
-The token can only be used to reset the password.  Manually typing
-another login token view name will redirect to the correct one:
-
-    >>> wrong_link = link + "/+validateemail"
-    >>> browser.open(wrong_link)
-    >>> browser.url
-    'http://launchpad.dev/token/.../+resetpassword'
-
-He may now enter his password.  Unfortunately, he picks a password with
-invalid characters:
-
-    >>> browser.getControl(
-    ...     name='field.email').value = '[e-mail]'
-    >>> browser.getControl(name='field.password').value = 'é'
-    >>> browser.getControl(name='field.password_dupe').value = 'é'
-    >>> browser.getControl('Continue').click()
-
-    >>> browser.url
-    'http://launchpad.dev/token/.../+resetpassword'
-
-    >>> print_feedback_messages(browser.contents)
-    There is 1 error.
-    The password provided contains non-ASCII characters.
-
-This time, David corrects the password and continues:
-
-    >>> browser.getControl(name='field.password').value = 'test2'
-    >>> browser.getControl(name='field.password_dupe').value = 'test2'
-    >>> browser.getControl('Continue').click()
-
-    >>> browser.url
-    'http://launchpad.dev'
-
-    >>> print_feedback_messages(browser.contents)
-    Your password has been reset successfully.
-
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    David Allouche...
-
-Now that the token is consumed, he's not able to use it again.
-
-    >>> browser.open(link)
-    >>> print browser.title
-    You have already done this
-    >>> print extract_text(find_main_content(browser.contents))
-    You reached this page probably because you followed a link received by
-    email. That link was sent to confirm you have access to the email
-    address it was sent to, but this confirmation was already concluded, so
-    you don't need to do anything else.
-
-It is now possible for David to log in with his new password.  He
-logs out and then logs in again:
-
-    >>> browser.open('http://launchpad.dev/+logout')
-    >>> print_feedback_messages(browser.contents)
-    You have been logged out
-
-    >>> browser.getLink('Log in / Register').click()
-
-    >>> browser.getControl(
-    ...     'E-mail address:', index=0).value = '[e-mail]'
-    >>> browser.getControl('Password').value = 'test2'
-    >>> browser.getControl('Log In').click()
-
-    >>> browser.url
-    'http://launchpad.dev'
-
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    David Allouche...
-
-
-== Reset is protected by a math captcha ==
-
-When requesting a password reset David is presented with a simple math
-problem which must be solved correctly before proceeding.
-
-    >>> browser.open('http://launchpad.dev/+forgottenpassword')
-    >>> browser.getControl(name='email').value = (
-    ...     '[e-mail]')
-    >>> browser.getControl(name='captcha_submission').value = '-1'
-    >>> browser.getControl('Request Reset').click()
-    >>> print_feedback_messages(browser.contents)
-    The answer to the simple math question was incorrect or missing. Please try again.
-
-
-== Using email addresses other than the preferred one ==
-
-Any of a person's validated email addresses can be used to reset his
-password.
-
-David has a second email address ([e-mail]), which he will
-use to reset his password now.
-
-    >>> browser = setupBrowser()
-    >>> browser.open('http://launchpad.dev/+login')
-    >>> browser.getLink('Forgotten your password?').click()
-    >>> browser.getControl(name='email').value = '[e-mail]'
-    >>> set_captcha_answer(browser)
-    >>> browser.getControl('Request Reset').click()
-    >>> print_feedback_messages(browser.contents)
-
-He follows the link sent to his email just like he did before.
-
-    >>> len(stub.test_emails)
-    1
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> link = get_token_url_from_email(raw_msg)
-    >>> browser.open(link)
-    >>> browser.url
-    'http://launchpad.dev/token/.../+resetpassword'
-
-And then resets his password.
-
-    >>> browser.getControl(name='field.email').value = '[e-mail]'
-    >>> browser.getControl(name='field.password').value = 'test3'
-    >>> browser.getControl(name='field.password_dupe').value = 'test3'
-    >>> browser.getControl('Continue').click()
-    >>> browser.url
-    'http://launchpad.dev'
-    >>> print_feedback_messages(browser.contents)
-    Your password has been reset successfully.
-
-
-== Teams do not have passwords ==
-
-Teams do not have passwords, they cannot be reset.
-
-    >>> browser.open('http://launchpad.dev/+forgottenpassword')
-    >>> browser.getControl(name='email').value = '[e-mail]'
-    >>> set_captcha_answer(browser)
-    >>> browser.getControl('Request Reset').click()
-    >>> print_feedback_messages(browser.contents)
-    The email address [e-mail]
-    belongs to a team, and teams cannot log in to Launchpad.

=== removed file 'lib/lp/registry/stories/team/xx-team-restricted.txt'
--- lib/lp/registry/stories/team/xx-team-restricted.txt	2009-11-22 15:43:16 +0000
+++ lib/lp/registry/stories/team/xx-team-restricted.txt	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-= Team-restricted Launchpad =
-
-It is possible to run Launchpad in a special mode where access is restricted
-to Launchpad admins and members of a particular team.
-
-You turn on this feature by setting the 'restrict_to_team' variable in the
-launchpad.conf file.
-
-  <launchpad>
-    restrict_to_team teamname
-    ...
-  </launchpad>
-
-We'll temporarily restrict Launchpad to be used only by Launchpad admins
-and Landscape developers.
-
-    >>> from canonical.config import config
-    >>> config.launchpad.restrict_to_team == ''
-    True
-
-    >>> restrict_data = """
-    ...     [launchpad]
-    ...     restrict_to_team: landscape-developers
-    ...     """
-    >>> config.push('restrict_data', restrict_data)
-
-When in this condition, anonymous users are shown a special trimmed-down
-login page when they go to any page.
-
-    >>> browser.open("http://launchpad.dev/people")
-    >>> print browser.url
-    http://launchpad.dev/+restricted-login?production=http%3A//launchpad.net/people
-
-A link is provided to the equivalent page on the non-restricted
-Launchpad instance:
-
-    >>> print browser.contents
-    <...
-    <p>
-    You may be able to access this page
-    <a href="http://launchpad.net/people">on the main
-    Launchpad site</a> instead.
-    </p>
-    ...
-
-This includes nonsense URLs and not-found URLs.
-
-    >>> browser.open("http://bugs.launchpad.dev/p/p/p/p?key=value")
-    >>> print browser.url
-    http://bugs.launchpad.dev/+restricted-login?production=http%3A//bugs.launchpad.net/p/p/p/p%3Fkey%3Dvalue
-    >>> print browser.contents
-    <...
-    <p>
-    You may be able to access this page
-    <a href="http://bugs.launchpad.net/p/p/p/p?key=value">on the main
-    Launchpad site</a> instead.
-    </p>
-    ...
-
-That is, any page except an information page about the restriction.
-
-    >>> browser.open("http://launchpad.dev/+restricted-info")
-    >>> print browser.url
-    http://launchpad.dev/+restricted-info
-
-Anyway, the anonymous user logs in as name16 ([e-mail]), who
-is in the admin team, and gets redirected to the front page.
-
-    >>> def submit_login(browser_instance, email, password):
-    ...     emailcontrol = browser_instance.getControl(name="loginpage_email")
-    ...     passwordcontrol = browser_instance.getControl(
-    ...         name="loginpage_password")
-    ...     emailcontrol.value = email
-    ...     passwordcontrol.value = password
-    ...     submitbutton = browser_instance.getControl(
-    ...         name="loginpage_submit_login")
-    ...     submitbutton.click()
-
-    >>> browser.open("http://launchpad.dev/p/p/p/p")
-    >>> print browser.url
-    http://launchpad.dev/+restricted-login?production=http%3A//launchpad.net/p/p/p/p
-    >>> submit_login(browser, '[e-mail]', 'test')
-    >>> print browser.url
-    http://launchpad.dev
-
-Let's log out name16 ([e-mail]), and log in someone else.
-name12 ([e-mail]) is in the landscape-developers team, so will
-be able to log in.
-
-    >>> browser.getControl(name="logout").click()
-    >>> print browser.url
-    http://launchpad.dev/+restricted-login?production=http%3A//launchpad.net/%3Floggingout%3D1
-    >>> submit_login(browser, '[e-mail]', 'test')
-    >>> print browser.url
-    http://launchpad.dev
-
-We'll now log out name12 ([e-mail]), and try to log in cprov, who
-isn't an admin, and isn't a landscape-developer.  So, he gets sent to the info
-page to explain why he can't use the server.
-
-    >>> browser.getControl(name="logout").click()
-    >>> print browser.url
-    http://launchpad.dev/+restricted-login?production=http%3A//launchpad.net/%3Floggingout%3D1
-    >>> submit_login(browser, '[e-mail]', 'cprov')
-    >>> print browser.url
-    http://launchpad.dev/+restricted-info?production=http%3A//launchpad.net/
-
-Now that the user is logged in, they will be directed to the
-+restricted-info page if they try to browse other pages:
-
-    >>> browser.open("http://bugs.launchpad.dev/evolution")
-    >>> print browser.url
-    http://bugs.launchpad.dev/+restricted-info?production=http%3A//bugs.launchpad.net/evolution
-    >>> print browser.contents
-    <...
-    <p>You may be able to
-    access this page
-    <a href="http://bugs.launchpad.net/evolution">on the main
-    Launchpad site</a> instead.</p>
-    ...
-
-Set restrict_to_team back to being a server that is open to anyone.
-
-    >>> config_data = config.pop('restrict_data')
-
-Note that the info page still works even when the server is open.
-
-    >>> browser.open("http://launchpad.dev/+restricted-info")
-    >>> print browser.contents
-    <...This server is open to anonymous access and registered users...
-
-The restricted login page redirects to the normal login page.
-
-    >>> browser.open("http://launchpad.dev/+restricted-login")
-    >>> print browser.url
-    http://launchpad.dev/+login
-

=== removed file 'lib/lp/services/openid/stories/xx-resetpassword-of-sso-account.txt'
--- lib/lp/services/openid/stories/xx-resetpassword-of-sso-account.txt	2009-12-04 22:36:22 +0000
+++ lib/lp/services/openid/stories/xx-resetpassword-of-sso-account.txt	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-= Resetting the password of SSO-only accounts =
-
-Every once in a while people come to register Launchpad accounts using email
-addresses that belong to SSO-only accounts.  In these cases we explain to them
-that they should use the SSO credentials to log into Launchpad, but it's
-possible that they've forgotten their password so they'll try to use the
-'Forgotten your password?' link to reset it.
-
-Since their account is SSO-only (i.e. it has no Person record associated
-with), we can't use Launchpad's workflow for resetting the password -- it
-expects a Person entry to be associated with the given email addres. Because
-of that we'll allow the user to initiate the password-reset workflow on
-Launchpad but we'll force the use of SSO's password-reset workflow to complete
-it.
-
-    # Create a personless account to demostrate what we want.
-    >>> login(ANONYMOUS)
-    >>> account = factory.makeAccount('Test', email='[e-mail]')
-    >>> logout()
-
-Trying to register will give an error, telling the user to use the SSO
-credentials to login.
-
-    >>> from lp.testing.registration import set_captcha_answer
-    >>> browser.open('http://launchpad.dev/+login')
-    >>> browser.getControl(name='loginpage_email', index=1).value = (
-    ...     '[e-mail]')
-    >>> set_captcha_answer(browser, prefix='loginpage_')
-    >>> browser.getControl('Register').click()
-    >>> print_feedback_messages(browser.contents)
-    The email address [e-mail] is already registered in the Launchpad
-    Login Service... Please use the same email and password to log into
-    Launchpad.
-
-But the user has forgotten their credentials, so they'll have to reset the
-password.
-
-    >>> browser.getLink('Forgotten your password?').click()
-    >>> browser.url
-    'http://launchpad.dev/+forgottenpassword'
-    >>> browser.getControl(name='email').value = '[e-mail]'
-    >>> set_captcha_answer(browser)
-    >>> browser.getControl('Request Reset').click()
-    >>> print extract_text(find_main_content(browser.contents))
-    Need a new Launchpad password?
-    We have sent you an email with instructions to reset your password.
-
-    # Get the link from the email.
-    >>> from lp.services.mail import stub
-    >>> from canonical.launchpad.ftests.logintoken import (
-    ...     get_token_url_from_email)
-    >>> len(stub.test_emails)
-    1
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> link = get_token_url_from_email(raw_msg)
-    >>> to_addrs
-    ['[e-mail]']
-
-Following the link sent by email will take the user to the SSO site to
-complete the password reset.
-
-    >>> browser.open(link)
-    >>> browser.url
-    'http://openid.launchpad.dev/token/.../+resetpassword'
-    >>> browser.getControl(name='field.email').value = '[e-mail]'
-    >>> browser.getControl(name='field.password').value = 'test'
-    >>> browser.getControl(name='field.password_dupe').value = 'test'
-    >>> browser.getControl('Continue').click()
-    >>> print_feedback_messages(browser.contents)
-    Your password has been reset successfully.
-
-Since the password reset was done on SSO, the user won't be logged into
-Launchpad, so we redirect the user back to Launchpad's +login page for them to
-login.
-
-    >>> browser.url
-    'http://launchpad.dev/+login'
-    >>> browser.getControl(
-    ...     'E-mail address:', index=0).value = '[e-mail]'
-    >>> browser.getControl('Password').value = 'test'
-    >>> browser.getControl('Log In').click()
-    >>> print extract_text(find_tag_by_id(browser.contents, 'logincontrol'))
-    Test...