Merge lp:~edwin-grubbs/launchpad/bug-554153-claim-profile-bug into lp:launchpad

[Edwin Grubbs]

Summary
-------

Fixes bug 554153.
Remove $person/+claim page and point links at /people/+requestmerge instead.

Implementation details
----------------------

The +claim page emails the user a token that lets them access the
+claimprofile page. We can rid of them both.
    lib/canonical/launchpad/browser/logintoken.py
    lib/canonical/launchpad/zcml/logintoken.zcml
    lib/lp/registry/browser/configure.zcml

The +claimteam page is still used. It was subclassed from
PersonClaimView, but now those two views can be combined.
    lib/lp/registry/browser/person.py

There is no real reason to display a different set of links for an
anonymous user looking at an inactive person page. The anonymous
user will be forced to log in if the +requestmerge or +claimteam
links is clicked.
    lib/lp/registry/templates/person-index.pt

Tests:
    lib/lp/registry/stories/person/xx-person-claim-merge.txt
    lib/lp/registry/stories/person/xx-person-claim.txt
    lib/lp/registry/stories/team/xx-team-claim.txt

Tests
-----

./bin/test -vv -t claim

Demo and Q/A
------------

* Open http://launchpad.dev/~matsubara/+requestmerge
  * The "Are you Diogo Matsubara?" link should now point to +requestmerge.
* Open http://launchpad.dev/~doc/+requestmerge
  * The "Is this a team you run?" link should still point to +claimteam.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/browser/logintoken.py'
--- lib/canonical/launchpad/browser/logintoken.py	2010-04-01 19:22:36 +0000
+++ lib/canonical/launchpad/browser/logintoken.py	2010-04-17 16:08:28 +0000
@@ -6,7 +6,6 @@
 __all__ = [
     'BaseTokenView',
     'BugTrackerHandshakeView',
-    'ClaimProfileView',
     'ClaimTeamView',
     'LoginTokenSetNavigation',
     'LoginTokenView',
@@ -36,7 +35,6 @@
     IGPGHandler)
 from canonical.launchpad.interfaces.logintoken import (
     IGPGKeyValidationForm, ILoginTokenSet)
-from canonical.launchpad.interfaces.lpstorm import IMasterObject
 from canonical.launchpad.webapp.interfaces import (
     IAlwaysSubmittedWidget, IPlacelessLoginSource)
 from canonical.launchpad.webapp.login import logInPrincipal
@@ -45,10 +43,10 @@
 from canonical.launchpad.webapp import (
     action, canonical_url, custom_widget, GetitemNavigation,
     LaunchpadEditFormView, LaunchpadFormView, LaunchpadView)
-from canonical.widgets import LaunchpadRadioWidget, PasswordChangeWidget
+from canonical.widgets import LaunchpadRadioWidget
 
 from lp.registry.browser.team import HasRenewalPolicyMixin
-from lp.registry.interfaces.person import IPerson, IPersonSet, ITeam
+from lp.registry.interfaces.person import IPersonSet, ITeam
 
 
 UTC = pytz.UTC
@@ -77,7 +75,6 @@
         LoginTokenType.VALIDATETEAMEMAIL: '+validateteamemail',
         LoginTokenType.VALIDATEGPG: '+validategpg',
         LoginTokenType.VALIDATESIGNONLYGPG: '+validatesignonlygpg',
-        LoginTokenType.PROFILECLAIM: '+claimprofile',
         LoginTokenType.TEAMCLAIM: '+claimteam',
         LoginTokenType.BUGTRACKER: '+bugtracker-handshake',
         }
@@ -184,56 +181,6 @@
         return True
 
 
