Merge lp:~salgado/launchpad/remove-logintoken-unused-code into lp:launchpad

[Guilherme Salgado]

Remove views (and logintoken code) for registering new accounts and resetting passwords as this is now handled by the OpenID provider.

[Jonathan Lange (jml)]

Rubber-stamp. Haven't actually examined the diff.

review: Approve

=== modified file 'lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt'
--- lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt	2009-07-17 15:26:05 +0000
+++ lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt	2010-04-05 17:13:29 +0000
@@ -7,25 +7,24 @@
 
 === Double Post on the NewAccountView ===
 
-Using the +newaccount view on a token that was already confirmed should
+Using the +validateemail view on a token that was already consumed should
 redirect to the default token view. This would happen if for example the
-user tried to re-post the form after registering his or her account.
+user tried to re-post the form after validating one of their email addresses.
 
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from canonical.launchpad.interfaces import (
     ...     ILoginTokenSet, LoginTokenType)
-    >>> from canonical.launchpad.browser import NewUserAccountView
+    >>> from canonical.launchpad.browser import ValidateEmailView
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
+    >>> foo_bar = getUtility(IPersonSet).getByName('name16')
     >>> token = getUtility(ILoginTokenSet).new(
-    ...     requester=None, requesteremail=None, 
-    ...     email='[e-mail]', tokentype=LoginTokenType.NEWACCOUNT)
+    ...     requester=foo_bar, requesteremail='[e-mail]', 
+    ...     email='[e-mail]', tokentype=LoginTokenType.VALIDATEEMAIL)
     >>> token.consume()
-    >>> form = {'field.actions.continue':	'Continue',
-    ...         'field.displayname': 'Alex', 
-    ...         'field.hide_email_addresses': 'off',
-    ...         'field.password': '23-is-the-answer',
-    ...         'field.password_dupe': '23-is-the-answer'}
-    >>> view = NewUserAccountView(token, LaunchpadTestRequest(form=form))
+    >>> form = {'field.actions.continue': 'Continue'}
+    >>> view = ValidateEmailView(
+    ...     token, LaunchpadTestRequest(form=form, method='POST'))
     >>> view.initialize()
     
     >>> response = view.request.response

=== modified file 'lib/canonical/launchpad/browser/logintoken.py'
--- lib/canonical/launchpad/browser/logintoken.py	2010-03-12 19:56:06 +0000
+++ lib/canonical/launchpad/browser/logintoken.py	2010-04-05 17:13:29 +0000
@@ -11,8 +11,6 @@
     'LoginTokenSetNavigation',
     'LoginTokenView',
     'MergePeopleView',
-    'NewUserAccountView',
-    'ResetPasswordView',
     'ValidateEmailView',
     'ValidateTeamEmailView',
     'ValidateGPGKeyView',
@@ -24,16 +22,13 @@
 
 from zope.app.form.browser import TextAreaWidget
 from zope.component import getUtility
-from zope.event import notify
 from zope.interface import alsoProvides, directlyProvides, Interface
-from zope.lifecycleevent import ObjectCreatedEvent
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.database.sqlbase import flush_database_updates
 from canonical.launchpad import _