-class ClaimProfileView(BaseTokenView, LaunchpadFormView):
-    schema = IPerson
-    field_names = ['displayname', 'hide_email_addresses', 'password']
-    custom_widget('password', PasswordChangeWidget)
-    label = 'Claim Launchpad profile'
-
-    expected_token_types = (LoginTokenType.PROFILECLAIM,)
-
-    def initialize(self):
-        if not self.redirectIfInvalidOrConsumedToken():
-            self.claimed_profile = getUtility(IEmailAddressSet).getByEmail(
-                self.context.email).person
-        super(ClaimProfileView, self).initialize()
-
-    @property
-    def initial_values(self):
-        return {'displayname': self.claimed_profile.displayname}
-
-    @property
-    def default_next_url(self):
-        return canonical_url(self.claimed_profile)
-
-    @action(_('Continue'), name='confirm')
-    def confirm_action(self, action, data):
-        email = getUtility(IEmailAddressSet).getByEmail(self.context.email)
-        person = IMasterObject(email.person)
-
-        # 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)
-        naked_person.displayname = data['displayname']
-        naked_person.hide_email_addresses = data['hide_email_addresses']
-
-        naked_email = removeSecurityProxy(email)
-
-        removeSecurityProxy(IMasterObject(email.account)).activate(
-            comment="Activated by claim profile.",
-            password=data['password'],
-            preferred_email=naked_email)
-        self.context.consume()
-        self.logInPrincipalByEmail(naked_email.email)
-        self.request.response.addInfoNotification(_(
-            "Profile claimed successfully"))
-
-
 class ClaimTeamView(
     BaseTokenView, HasRenewalPolicyMixin, LaunchpadEditFormView):
 
@@ -356,7 +303,8 @@
 
         # We compare the word-splitted content to avoid failures due
         # to whitepace differences.
-        if signature.plain_data.split() != self.context.validation_phrase.split():
+        if (signature.plain_data.split()
+            != self.context.validation_phrase.split()):
             self.addError(_(
                 'The signed content does not match the message found '
                 'in the email.'))

=== modified file 'lib/canonical/launchpad/doc/logintoken-pages.txt'
--- lib/canonical/launchpad/doc/logintoken-pages.txt	2010-04-01 18:48:04 +0000
+++ lib/canonical/launchpad/doc/logintoken-pages.txt	2010-04-17 16:08:28 +0000
@@ -6,11 +6,16 @@
 token sent to him in an email.
 
 
-== Claiming a profile ==
+== Validating GPG keys ==
 
-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.
+In order to add a GPG key to Launchpad we require that the person
+registering it decrypt an email and follow the instructions in it.
+The last step in that workflow is the +validategpg page, which can
+be accessed by non-logged-in users. That page will attempt to access
+all email addresses of the requester but that may fail when the user
+is not logged in and the requester has chosen to hide his email
+addresses, so here we'll make sure that even non-logged-in users can
+perform the last step of the workflow for adding a GPG key.
 
     >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
@@ -25,79 +30,6 @@
     >>> person_set = PersonSet()
     >>> login_token_set = getUtility(ILoginTokenSet)
 
-    >>> matsubara = person_set.getByEmail('[e-mail]')
-    >>> matsubara.name
-    u'matsubara'
-    >>> matsubara.displayname
-    u'Diogo Matsubara'
-    >>> print matsubara.preferredemail
-    None
-
-    >>> matsubara.account.status
-    <DBItem AccountStatus.NOACCOUNT, ...>
-    >>> print matsubara.account.password
-    None
-    >>> matsubara.is_valid_person
-    False
-
-The user can claim his profile by providing the email address that
-is associated with the profile. If the correct address is provided,
-the user is sent an email with a link to a LoginToken.
-
-    >>> login_token = login_token_set.new(
-    ...     matsubara, '[e-mail]',
-    ...     '[e-mail]', LoginTokenType.PROFILECLAIM)
-
-The user is asked to provide a display name and password, and to
-indicate if his email address can be shown to other Launchpad users.
-
-    >>> request = LaunchpadTestRequest(
-    ...     SERVER_URL='http://launchpad.dev',
-    ...     PATH_INFO='/token/%s/+claimprofile' % login_token.token,
-    ...     method='POST',
-    ...     form={
-    ...         'field.displayname': 'D. Matsubara',
-    ...         'field.hide_email_addresses': 'on',
-    ...         'field.password': 'test4',
-    ...         'field.password_dupe': 'test4',
-    ...         'field.actions.confirm': 'Continue',
-    ...         })
-    >>> login(ANONYMOUS, request)
-    >>> claimprofile_view = getMultiAdapter(
-    ...     (login_token, request), name="+claimprofile")
-    >>> claimprofile_view.initialize()
-    >>> claimprofile_view.errors
-    []
-    >>> transaction.commit()
-
-The user's Person, EmailAddress, and Account objects are updated.
-
-    >>> matsubara.displayname
-    u'D. Matsubara'
-    >>> matsubara.hide_email_addresses
-    True
-    >>> matsubara.account.preferredemail.email
-    u'[e-mail]'
-
-    >>> matsubara.account.status
-    <DBItem AccountStatus.ACTIVE, ...>
-    >>> matsubara.account.status_comment
-    u'Activated by claim profile.'
-    >>> matsubara.is_valid_person
-    True
-
-
-== Validating GPG keys ==
-
-In order to add a GPG key to Launchpad we require that the person
-registering it decrypt an email and follow the instructions in it.
-The last step in that workflow is the +validategpg page, which can
-be accessed by non-logged-in users. That page will attempt to access
-all email addresses of the requester but that may fail when the user
-is not logged in and the requester has chosen to hide his email
-addresses, so here we'll make sure that even non-logged-in users can
-perform the last step of the workflow for adding a GPG key.
-
     >>> sample_person = person_set.getByEmail('[e-mail]')
     >>> sample_person.hide_email_addresses
     True