-from canonical.launchpad.interfaces.account import AccountStatus, IAccountSet
-from canonical.launchpad.interfaces.authtoken import (
-    IAuthToken, LoginTokenType)
+from canonical.launchpad.interfaces.account import AccountStatus
+from canonical.launchpad.interfaces.authtoken import LoginTokenType
 from canonical.launchpad.interfaces.emailaddress import (
     EmailAddressStatus, IEmailAddressSet)
 from canonical.launchpad.interfaces.gpghandler import (
@@ -53,8 +48,7 @@
 from canonical.widgets import LaunchpadRadioWidget, PasswordChangeWidget
 
 from lp.registry.browser.team import HasRenewalPolicyMixin
-from lp.registry.interfaces.person import (
-    INewPersonForm, IPerson, IPersonSet, ITeam, PersonCreationRationale)
+from lp.registry.interfaces.person import IPerson, IPersonSet, ITeam
 
 
 UTC = pytz.UTC
@@ -77,15 +71,9 @@
     they got this token because they tried to do something that required email
     address confirmation, but that confirmation is already concluded.
     """
-    auth_token_pages = {
-        LoginTokenType.NEWPERSONLESSACCOUNT: '+newaccount',
-        LoginTokenType.PASSWORDRECOVERY: '+resetpassword',
+    PAGES = {
+        LoginTokenType.ACCOUNTMERGE: '+accountmerge',
         LoginTokenType.VALIDATEEMAIL: '+validateemail',
-        }
-    login_token_pages = {
-        LoginTokenType.NEWPROFILE: '+newaccount',
-        LoginTokenType.NEWACCOUNT: '+newaccount',
-        LoginTokenType.ACCOUNTMERGE: '+accountmerge',
         LoginTokenType.VALIDATETEAMEMAIL: '+validateteamemail',
         LoginTokenType.VALIDATEGPG: '+validategpg',
         LoginTokenType.VALIDATESIGNONLYGPG: '+validatesignonlygpg',
@@ -93,8 +81,6 @@
         LoginTokenType.TEAMCLAIM: '+claimteam',
         LoginTokenType.BUGTRACKER: '+bugtracker-handshake',
         }
-    login_token_pages.update(auth_token_pages)
-    PAGES = login_token_pages
     page_title = 'You have already done this'
     label = 'Confirmation already concluded'
 
@@ -198,81 +184,6 @@
         return True
 
 
-class ResetPasswordView(BaseTokenView, LaunchpadFormView):
-
-    schema = IAuthToken
-    field_names = ['email', 'password']
-    custom_widget('password', PasswordChangeWidget)
-    label = 'Reset password'
-    expected_token_types = (LoginTokenType.PASSWORDRECOVERY,)
-
-    def initialize(self):
-        self.redirectIfInvalidOrConsumedToken()
-        super(ResetPasswordView, self).initialize()
-
-    def validate(self, form_values):
-        """Validate the email address."""
-        email = form_values.get("email", "").strip()
-        # All operations with email addresses must be case-insensitive. We
-        # enforce that in EmailAddressSet, but here we only do a comparison,
-        # so we have to .lower() them first.
-        if email.lower() != self.context.email.lower():
-            self.addError(_(
-                "The email address you provided didn't match the address "
-                "you provided when requesting the password reset."))
-
-    @property
-    def default_next_url(self):
-        if self.context.redirection_url is not None:
-            return self.context.redirection_url
-        else:
-            return self.request.getApplicationURL()
-
-    @action(_('Continue'), name='continue')
-    def continue_action(self, action, data):
-        """Reset the user's password. When password is successfully changed,
-        the AuthToken (self.context) used is consumed, so nobody can use
-        it again.
-        """
-        account = self.context.requester_account
-        # Suspended accounts cannot reset their password.
-        reason = ('Your password cannot be reset because your account '
-                  'is suspended.')
-        if self.accountWasSuspended(account, reason):
-            return
-
-        naked_account = removeSecurityProxy(account)
-        # Reset password can be used to reactivate a deactivated account.
-        inactive_states = [AccountStatus.DEACTIVATED, AccountStatus.NOACCOUNT]
-        if account.status in inactive_states:
-            self.reactivate(data)
-            self.request.response.addInfoNotification(
-                _('Welcome back to Launchpad.'))
-        else:
-            naked_account.password = data.get('password')
-
-        self.context.consume()
-        self.logInPrincipalByEmail(self.context.email)
-
-        self.request.response.addInfoNotification(
-            _('Your password has been reset successfully.'))
-
-    @action(_('Cancel'), name='cancel', validator='validate_cancel')
-    def cancel_action(self, action, data):
-        self._cancel()
-
-    def reactivate(self, data):
-        """Reactivate the person (and account) of this token."""
-        emailaddress = getUtility(IEmailAddressSet).getByEmail(
-            self.context.email)
-        # Need to remove the security proxy of the account because at this
-        # point the user is not logged in.
-        removeSecurityProxy(self.context.requester).reactivate(
-            comment="User reactivated the account using reset password.",
-            password=data['password'],
-            preferred_email=emailaddress)
-
-
 class ClaimProfileView(BaseTokenView, LaunchpadFormView):
     schema = IPerson
     field_names = ['displayname', 'hide_email_addresses', 'password']
@@ -545,7 +456,8 @@
     label = 'Confirm e-mail address'
 
     def initialize(self):
-        self.redirectIfInvalidOrConsumedToken()
+        if self.redirectIfInvalidOrConsumedToken():
+            return
         super(ValidateEmailView, self).initialize()
 
     def validate(self, data):
@@ -746,136 +658,3 @@
         self.request.response.setStatus(200)
         self.request.response.setHeader('Content-type', 'text/plain')
         return "Handshake token validated."
-
-
-class NewUserAccountView(BaseTokenView, LaunchpadFormView):
-    """Page to create a new Launchpad user account."""
-
-    created_person = None
-
-    schema = INewPersonForm
-    field_names = ['displayname', 'hide_email_addresses', 'password']
-    custom_widget('password', PasswordChangeWidget)
-    label = 'Complete your registration'
-    expected_token_types = (
-        LoginTokenType.NEWACCOUNT, LoginTokenType.NEWPROFILE)
-
-    def initialize(self):
-        if self.redirectIfInvalidOrConsumedToken():
-            return
-        else:
-            self.email = getUtility(IEmailAddressSet).getByEmail(
-                self.context.email)
-            super(NewUserAccountView, self).initialize()
-
-    @property
-    def default_next_url(self):
-        if self.context.redirection_url:
-            return self.context.redirection_url
-        elif self.created_person is not None:
-            return canonical_url(self.created_person)
-        else:
-            return None
-
-    def validate(self, form_values):
-        """Verify if the email address is not used by an existing account."""
-        if self.email is not None:
-            if self.email.person is not None:
-                person = IMasterObject(self.email.person)
-                if person.is_valid_person:
-                    self.addError(_(
-                        'The email address ${email} is already registered.',
-                        mapping=dict(email=self.context.email)))
-            else:
-                self.addError(_(
-                    'The email address ${email} 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.',
-                    mapping=dict(email=self.context.email)))
-
-
-    @action(_('Continue'), name='continue')
-    def continue_action(self, action, data):
-        """Create a new Person with the context's email address and set a
-        preferred email and password to it, or use an existing Person
-        associated with the context's email address, setting it as the
-        preferred address and also setting the password.
-
-        If everything went ok, we consume the LoginToken (self.context), so
-        nobody can use it again.
-        """
-        if self.email is not None:
-            assert self.email.person is not None, (
-                "People trying to register using emails associated with "
-                "personless accounts should be told to just use their Login "
-                "Service credentials to log into LP")
-            # This is a placeholder profile automatically created by one of
-            # our scripts, let's just confirm its email address and set a
-            # password.
-            person = getUtility(IPersonSet).get(
-                removeSecurityProxy(self.email).personID)
-            assert not person.is_valid_person, (
-                'Account %s has already been claimed and this should '
-                'have been caught by the validate() method.' % person.name)
-            email = self.email
-            # The user is not yet logged in, but we need to set some
-            # things on his new account, so we need to remove the security
-            # proxy from it.
-            # XXX: Guilherme Salgado 2006-09-27 bug=62674:
-            # We should be able to login with this person and set the
-            # password, to avoid removing the security proxy, but it didn't
-            # work, so I'm leaving this hack for now.
-            naked_person = removeSecurityProxy(person)
-            # Suspended accounts cannot reactivate their profile.
-            reason = ('This profile cannot be claimed because the account '
-                'is suspended.')
-            if self.accountWasSuspended(person.account, reason):
-                return
-            naked_person.displayname = data['displayname']
-            naked_person.hide_email_addresses = data['hide_email_addresses']
-            # Need to remove the security proxy of the account because at this
-            # point the user is not logged in.
-            account = removeSecurityProxy(IMasterObject(person.account))
-            account.activate(
-                "Activated by new account.",
-                password=data['password'],
-                preferred_email=self.email)
-            naked_person.creation_rationale = self._getCreationRationale()
-            naked_person.creation_comment = None
-        else:
-            account, person, email = self._createAccountEmailAndMaybePerson(
-                data['displayname'], data['hide_email_addresses'],
-                data['password'])
-
-        self.context.consume()
-        self.logInPrincipalByEmail(removeSecurityProxy(email).email)
-        self.created_person = person
-        self.request.response.addInfoNotification(_(
-            "Registration completed successfully"))
-
-    def _getCreationRationale(self):
-        """The creation rationale that should be used for this account."""
-        return PersonCreationRationale.OWNER_CREATED_LAUNCHPAD
-
-    def _createAccountEmailAndMaybePerson(
-            self, displayname, hide_email_addresses, password):
-        """Create and return a new Account, Person and EmailAddress.
-
-        This method will always create an Account (in the ACTIVE state),
-        an EmailAddress as the account's preferred one and a Person.
-
-        Also fire ObjectCreatedEvents for both the newly created Account,
-        EmailAddress, and Person.
-        """
-        person, email = getUtility(IPersonSet).createPersonAndEmail(
-            self.context.email, rationale=self._getCreationRationale(),
-            displayname=displayname, password=password,
-            passwordEncrypted=True, hide_email_addresses=hide_email_addresses)
-        person.validateAndEnsurePreferredEmail(email)
-        account = getUtility(IAccountSet).get(person.accountID)
-        removeSecurityProxy(account).status = AccountStatus.ACTIVE
-        notify(ObjectCreatedEvent(person))
-        notify(ObjectCreatedEvent(account))
-        notify(ObjectCreatedEvent(email))
-        return account, person, email

=== modified file 'lib/canonical/launchpad/browser/tests/test_logintoken.py'
--- lib/canonical/launchpad/browser/tests/test_logintoken.py	2009-11-03 17:13:21 +0000
+++ lib/canonical/launchpad/browser/tests/test_logintoken.py	2010-04-05 17:13:29 +0000
@@ -6,7 +6,7 @@
 from zope.component import getUtility
 
 from canonical.launchpad.browser.logintoken import (
-    ClaimTeamView, ResetPasswordView, ValidateEmailView, ValidateGPGKeyView)
+    ClaimTeamView, ValidateEmailView, ValidateGPGKeyView)
 from canonical.launchpad.ftests import LaunchpadFormHarness
 from canonical.launchpad.interfaces.authtoken import LoginTokenType
 from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
@@ -29,12 +29,6 @@
         self.email = self.person.preferredemail.email
         self.expected_next_url = 'http://127.0.0.1/~test-user'
 
-    def test_ResetPasswordView(self):
-        token = getUtility(ILoginTokenSet).new(
-            self.person, self.email, self.email,
-            LoginTokenType.PASSWORDRECOVERY)
-        self._testCancelAction(ResetPasswordView, token)
-
     def test_ClaimTeamView(self):
         token = getUtility(ILoginTokenSet).new(
             self.person, self.email, self.email, LoginTokenType.TEAMCLAIM)

=== removed file 'lib/canonical/launchpad/browser/tests/test_password_reset.py'
--- lib/canonical/launchpad/browser/tests/test_password_reset.py	2010-03-11 20:54:36 +0000
+++ lib/canonical/launchpad/browser/tests/test_password_reset.py	1970-01-01 00:00:00 +0000
@@ -1,94 +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 zope.security.proxy import removeSecurityProxy
-
-import transaction
-from canonical.launchpad.browser.logintoken import ResetPasswordView
-from canonical.launchpad.ftests import LaunchpadFormHarness
-from canonical.launchpad.interfaces.account import AccountStatus
-from canonical.launchpad.interfaces.authtoken import LoginTokenType
-from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
-from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
-from canonical.launchpad.interfaces.lpstorm import IMasterObject
-from lp.testing import TestCaseWithFactory
-from canonical.testing import DatabaseFunctionalLayer
-
-
-class TestPasswordReset(TestCaseWithFactory):
-    layer = DatabaseFunctionalLayer
-    email = '[e-mail]'
-
-    def _create_inactive_person(self):
-        self.person = self.factory.makePerson(
-            email=self.email, email_address_status=EmailAddressStatus.NEW)
-        self.account = self.person.account
-        self.assertEquals(self.account.status, AccountStatus.NOACCOUNT)
-
-    def test_inactive_accounts_are_activated(self):
-        # Resetting the password of an account in the NOACCOUNT state will
-        # activate it.
-        self._create_inactive_person()
-        self._resetPassword(ensure_no_errors=True)
-        self.assertEquals(self.account.status, AccountStatus.ACTIVE)
-        self.assertEquals(
-            self.account.preferredemail.email, '[e-mail]')
-
-    def _create_deactivated_person(self):
-        self.person = self.factory.makePerson(email=self.email)
-        removeSecurityProxy(self.person).deactivateAccount('Testing')
-        # Get the account from the master DB to make sure it has the changes
-        # we did above.
-        self.account = IMasterObject(self.person.account)
-        self.assertEquals(self.account.status, AccountStatus.DEACTIVATED)
-
-    def test_deactivated_accounts_are_reactivated(self):
-        # Resetting the password of an account in the DEACTIVATED state will
-        # reactivate it.
-        self._create_deactivated_person()
-        self._resetPassword(ensure_no_errors=True)
-        self.assertEquals(self.account.status, AccountStatus.ACTIVE)
-        self.assertEquals(
-            self.account.preferredemail.email, '[e-mail]')
-
-    def _create_suspended_person(self):
-        self.person = self.factory.makePerson(email=self.email)
-        # Get the account from the master DB as we're going to change it.
-        self.account = IMasterObject(self.person.account)
-        removeSecurityProxy(self.account).status = AccountStatus.SUSPENDED
-        self.assertEquals(self.account.status, AccountStatus.SUSPENDED)
-
-    def test_suspended_accounts_cannot_reset_password(self):
-        # It's not possible to reset the password of a SUSPENDED account.
-        self._create_suspended_person()
-        harness = self._resetPassword()
-        notifications = [notification.message
-                         for notification in harness.request.notifications]
-        self.assertIn(
-            'Your password cannot be reset because your account is suspended',
-            '\n'.join(notifications))
-        self.assertEquals(self.account.status, AccountStatus.SUSPENDED)
-
-    def _resetPassword(self, ensure_no_errors=False):
-        token = getUtility(ILoginTokenSet).new(
-            self.person, self.email, self.email,
-            LoginTokenType.PASSWORDRECOVERY)
-        harness = LaunchpadFormHarness(token, ResetPasswordView)
-        form = {'field.email': self.email,
-                'field.password': 'test',
-                'field.password_dupe': 'test'}
-        harness.submit('continue', form)
-        if ensure_no_errors:
-            self.assertFalse(harness.hasErrors())
-        # Need to manually commit because we're interested in testing the
-        # changes done by the view on the token's requester (i.e.
-        # self.person).
-        transaction.commit()
-        return harness
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/canonical/launchpad/database/logintoken.py'
--- lib/canonical/launchpad/database/logintoken.py	2010-03-05 13:04:06 +0000
+++ lib/canonical/launchpad/database/logintoken.py	2010-04-05 17:13:29 +0000
@@ -152,23 +152,6 @@
         subject = 'Launchpad: Confirm your OpenPGP Key'
         self._send_email(from_name, subject, text)
 
-    def sendPasswordResetEmail(self):
-        """See ILoginToken."""
-        template = get_email_template('forgottenpassword.txt')
-        from_name = "Launchpad"
-        message = template % dict(token_url=canonical_url(self))
-        subject = "Launchpad: Forgotten Password"
-        self._send_email(from_name, subject, message)
-
-    def sendNewUserEmail(self):
-        """See ILoginToken."""
-        template = get_email_template('newuser-email.txt')
-        message = template % dict(token_url=canonical_url(self))
-
-        from_name = "Launchpad"
-        subject = "Launchpad: complete your registration"
-        self._send_email(from_name, subject, message)
-
     def sendProfileCreatedEmail(self, profile, comment):
         """See ILoginToken."""
         template = get_email_template('profile-created.txt')

=== modified file 'lib/canonical/launchpad/doc/logintoken-pages.txt'
--- lib/canonical/launchpad/doc/logintoken-pages.txt	2009-04-17 10:32:16 +0000
+++ lib/canonical/launchpad/doc/logintoken-pages.txt	2010-04-05 17:13:29 +0000
@@ -1,19 +1,18 @@
 = LoginToken pages =
 
-Users interact with login tokens for operations that require the user to
-prove he has access to a resource that is external to Launchpad. For
-example, claiming an email address or resetting a password require the
-user to use the login token sent to him in an email.
-
-
-== Reset password view ==
-
-A user can reset his password if he forgets it. A link for a LoginToken
-is sent to the email address that the user claims is his. The view
-displays a form asking the user to confirm his email address and provide
-a new password.
-
-    >>> from zope.component import getMultiAdapter, getUtility
+Users interact with login tokens for operations that require the user to prove
+he has access to a resource that is external to Launchpad. For example,
+claiming an email address or a OpenPGP key require the user to use the login
+token sent to him in an email.
+
+
+== Claiming a profile ==
+
+The ClaimProfileView allows users to claim accounts created by Launchpad
+processes. The user profile for Matsubara was created during an import.
+The user profile does not have a preferred email address or a password.
+
+    >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
     >>> from canonical.launchpad.interfaces.logintoken import (
     ...     ILoginTokenSet)
@@ -24,159 +23,7 @@
     # of gettint it as a zope secured utility. If we don't do that we'd have
     # to remove the security proxy of the person objects all the time.
     >>> person_set = PersonSet()
-    >>> no_priv = person_set.getByEmail('[e-mail]')
-    >>> old_password = no_priv.account.password
-
     >>> login_token_set = getUtility(ILoginTokenSet)
-    >>> login_token = login_token_set.new(
-    ...     no_priv, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.PASSWORDRECOVERY)
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+resetpassword' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.email': '[e-mail]',
-    ...         'field.password': 'test1',
-    ...         'field.password_dupe': 'test1',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> resetpassword_view = getMultiAdapter(
-    ...     (login_token, request), name="+resetpassword")
-    >>> resetpassword_view.initialize()
-    >>> old_password == no_priv.account.password
-    False
-
-If the user submits the wrong email address for the token, an error is
-stored. The password is not reset.
-
-    >>> login_token = login_token_set.new(
-    ...     no_priv, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.PASSWORDRECOVERY)
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+resetpassword' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.email': '[e-mail]',
-    ...         'field.password': 'test2',
-    ...         'field.password_dupe': 'test2',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> resetpassword_view = getMultiAdapter(
-    ...     (login_token, request), name="+resetpassword")
-    >>> resetpassword_view.initialize()
-    >>> resetpassword_view.errors
-    [u"The email address ... didn't match ... the password reset."]
-
-    >>> old_password == no_priv.account.password
-    True
-
-
-=== Reactivating an account using reset password ===
-
-A user with a DEACTIVATED account does not have a password--he must use
-the +resetpassword view to set his account to ACTIVE and add a password.
-
-    >>> from canonical.launchpad.interfaces import IMasterObject
-    >>> former_user = IMasterObject(
-    ...     person_set.getByEmail('[e-mail]'))
-    >>> former_user.name
-    u'former-user-deactivatedaccount'
-
-    >>> former_user.account.status
-    <DBItem AccountStatus.DEACTIVATED, ...>
-    >>> print former_user.account.password
-    None
-
-    >>> login_token = login_token_set.new(
-    ...     former_user, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.PASSWORDRECOVERY)
-    >>> transaction.commit()
-
-If the user provides the correct email address for the token, the
-password is reset, and the account status is set ACTIVE.
-
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+resetpassword' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.email': '[e-mail]',
-    ...         'field.password': 'test3',
-    ...         'field.password_dupe': 'test3',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> resetpassword_view = getMultiAdapter(
-    ...     (login_token, request), name="+resetpassword")
-    >>> resetpassword_view.initialize()
-    >>> transaction.commit()
-
-    >>> former_user.name
-    u'former-user'
-    >>> former_user.account.status
-    <DBItem AccountStatus.ACTIVE, ...>
-    >>> former_user.is_valid_person
-    True
-
-
-== Reset password cannot reactivate a Suspended account ==
-
-A user with a SUSPENDED account cannot use +resetpassword view to set his
-account to ACTIVE, nor will it reset his password.
-
-    >>> from canonical.launchpad.interfaces.account import AccountStatus
-
-    # Admins can suspend an account and access the user's password.
-    >>> login('[e-mail]')
-    >>> suspended_user =  factory.makePerson(
-    ...     email='[e-mail]',
-    ...     name='suspended-user',
-    ...     password='invalid')
-    >>> suspended_account = IMasterObject(suspended_user.account)
-    >>> suspended_account.status = AccountStatus.SUSPENDED
-    >>> original_password = suspended_account.password
-    >>> transaction.commit()
-    >>> suspended_user.is_valid_person
-    False
-    >>> suspended_account.status
-    <DBItem AccountStatus.SUSPENDED, ...>
-
-    >>> login_token = login_token_set.new(
-    ...     suspended_user, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.PASSWORDRECOVERY)
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+resetpassword' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.email': '[e-mail]',
-    ...         'field.password': 'bad-intentions',
-    ...         'field.password_dupe': 'bad-intentions',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> resetpassword_view = getMultiAdapter(
-    ...     (login_token, request), name="+resetpassword")
-    >>> resetpassword_view.initialize()
-
-    >>> login('[e-mail]')
-    >>> suspended_user.is_valid_person
-    False
-    >>> suspended_user.account.password == original_password
-    True
-    >>> suspended_user.account.status
-    <DBItem AccountStatus.SUSPENDED, ...>
-
-
-== Claiming a profile ==
-
-The ClaimProfileView allows users to claim accounts created by Launchpad
-processes. The user profile for Matsubara was created during an import.
-The user profile does not have a preferred email address or a password.
 
     >>> matsubara = person_set.getByEmail('[e-mail]')
     >>> matsubara.name
@@ -240,135 +87,6 @@
     True
 
 
-== Creating a new ordinary account ==
-
-Unlike accounts created using OpenID, which don't have an associated Person
-(as shown in sso-workflow-register.txt), ordinary accounts will always have
-a Person entry associated with them.
-
-    >>> login_token = login_token_set.new(
-    ...     None, '[e-mail]', '[e-mail]',
-    ...     LoginTokenType.NEWACCOUNT)
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+newaccount' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.displayname': 'Andre Lopes',
-    ...         'field.hide_email_addresses.used': '',
-    ...         'field.password': 'test',
-    ...         'field.password_dupe': 'test',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> newaccount_view = getMultiAdapter(
-    ...     (login_token, request), name="+newaccount")
-    >>> newaccount_view.initialize()
-    >>> newaccount_view.errors
-    []
-    >>> person_set.getByEmail('[e-mail]')
-    <Person...
-
-
-== Creating a new account from an existing profile ==
-
-If a user's email address matches the email address of an unclaimed
-account, the existing profile is activated and given to the user.
-Andre Lopes (andrelop) has an account created via an automated process.
-
-    >>> andrelop = person_set.getByEmail('[e-mail]')
-    >>> andrelop.name
-    u'andrelop'
-    >>> print andrelop.preferredemail
-    None
-
-    >>> andrelop.account.status
-    <DBItem AccountStatus.NOACCOUNT, ...>
-    >>> andrelop.is_valid_person
-    False
-
-Andre would normally create a new account by claiming a LoginToken
-that verifies his access to the email address his provided.
-
-    >>> login_token = login_token_set.new(
-    ...     andrelop, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.NEWACCOUNT)
-    >>> transaction.commit()
-
-The NewAccountView will activate the existing account and update
-the Person object.
-
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+newaccount' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.displayname': 'Andre Lopes',
-    ...         'field.hide_email_addresses.used': '',
-    ...         'field.password': 'test5',
-    ...         'field.password_dupe': 'test5',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> claimprofile_view = getMultiAdapter(
-    ...     (login_token, request), name="+newaccount")
-    >>> claimprofile_view.initialize()
-    >>> claimprofile_view.errors
-    []
-    >>> transaction.commit()
-
-The existing Account, Person and EmailAddress are updated.
-
-    >>> andrelop.displayname
-    u'Andre Lopes'
-    >>> andrelop.hide_email_addresses
-    False
-    >>> andrelop.account.preferredemail.email
-    u'[e-mail]'
-
-    >>> andrelop.account.status
-    <DBItem AccountStatus.ACTIVE, ...>
-    >>> andrelop.account.status_comment
-    u'Activated by new account.'
-    >>> andrelop.is_valid_person
-    True
-
-
-== Creating a new account cannot reactivate a suspended profile ==
-
-An existing account that is SUSPENDED cannot be reactivated by claiming
-the email address during account creation.
-
-    >>> login_token = login_token_set.new(
-    ...     suspended_user, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.NEWACCOUNT)
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+newaccount' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.displayname': 'Bad User',
-    ...         'field.hide_email_addresses.used': '',
-    ...         'field.password': 'bad-intentions',
-    ...         'field.password_dupe': 'bad-intentions',
-    ...         'field.actions.continue': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> claimprofile_view = getMultiAdapter(
-    ...     (login_token, request), name="+newaccount")
-    >>> claimprofile_view.initialize()
-    >>> claimprofile_view.errors
-    []
-
-    >>> login('[e-mail]')
-    >>> suspended_user.is_valid_person
-    False
-    >>> suspended_user.account.password == original_password
-    True
-    >>> suspended_user.account.status
-    <DBItem AccountStatus.SUSPENDED, ...>
-
-
 == Validating GPG keys ==
 
 In order to add a GPG key to Launchpad we require that the person

=== removed file 'lib/canonical/launchpad/emailtemplates/forgottenpassword-neutral.txt'
--- lib/canonical/launchpad/emailtemplates/forgottenpassword-neutral.txt	2007-06-19 15:54:26 +0000
+++ lib/canonical/launchpad/emailtemplates/forgottenpassword-neutral.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Hello
-
-You have requested a new password for your Launchpad Login Service account.
-
-To change your password:
-
-    %(token_url)s
-
-If you don't know what this is about, then someone else has entered
-your e-mail address at the Launchpad Login Service. Sorry about
-that. You don't need to do anything further, just delete this message.
-
-Regards,
-The Launchpad Login Service team

=== removed file 'lib/canonical/launchpad/emailtemplates/forgottenpassword.txt'
--- lib/canonical/launchpad/emailtemplates/forgottenpassword.txt	2006-08-31 17:52:22 +0000
+++ lib/canonical/launchpad/emailtemplates/forgottenpassword.txt	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Hi
-
-You, or someone posing as you, has requested a new password for
-your Launchpad account.
-
-To reset your password, please click on the link below.
-You will need to enter this email address, enter and confirm your new password.
-
-    %(token_url)s
-
-The Launchpad Team

=== removed file 'lib/canonical/launchpad/emailtemplates/newuser-email-neutral.txt'
--- lib/canonical/launchpad/emailtemplates/newuser-email-neutral.txt	2007-06-19 15:54:26 +0000
+++ lib/canonical/launchpad/emailtemplates/newuser-email-neutral.txt	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Hello
-
-Thank you for registering with the Launchpad Login Service.
-
-To complete your registration:
-
-    %(token_url)s
-
-If you don't know what this is about, then someone has probably
-entered your e-mail address by mistake at the Launchpad Login Service
-Web site. Sorry about that. You don't need to do anything further,
-just delete this message.
-
-Regards,
-The Launchpad Login Service team

=== removed file 'lib/canonical/launchpad/emailtemplates/newuser-email.txt'
--- lib/canonical/launchpad/emailtemplates/newuser-email.txt	2008-11-17 17:17:33 +0000
+++ lib/canonical/launchpad/emailtemplates/newuser-email.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Hello!
-
-Thank you for registering at Launchpad. To complete your 
-registration, please follow the instructions here:
-
-   %(token_url)s
-
-Launchpad is a suite of applications for people who work with 
-free software projects. Using Launchpad you can report bugs, help
-with translation, find the answer to a question, find and share 
-code and host your own free software project.
-
-Once you've completed the registration, take a look at our 
-"getting started" guide here:
-
-   https://help.launchpad.net/NewToLaunchpad
-
-Thanks,
-The Launchpad team.

=== modified file 'lib/canonical/launchpad/interfaces/authtoken.py'
--- lib/canonical/launchpad/interfaces/authtoken.py	2009-10-13 16:59:43 +0000
+++ lib/canonical/launchpad/interfaces/authtoken.py	2010-04-05 17:13:29 +0000
@@ -10,7 +10,6 @@
 __all__ = [
     'LoginTokenType',
     'IAuthToken',
-    'IAuthTokenSet',
     ]
 
 from zope.schema import Choice, Datetime, Int, Text, TextLine
@@ -118,6 +117,9 @@
         """)
 
 
+# XXX: Guilherme Salgado, 2010-03-30: This interface was created to be used by
+# our old OpenID provider, but that doesn't exist anymore, so we should merge
+# it with ILoginToken.
 class IAuthToken(Interface):
     """The object that stores one time tokens used for validating email
     addresses and other tasks that require verifying if an email address is
@@ -193,55 +195,3 @@
         """Send an email message to the requester with a magic URL that allows
         him to finish the Launchpad registration process.
         """
-
-
-class IAuthTokenSet(Interface):
-    """The set of AuthTokens."""
-
-    title = Attribute('Title')
-
-    def get(id, default=None):
-        """Return the AuthToken object with the given id.
-
-        Return the default value if there's no such AuthToken.
-        """
-
-    def searchByEmailAccountAndType(email, account, type, consumed=None):
-        """Return all AuthTokens for the given email, account and type.
-
-        :param email: The email address to search for.
-        :param account: The Account object representing the requester
-            to search for.
-        :param type: The AuthTokenType to search for.
-        :param consumed: A flag indicating whether to return consumed tokens.
-            If False, only unconsumed tokens will be returned.
-            If True, only consumed tokens will be returned.
-            If None, this parameter will be ignored and all tokens will be
-            returned.
-        """
-
-    def deleteByEmailAccountAndType(email, account, type):
-        """Delete all AuthToken entries with the given email,
-        requester account and type."""
-
-    def new(requester, requesteremail, email, tokentype, redirection_url):
-        """Create a new AuthToken object.
-
-        :param requester: a Person object or None (in case of a new
-            account)
-        :param requesteremail: the email address used to login on the
-            system. Can also be None in case of a new account
-        :param email: the email address that this request will be sent
-            to.  It should be previously validated by valid_email()
-        :param tokentype: the type of the request, according to
-            LoginTokenType.
-        :param redirection_url: the URL the user will be forwarded to
-            after consuming the token.  May be None.
-        """
-
-    def __getitem__(id):
-        """Returns the AuthToken with the given id.
-
-        Raises KeyError if there is no such AuthToken.
-        """
-

=== removed file 'lib/canonical/launchpad/templates/logintoken-newaccount.pt'
--- lib/canonical/launchpad/templates/logintoken-newaccount.pt	2009-09-16 20:51:57 +0000
+++ lib/canonical/launchpad/templates/logintoken-newaccount.pt	1970-01-01 00:00:00 +0000
@@ -1,19 +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"
-  metal:use-macro="view/macro:page/locationless"
-  i18n:domain="launchpad"
->
-  <body>
-
-  <div metal:fill-slot="main">
-
-    <div metal:use-macro="context/@@launchpad_form/form" />
-
-  </div>
-  </body>
-
-</html>
-

=== removed file 'lib/canonical/launchpad/templates/logintoken-resetpassword.pt'
--- lib/canonical/launchpad/templates/logintoken-resetpassword.pt	2009-09-16 20:51:57 +0000
+++ lib/canonical/launchpad/templates/logintoken-resetpassword.pt	1970-01-01 00:00:00 +0000
@@ -1,18 +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"
-  metal:use-macro="view/macro:page/locationless"
-  i18n:domain="launchpad"
->
-  <body>
-
-<div metal:fill-slot="main">
-
-  <div metal:use-macro="context/@@launchpad_form/form" />
-
-</div>
-
-</body>
-</html>

=== modified file 'lib/canonical/launchpad/tests/test_login.py'
--- lib/canonical/launchpad/tests/test_login.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/tests/test_login.py	2010-04-05 17:13:29 +0000
@@ -13,13 +13,11 @@
 from canonical.launchpad.ftests import ANONYMOUS, login
 from canonical.launchpad.interfaces.account import (
     AccountCreationRationale, IAccountSet)
-from lp.registry.interfaces.person import IPerson
 from lp.testing import TestCaseWithFactory
 from canonical.launchpad.webapp.authentication import LaunchpadPrincipal
 from canonical.launchpad.webapp.interfaces import (
     CookieAuthLoggedInEvent, ILaunchpadPrincipal, IPlacelessAuthUtility)
-from canonical.launchpad.webapp.login import (
-    logInPrincipal, logInPrincipalAndMaybeCreatePerson, logoutPerson)
+from canonical.launchpad.webapp.login import logInPrincipal, logoutPerson
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing import DatabaseFunctionalLayer
 
@@ -137,23 +135,6 @@
         self.failUnless(ILaunchpadPrincipal.providedBy(principal))
         self.failUnless(principal.person is None)
 
-    def test_logInPrincipalAndMaybeCreatePerson(self):
-        # logInPrincipalAndMaybeCreatePerson() will log the given principal in
-        # and create a Person entry associated with it if one doesn't exist
-        # already.
-        logInPrincipalAndMaybeCreatePerson(
-            self.request, self.principal, '[e-mail]')
-
-        # This is so that the authenticate() call below uses cookie auth.
-        self.request.response.setCookie(
-            config.launchpad_session.cookie, 'xxx')
-
-        principal = getUtility(IPlacelessAuthUtility).authenticate(
-            self.request)
-        self.failUnless(ILaunchpadPrincipal.providedBy(principal))
-        person = IPerson(principal.account)
-        self.failUnless(IPerson.providedBy(person))
-
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/canonical/launchpad/tests/test_token_creation.py'
--- lib/canonical/launchpad/tests/test_token_creation.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/tests/test_token_creation.py	2010-04-05 17:13:29 +0000
@@ -36,9 +36,9 @@
 
         # Now insert the token in the table so that the next time we call
         # create_unique_token_for_table() we get a different token.
-        login_token = LoginToken(
+        LoginToken(
             requester=None, token=token2, email='[e-mail]',
-            tokentype=LoginTokenType.NEWACCOUNT, created=UTC_NOW)
+            tokentype=LoginTokenType.ACCOUNTMERGE, created=UTC_NOW)
         random.seed(0)
         token3 = create_unique_token_for_table(99, LoginToken.token)
         self.assertNotEquals(token1, token3)

=== modified file 'lib/canonical/launchpad/webapp/login.py'
--- lib/canonical/launchpad/webapp/login.py	2010-03-30 14:57:02 +0000
+++ lib/canonical/launchpad/webapp/login.py	2010-04-05 17:13:29 +0000
@@ -38,8 +38,8 @@
 from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
 from canonical.launchpad.webapp.error import SystemErrorView
 from canonical.launchpad.webapp.interfaces import (
-    CookieAuthLoggedInEvent, ILaunchpadApplication, ILaunchpadPrincipal,
-    IPlacelessAuthUtility, IPlacelessLoginSource, LoggedOutEvent)
+    CookieAuthLoggedInEvent, ILaunchpadApplication, IPlacelessAuthUtility,
+    IPlacelessLoginSource, LoggedOutEvent)
 from canonical.launchpad.webapp.metazcml import ILaunchpadPermission
 from canonical.launchpad.webapp.publisher import LaunchpadView
 from canonical.launchpad.webapp.url import urlappend
@@ -378,24 +378,6 @@
     notify(CookieAuthLoggedInEvent(request, email))
 
 
-def logInPrincipalAndMaybeCreatePerson(request, principal, email):
-    """Log the principal in, creating a Person if necessary.
-
-    If the given principal has no associated person, we create a new
-    person, fetch a new principal and set it in the request.
-
-    Password validation must be done in callsites.
-    """
-    logInPrincipal(request, principal, email)
-    if ILaunchpadPrincipal.providedBy(principal) and principal.person is None:
-        person = principal.account.createPerson(
-            PersonCreationRationale.OWNER_CREATED_LAUNCHPAD)
-        new_principal = getUtility(IPlacelessLoginSource).getPrincipal(
-            principal.id)
-        assert ILaunchpadPrincipal.providedBy(new_principal)
-        request.setPrincipal(new_principal)
-
-
 def expireSessionCookie(request, client_id_manager=None,
                         delta=timedelta(minutes=10)):
     if client_id_manager is None:

=== modified file 'lib/canonical/launchpad/webapp/publication.py'
--- lib/canonical/launchpad/webapp/publication.py	2010-03-30 14:33:26 +0000
+++ lib/canonical/launchpad/webapp/publication.py	2010-04-05 17:13:29 +0000
@@ -317,7 +317,7 @@
         if request.method != 'POST':
             return
         # XXX: jamesh 2007-11-23 bug=124421:
-        # Allow offsite posts to our OpenID endpoint.  Ideally we'd
+        # Allow offsite posts to our TestOpenID endpoint.  Ideally we'd
         # have a better way of marking this URL as allowing offsite
         # form posts.
         if request['PATH_INFO'] == '/+openid':

=== modified file 'lib/canonical/launchpad/zcml/logintoken.zcml'
--- lib/canonical/launchpad/zcml/logintoken.zcml	2009-07-18 00:05:49 +0000
+++ lib/canonical/launchpad/zcml/logintoken.zcml	2010-04-05 17:13:29 +0000
@@ -36,22 +36,6 @@
         />
 
     <browser:page
-        name="+newaccount"
-        for="canonical.launchpad.interfaces.ILoginToken"
-        class="canonical.launchpad.browser.logintoken.NewUserAccountView"
-        permission="zope.Public"
-        template="../../launchpad/templates/logintoken-newaccount.pt"
-        />
-
-    <browser:page
-        for="canonical.launchpad.interfaces.ILoginToken"
-        name="+resetpassword"
-        permission="zope.Public"
-        class="canonical.launchpad.browser.logintoken.ResetPasswordView"
-        template="../templates/logintoken-resetpassword.pt"
-        />
-
-    <browser:page
         for="canonical.launchpad.interfaces.ILoginToken"
         name="+validateemail"
         permission="zope.Public"

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-03-24 22:06:30 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-04-05 17:13:29 +0000
@@ -1192,12 +1192,6 @@
             classes="
                 PersonSetNavigation"/>
         <browser:page
-            name="+newperson"
-            for="lp.registry.interfaces.person.IPersonSet"
-            class="lp.registry.browser.person.PersonAddView"
-            permission="launchpad.Admin"
-            template="../templates/people-newperson.pt"/>
-        <browser:page
             name="+newteam"
             for="lp.registry.interfaces.person.IPersonSet"
             class="lp.registry.browser.team.TeamAddView"

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-03-25 14:50:31 +0000
+++ lib/lp/registry/browser/person.py	2010-04-05 17:13:29 +0000
@@ -10,10 +10,8 @@
     'BeginTeamClaimView',
     'BugSubscriberPackageBugsSearchListingView',
     'EmailToPersonView',
-    'PeopleSearchMenu'
     'PeopleSearchView',
     'PersonAccountAdministerView',
-    'PersonAddView',
     'PersonAdministerView',
     'PersonAnswerContactForView',
     'PersonAnswersMenu',
@@ -163,9 +161,8 @@
 from lp.registry.interfaces.mailinglistsubscription import (
     MailingListAutoSubscribePolicy)
 from lp.registry.interfaces.person import (
-    INewPerson, IPerson, IPersonClaim, IPersonSet, ITeam, ITeamReassignment,
-    PersonCreationRationale, PersonVisibility, TeamMembershipRenewalPolicy,
-    TeamSubscriptionPolicy)
+    IPerson, IPersonClaim, IPersonSet, ITeam, ITeamReassignment,
+    PersonVisibility, TeamMembershipRenewalPolicy, TeamSubscriptionPolicy)
 from lp.registry.interfaces.poll import IPollSet, IPollSubset
 from lp.registry.interfaces.ssh import ISSHKeySet, SSHKeyType
 from lp.registry.interfaces.teammembership import (
@@ -1375,33 +1372,6 @@
         return BatchNavigator(results, self.request)
 
 
-class PersonAddView(LaunchpadFormView):
-    """The page where users can create new Launchpad profiles."""
-
-    page_title = "Create a new Launchpad profile"
-    label = page_title
-    schema = INewPerson
-
-    custom_widget('creation_comment', TextAreaWidget, height=5, width=60)
-
-    @action(_("Create Profile"), name="create")
-    def create_action(self, action, data):
-        emailaddress = data['emailaddress']
-        displayname = data['displayname']
-        creation_comment = data['creation_comment']
-        person, ignored = getUtility(IPersonSet).createPersonAndEmail(
-            emailaddress, PersonCreationRationale.USER_CREATED,
-            displayname=displayname, comment=creation_comment,
-            registrant=self.user)
-        self.next_url = canonical_url(person)
-        logintokenset = getUtility(ILoginTokenSet)
-        token = logintokenset.new(
-            requester=self.user,
-            requesteremail=self.user.preferredemail.email,
-            email=emailaddress, tokentype=LoginTokenType.NEWPROFILE)
-        token.sendProfileCreatedEmail(person, creation_comment)
-
-
 class DeactivateAccountSchema(Interface):
     comment = copy_field(
         IPerson['account_status_comment'], readonly=False, __name__='comment')

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2010-03-25 14:17:56 +0000
+++ lib/lp/registry/interfaces/person.py	2010-04-05 17:13:29 +0000
@@ -11,11 +11,8 @@
     'IAdminPeopleMergeSchema',
     'IAdminTeamMergeSchema',
     'IHasStanding',
-    'INewPerson',
-    'INewPersonForm',
     'IObjectReassignment',
     'IPerson',
-    'IPersonChangePassword',
     'IPersonClaim',
     'IPersonPublic', # Required for a monkey patch in interfaces/archive.py
     'IPersonSet',
@@ -72,8 +69,7 @@
 from canonical.launchpad.interfaces.emailaddress import IEmailAddress
 from canonical.launchpad.interfaces.launchpad import (
     IHasIcon, IHasLogo, IHasMugshot, IPrivacy)
-from canonical.launchpad.interfaces.validation import (
-    validate_new_person_email, validate_new_team_email)
+from canonical.launchpad.interfaces.validation import validate_new_team_email
 from canonical.launchpad.validators import LaunchpadValidationError
 from canonical.launchpad.validators.email import email_validator
 from canonical.launchpad.validators.name import name_validator
@@ -435,37 +431,12 @@
         super(PersonNameField, self)._validate(input)
 
 
-# XXX: salgado, 2010/03/05, bug=532688: This is currently used by c-i-p, so it
-# can't be removed yet.  As soon as we stop using c-i-p, though, we'll be able
-# to remove this.
-class IPersonChangePassword(Interface):
-    """The schema used by Person +changepassword form."""
-
-    currentpassword = PasswordField(
-        title=_('Current password'), required=True, readonly=False)
-
-    password = PasswordField(
-        title=_('New password'), required=True, readonly=False)
-
-
 class IPersonClaim(Interface):
     """The schema used by IPerson's +claim form."""
 
     emailaddress = TextLine(title=_('Email address'), required=True)
 
 