=== modified file 'lib/canonical/launchpad/interfaces/authtoken.py'
--- lib/canonical/launchpad/interfaces/authtoken.py	2010-03-30 20:02:53 +0000
+++ lib/canonical/launchpad/interfaces/authtoken.py	2010-04-17 16:08:28 +0000
@@ -78,13 +78,6 @@
         needs to be validated.
         """)
 
-    PROFILECLAIM = DBItem(8, """
-        Claim an unvalidated Launchpad profile
-
-        A user has found an unvalidated profile in Launchpad and is trying
-        to claim it.
-        """)
-
     NEWPROFILE = DBItem(9, """
         A user created a new Launchpad profile for another person.
 

=== modified file 'lib/canonical/launchpad/zcml/logintoken.zcml'
--- lib/canonical/launchpad/zcml/logintoken.zcml	2010-03-30 20:02:53 +0000
+++ lib/canonical/launchpad/zcml/logintoken.zcml	2010-04-17 16:08:28 +0000
@@ -77,13 +77,6 @@
 
     <browser:page
         for="canonical.launchpad.interfaces.ILoginToken"
-        name="+claimprofile"
-        permission="zope.Public"
-        class="canonical.launchpad.browser.ClaimProfileView"
-        template="../templates/logintoken-claimprofile.pt" />
-
-    <browser:page
-        for="canonical.launchpad.interfaces.ILoginToken"
         name="+claimteam"
         permission="launchpad.AnyPerson"
         class="canonical.launchpad.browser.ClaimTeamView"

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-04-12 15:33:19 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-04-17 16:08:28 +0000
@@ -790,12 +790,6 @@
             permission="launchpad.AnyPerson"
             template="../templates/person-claim-team.pt"/>
         <browser:page
-            name="+claim"
-            for="lp.registry.interfaces.person.IPerson"
-            class="lp.registry.browser.person.PersonClaimView"
-            permission="zope.Public"
-            template="../templates/person-claim.pt"/>
-        <browser:page
             name="+editlanguages"
             for="lp.registry.interfaces.person.IPerson"
             class="lp.registry.browser.person.PersonLanguagesView"

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-04-14 18:31:51 +0000
+++ lib/lp/registry/browser/person.py	2010-04-17 16:08:28 +0000
@@ -18,7 +18,6 @@
     'PersonAssignedBugTaskSearchListingView',
     'PersonBrandingView',
     'PersonBugsMenu',
-    'PersonClaimView',
     'PersonCodeOfConductEditView',
     'PersonCommentedBugTaskSearchListingView',
     'PersonDeactivateAccountView',
@@ -218,8 +217,7 @@
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
-from canonical.launchpad.webapp.login import (
-    logoutPerson, allowUnauthenticatedSession)
+from canonical.launchpad.webapp.login import logoutPerson
 from canonical.launchpad.webapp.menu import get_current_view
 from canonical.launchpad.webapp.publisher import LaunchpadView
 from canonical.launchpad.webapp.tales import (
@@ -1397,11 +1395,14 @@
         self.next_url = self.request.getApplicationURL()
 
 
-class PersonClaimView(LaunchpadFormView):
-    """The page where a user can claim an unvalidated profile."""
+class BeginTeamClaimView(LaunchpadFormView):
+    """Where you can claim an unvalidated profile turning it into a team.
 
+    This is actually just the first step, where you enter the email address
+    of the team and we email further instructions to that address.
+    """
+    label = 'Claim team'
     schema = IPersonClaim
-    label = 'Claim account'
 
     def initialize(self):
         if self.context.is_valid_person_or_team:
@@ -1431,28 +1432,17 @@
                      "associated with."
                      % self.context.name)
         elif email.personID != self.context.id:
-            if email.person.is_valid_person:
-                error = structured(
-                         "This email address is associated with yet another "
-                         "Launchpad profile, which you seem to have used at "
-                         "some point. If that's the case, you can "
-                         '<a href="/people/+requestmerge'
-                         '?field.dupe_person=%s">combine '
-                         "this profile with the other one</a> (you'll "
-                         "have to log in with the other profile first, "
-                         "though). If that's not the case, please try with a "
-                         "different email address.",
-                         self.context.name)
-            else:
-                # There seems to be another unvalidated profile for you!
-                error = structured(
-                         "Although this email address is not associated with "
-                         "this profile, it's associated with yet another "
-                         'one. You can <a href="%s/+claim">claim that other '
-                         'profile</a> and then later '
-                         '<a href="/people/+requestmerge">combine</a> both '
-                         'of them into a single one.',
-                         canonical_url(email.person))
+            error = structured(
+                        "This email address is associated with yet another "
+                        "Launchpad profile, which you seem to have used at "
+                        "some point. If that's the case, you can "
+                        '<a href="/people/+requestmerge'
+                        '?field.dupe_person=%s">combine '
+                        "this profile with the other one</a> (you'll "
+                        "have to log in with the other profile first, "
+                        "though). If that's not the case, please try with a "
+                        "different email address.",
+                        self.context.name)
         else:
             # Yay! You got the right email this time.
             pass
@@ -1463,34 +1453,6 @@
     def next_url(self):
         return canonical_url(self.context)
 
-    @action(_("E-mail Me"), name="confirm")
-    def confirm_action(self, action, data):
-        email = data['emailaddress']
-        token = getUtility(ILoginTokenSet).new(
-            requester=None, requesteremail=None, email=email,
-            tokentype=LoginTokenType.PROFILECLAIM)
-        token.sendClaimProfileEmail()
-        # A dance to assert that we want to break the rules about no
-        # unauthenticated sessions. Only after this next line is it safe
-        # to use the ``addNoticeNotification`` method.
-        allowUnauthenticatedSession(self.request)
-        self.request.response.addInfoNotification(_(
-            "A confirmation  message has been sent to '${email}'. "
-            "Follow the instructions in that message to finish claiming this "
-            "profile. "
-            "(If the message doesn't arrive in a few minutes, your mail "
-            "provider might use 'greylisting', which could delay the message "
-            "for up to an hour or two.)", mapping=dict(email=email)))
-
-
-class BeginTeamClaimView(PersonClaimView):
-    """Where you can claim an unvalidated profile turning it into a team.
-
-    This is actually just the first step, where you enter the email address
-    of the team and we email further instructions to that address.
-    """
-    label = 'Claim team'
-
     @action(_("Continue"), name="confirm")
     def confirm_action(self, action, data):
         email = data['emailaddress']
@@ -2398,9 +2360,9 @@
             # The call to redeemVoucher returns True if it succeeds or it
             # raises an exception.  Therefore the return value does not need
             # to be checked.
-            result = salesforce_proxy.redeemVoucher(voucher.voucher_id,
-                                                    self.context,
-                                                    project)
+            salesforce_proxy.redeemVoucher(voucher.voucher_id,
+                                           self.context,
+                                           project)
             project.redeemSubscriptionVoucher(
                 voucher=voucher.voucher_id,
                 registrant=self.context,
@@ -3391,7 +3353,7 @@
                     'The URL scheme "%(scheme)s" is not allowed.  '
                     'Only http or https URLs may be used.', scheme=uri.scheme)
                 return False
-        except InvalidURIError, e:
+        except InvalidURIError:
             self.error_message = structured(
                 '"%(url)s" is not a valid URL.', url=url)
             return False
@@ -4226,8 +4188,6 @@
 
     @action(_("Leave"), name="leave")
     def action_save(self, action, data):
-        response = self.request.response
-
         if self.user_can_request_to_leave:
             self.user.leave(self.context)
 

=== modified file 'lib/lp/registry/stories/person/xx-person-claim-merge.txt'
--- lib/lp/registry/stories/person/xx-person-claim-merge.txt	2009-07-20 15:27:26 +0000
+++ lib/lp/registry/stories/person/xx-person-claim-merge.txt	2010-04-17 16:08:28 +0000
@@ -1,3 +1,20 @@
+Claiming a person while not logged in
+=====================================
+
+An anonymous user visiting an unclaimed account will be given the option
+to request a merge, but the +requestmerge page will give an Unauthorized
+exception that will redirect the user to the login page.
+
+    >>> anon_browser.open('http://launchpad.dev/~matsubara')
+    >>> link = anon_browser.getLink("Are you Diogo Matsubara?")
+    >>> print link.url
+    http://launchpad.dev/people/+requestmerge?field.dupe_person=matsubara
+    >>> link.click()
+    Traceback (most recent call last):
+    ...
+    Unauthorized: ...
+
+
 Claiming a person while logged in
 =================================
 
@@ -5,8 +22,6 @@
 option to request a merge.
 
     >>> user_browser.open('http://launchpad.dev/~matsubara')
-    >>> user_browser.url
-    'http://launchpad.dev/~matsubara'
     >>> user_browser.getLink("Are you Diogo Matsubara?").click()
 
 Clicking on that link brought him to a page where he can request to