-class INewPerson(Interface):
-    """The schema used by IPersonSet's +newperson form."""
-
-    emailaddress = StrippedTextLine(
-        title=_('Email address'), required=True,
-        constraint=validate_new_person_email)
-    displayname = StrippedTextLine(title=_('Display name'), required=True)
-    creation_comment = Text(
-        title=_('Creation reason'), required=True,
-        description=_("The reason why you're creating this profile."))
-
-
 # This has to be defined here to avoid circular import problems.
 class IHasStanding(Interface):
     """An object that can have personal standing."""
@@ -1544,16 +1515,6 @@
 PersonChoice.schema = IPerson
 
 
-class INewPersonForm(IPerson):
-    """Interface used to create new Launchpad accounts.
-
-    The only change with `IPerson` is a customised Password field.
-    """
-
-    password = PasswordField(
-        title=_('Create password'), required=True, readonly=False)
-
-
 class ITeamPublic(Interface):
     """Public attributes of a Team."""
 

=== removed file 'lib/lp/registry/stories/person/xx-new-profile.txt'
--- lib/lp/registry/stories/person/xx-new-profile.txt	2009-11-22 15:43:16 +0000
+++ lib/lp/registry/stories/person/xx-new-profile.txt	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-
-We allow Launchpad admins to create random profiles that can latter be used
-throughout Launchpad. These profiles are not considered validated and because
-of that we won't send any email notification to them, except for an initial
-email explaining that a given user has created a Launchpad profile for that
-email address' owner.
-
-    >>> admin_browser.open('http://launchpad.dev/people/+newperson')
-    >>> admin_browser.url
-    'http://launchpad.dev/people/+newperson'
-
-All fields (email address, displayname and creation reason) in that form
-are required.
-
-    >>> admin_browser.getControl('Create Profile').click()
-    >>> print admin_browser.contents
-    <...
-    ...class="error message">There are 3 errors...
-
-Trying to create a profile with an invalid or already used email address
-is not allowed.
-
-    >>> admin_browser.getControl('Email address').value = 'foo@'
-    >>> admin_browser.getControl('Display name').value = 'Foo'
-    >>> admin_browser.getControl('Creation reason').value = (
-    ...     'I was just playing around and found this nice form, so I '
-    ...     'decided to create a new profile to test.')
-    >>> admin_browser.getControl('Create Profile').click()
-    >>> for tag in find_tags_by_class(admin_browser.contents, 'message'):
-    ...     print tag.renderContents()
-    There is 1 error.
-    foo@ isn't a valid email address.
-
-    >>> admin_browser.getControl('Email address').value = '[e-mail]'
-    >>> admin_browser.getControl('Create Profile').click()
-    >>> for tag in find_tags_by_class(admin_browser.contents, 'message'):
-    ...     print tag.renderContents()
-    There is 1 error.
-    The profile you're trying to create already exists:...
-
-When all fields are filled correctly, the new profile is created.
-
-    >>> admin_browser.getControl('Email address').value = '[e-mail]'
-    >>> admin_browser.getControl('Create Profile').click()
-    >>> admin_browser.url
-    'http://launchpad.dev/~test2'
-
-    >>> print admin_browser.contents
-    <...
-    ...This page was created...
-    ...by ...
-    ...and the reason given by that user for its creation is:...
-    ...I was just playing around and found this nice form,...
-
-The creation of this new profile will trigger an email notification to the
-profile's email address. This email will contain the name of the person who
-created the profile as well as the reason left by that person. It'll also
-contain a link to a page where it's possible to finish the registration
-process in order to validate that profile.
-
-    >>> import 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()
-    >>> token_url = get_token_url_from_email(raw_msg)
-
-    >>> print email.message_from_string(raw_msg).get_payload()
-    Hello!
-    ... has created a new Launchpad profile [1] for
-    you, and left the following comment as the reason for its creation:
-    ...
-    If you wish to use this profile, please follow the instructions here:
-    ...
-
-    >>> browser.open(token_url)
-    >>> browser.url
-    'http://launchpad.dev/token/.../+newaccount'
-
-We don't prefill the new account's display name because the one we have was
-not entered by the users themselves.
-
-    >>> browser.getControl('Display Name').value
-    ''
-
-We also explain the users what to write in each form:
-
-    >>> for tag in find_tags_by_class(browser.contents, 'formHelp'):
-    ...     print extract_text(tag)
-    Your name as you would like it displayed throughout Launchpad...
-
-Now we fill the form and save it to create the new account.
-
-    >>> browser.getControl('Display Name').value = 'My name'
-    >>> browser.getControl('Create password').value = 'aaa'
-    >>> browser.getControl(name='field.password_dupe').value = 'aaa'
-    >>> browser.getControl('Continue').click()
-
-    >>> browser.url
-    'http://launchpad.dev/~test2'
-
-
-Non-launchpad admins can't acces the page to ceate a new profile.
-
-    >>> user_browser.open('http://launchpad.dev/people/+newperson')
-    Traceback (most recent call last):
-    ...
-    Unauthorized: ...

=== removed file 'lib/lp/registry/templates/people-newperson.pt'
--- lib/lp/registry/templates/people-newperson.pt	2009-08-31 17:46:33 +0000
+++ lib/lp/registry/templates/people-newperson.pt	1970-01-01 00:00:00 +0000
@@ -1,29 +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"
-  metal:use-macro="view/macro:page/main_only"
-  i18n:domain="launchpad"
-  >
-  <body>
-    <div metal:fill-slot="main">
-      <div metal:use-macro="context/@@launchpad_form/form">
-        <div metal:fill-slot="extra_info" class="application-summary">
-        <p>
-          Launchpad will send a message to the email address you provide
-          below.  This message explains that you created a Launchpad profile
-          for the email address's owner, and it will include your name and
-          email address so that the user can contact you if they want to.
-        </p>
-        <p>
-          It will not be possible to log in with this new profile, and
-          Launchpad will not send any other messages to it before its email
-          address is confirmed.  The registration process must be finished by
-          the person represented by the new profile.
-        </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>