=== removed file 'lib/lp/registry/stories/person/xx-person-claim.txt'
--- lib/lp/registry/stories/person/xx-person-claim.txt	2009-09-16 17:56:17 +0000
+++ lib/lp/registry/stories/person/xx-person-claim.txt	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-= Claiming a person =
-
-Matsubara was browsing through Launchpad anonymously and found a page
-for himself, even though he has never used Launchpad (what a lie!).
-
-    >>> browser.open('http://launchpad.dev/~matsubara')
-    >>> browser.url
-    'http://launchpad.dev/~matsubara'
-
-He was wondering who created that when he saw a very prominent link,
-saying 'Are you Diogo Matsubara?'.  He promptly clicked on it.
-
-    >>> print extract_text(
-    ...     find_tag_by_id(browser.contents, 'not-lp-user-or-team'))
-    Diogo Matsubara does not use Launchpad. This page was created...
-    ...2006-12-13...when importing the Portuguese (Brazil) (pt_BR)...
-
-    >>> browser.getLink("Are you Diogo Matsubara?").click()
-
-Clicking on that link brought him to a page where he can claim that
-Launchpad profile.
-
-    >>> browser.url
-    'http://launchpad.dev/%7Ematsubara/+claim'
-
-He first tries it with an old email address he had, but we tell him that
-the given email address is not associated with that profile.
-
-    >>> browser.getControl('Email address').value = '[e-mail]'
-    >>> browser.getControl('E-mail Me').click()
-    >>> soup = find_main_content(browser.contents)
-    >>> for tag in soup('div', 'message'):
-    ...     print tag.renderContents()
-    We couldn't find this email address. Please try another one that could
-    possibly be associated with this profile. Note that this profile's name
-    (matsubara) was generated based on the email address it's associated with.
-
-Then he tries with Sample Person's email address.
-
-    >>> browser.getControl('Email address').value = '[e-mail]'
-    >>> browser.getControl('E-mail Me').click()
-    >>> soup = find_main_content(browser.contents)
-    >>> for tag in soup('div', 'message'):
-    ...     print tag.renderContents()
-    This email address is associated with yet another Launchpad profile, which
-    you seem to have used at some point. If that's the case, you can <a
-    href="/people/+requestmerge?field.dupe_person=matsubara">combine this
-    profile with the other one</a> (you'll have to log in with the other
-    profile first, though). If that's not the case, please try with a
-    different email address.
-
-And once again he tries with an email address he found in Launchpad, but
-this one is associated with an unvalidated profile.
-
-    >>> browser.getControl('Email address').value = '[e-mail]'
-    >>> browser.getControl('E-mail Me').click()
-    >>> soup = find_main_content(browser.contents)
-    >>> for tag in soup('div', 'message'):
-    ...     print tag.renderContents()
-    Although this email address is not associated with this profile, it's
-    associated with yet another one. You can <a
-    href="http://launchpad.dev/~morten/+claim">claim that other
-    profile</a> and then later <a href="/people/+requestmerge">combine</a>
-    both of them into a single one.
-
-Now he finally remembered his email address.
-
-    >>> browser.getControl('Email address').value = '[e-mail]'
-    >>> browser.getControl('E-mail Me').click()
-
-    >>> 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()
-    >>> to_addr
-    ['[e-mail]']
-    >>> token_url = get_token_url_from_email(msg)
-    >>> token_url
-    'http://launchpad.dev/token/...'
-
-    >>> browser.open(token_url)
-    >>> browser.url == "%s/+claimprofile" % token_url
-    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/~matsubara'
-    >>> soup = find_main_content(browser.contents)
-    >>> for tag in soup('div', 'informational message'):
-    ...     print tag.renderContents()
-    Profile claimed successfully
-
-It's also possible that a person tries to claim an account that has a
-preferred email but no password, like some accounts imported from
-Ubuntu's bugzilla. Although these accounts are not considered valid
-(that's why they can be claimed) 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]...'
-    >>> unregistered_user_info.a.renderContents()
-    'Are you Christian Reis?'
-
-    >>> anon_browser.open('http://launchpad.dev/~kiko')
-    >>> anon_browser.getLink("Are you Christian Reis?").click()
-    >>> anon_browser.url
-    'http://launchpad.dev/%7Ekiko/+claim'
-
-    >>> anon_browser.getControl('Email address').value = (
-    ...     '[e-mail]')
-    >>> anon_browser.getControl('E-mail Me').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/+claimprofile" % token_url
-    True
-
-    >>> 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/~kiko'
-    >>> soup = find_main_content(anon_browser.contents)
-    >>> for tag in soup('div', 'informational message'):
-    ...     print tag.renderContents()
-    Profile claimed successfully
-
-Trying to access +claim for an already active team 404s as you would
-expect it to (we shouldn't be linking to from anywhere):
-
-    >>> user_browser.open("http://launchpad.dev/~ubuntu-team/+claim")
-    Traceback (most recent call last):
-    ...
-    NotFound:...

=== modified file 'lib/lp/registry/stories/team/xx-team-claim.txt'
--- lib/lp/registry/stories/team/xx-team-claim.txt	2009-11-22 15:43:16 +0000
+++ lib/lp/registry/stories/team/xx-team-claim.txt	2010-04-17 16:08:28 +0000
@@ -14,7 +14,7 @@
 definitely doesn't seem to be a team.
 
     >>> browser.open('http://launchpad.dev/~matsubara')
-    >>> browser.getLink(url='+claim')
+    >>> browser.getLink(url='+requestmerge')
     <Link text='Are you Diogo Matsubara?'...
 
 If a profile does look like a team and there is a logged in user, the link
@@ -25,15 +25,13 @@
     >>> [email.email for email in doc_team.guessedemails]
     [u'[e-mail]']
 
-Non-logged-in users see only a link to claim the profile..
+Non-logged-in users must log in to claim a team.
 
     >>> browser.open('http://launchpad.dev/~doc')
-    >>> browser.getLink(url='+claimteam')
+    >>> browser.getLink(url='+claimteam').click()
     Traceback (most recent call last):
     ...
-    LinkNotFoundError
-    >>> browser.getLink(url='+claim')
-    <Link text='Are you Ubuntu Doc Team?'...
+    Unauthorized:...
 
 While logged-in users get a link to claim that profile and turn it into a
 team. This works even if the profile's email addresses would normally be

=== modified file 'lib/lp/registry/templates/person-index.pt'
--- lib/lp/registry/templates/person-index.pt	2009-12-12 15:21:34 +0000
+++ lib/lp/registry/templates/person-index.pt	2010-04-17 16:08:28 +0000
@@ -157,7 +157,6 @@
         </tal:block>
       </p>
 
-      <tal:logged-in condition="request/lp:person">
         <tal:person condition="not: view/context_is_probably_a_team">
           <ul tal:condition="context/preferredemail">
             <li>
@@ -183,11 +182,6 @@
         <tal:team condition="view/context_is_probably_a_team">
           <a href="+claimteam">Is this a team you run?</a>
         </tal:team>
-      </tal:logged-in>
-
-      <tal:not-logged-in condition="not: request/lp:person">
-        <a href="+claim">Are you <span tal:replace="context/displayname" />?</a>
-      </tal:not-logged-in>
     </tal:noaccount>
 
     <tal:deactivated-account