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

[Łukasz Czyżykowski]

Updated code to use new lp_OpenIdIdentifier table.

Updated code to use new lp_OpenIdIdentifier table. For that to work updated code, test suite and fixtures.

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'identityprovider/fixtures/test.json'
--- identityprovider/fixtures/test.json	2010-05-07 20:29:41 +0000
+++ identityprovider/fixtures/test.json	2010-12-20 18:58:30 +0000
@@ -14,6 +14,11 @@
         }
     },
     {
+        "pk": "mark_oid",
+        "model": "identityprovider.lpopenididentifier",
+        "fields": {"lp_account": 1, "date_created": "2005-06-06 08:59:51"}
+    },
+    {
         "pk": 12,
         "model": "identityprovider.account",
         "fields": {
@@ -56,6 +61,12 @@
         }
     },
     {
+        "pk": "cCGE3LA",
+        "model": "identityprovider.lpopenididentifier",
+        "fields": {"lp_account": 10, "date_created": "2005-06-06 08:59:51"}
+    },
+
+    {
         "pk": 243611,
         "model": "identityprovider.account",
         "fields": {
@@ -100,7 +111,7 @@
         "model": "identityprovider.emailaddress",
         "fields": {
             "status": 4,
-            "lp_person": null,
+            "lp_person": 1,
             "account": 1,
             "email": "[e-mail]",
             "date_created": "2006-10-16 18:31:43"
@@ -185,13 +196,6 @@
     },
     {
         "pk": 1,
-        "model": "identityprovider.lpaccount",
-        "fields": {
-            "openid_identifier": "mark_oid"
-        }
-    },
-    {
-        "pk": 1,
         "model": "identityprovider.person",
         "fields": {
             "displayname": "Mark Shuttleworth",
@@ -234,13 +238,6 @@
     },
     {
         "pk": 12,
-        "model": "identityprovider.lpaccount",
-        "fields": {
-            "openid_identifier": "name12_oid"
-        }
-    },
-    {
-        "pk": 12,
         "model": "identityprovider.person",
         "fields": {
             "displayname": "Sample Person",
@@ -283,13 +280,6 @@
     },
     {
         "pk": 66,
-        "model": "identityprovider.lpaccount",
-        "fields": {
-            "openid_identifier": "matsubara_oid"
-        }
-    },
-    {
-        "pk": 66,
         "model": "identityprovider.person",
         "fields": {
             "displayname": "Diogo Matsubara",
@@ -373,13 +363,6 @@
     },
     {
         "pk": 243610,
-        "model": "identityprovider.lpaccount",
-        "fields": {
-            "openid_identifier": "cCGE3LA"
-        }
-    },
-    {
-        "pk": 243610,
         "model": "identityprovider.person",
         "fields": {
             "displayname": "Gold Member",
@@ -417,14 +400,7 @@
             "mailing_list_receive_duplicates": true,
             "visibility": 1,
             "verbose_bugnotifications": false,
-            "lp_account": 243610
-        }
-    },
-    {
-        "pk": 243611,
-        "model": "identityprovider.lpaccount",
-        "fields": {
-            "openid_identifier": "MGWJnTL"
+            "lp_account": 10
         }
     },
     {

=== modified file 'identityprovider/management/commands/populate.py'
--- identityprovider/management/commands/populate.py	2010-10-11 20:35:49 +0000
+++ identityprovider/management/commands/populate.py	2010-12-20 18:58:30 +0000
@@ -101,7 +101,9 @@
         self.nicks = []
         self.translation_table = (lowercase * 10)[:256]
 
-        self.populate_table('lp_account', self.gen_lp_account, naccounts)
+        self.populate_table('lp_openididentifier',
+                            self.gen_lp_openididentifier, naccounts,
+                            numeric_id=False)
         self.populate_table('lp_person', self.gen_lp_person, naccounts)
         self.populate_table('account', self.gen_account, naccounts)
         self.populate_table('accountpassword', self.gen_accountpassword,
@@ -169,14 +171,14 @@
         password = encrypt_launchpad_password(plaintext)
         return [str(id), str(account_id), password]
 
-    def gen_lp_account(self, id):
-        """ Returns a sequence representing an LPAccount.
+    def gen_lp_openididentifier(self, id):
+        """ Returns a sequence representing an LPOpenIdIdentfier.
 
-        Currently (id, openid)
+        Currently (id, openid, date_created)
         """
         openid = self.random_string(size=10)
         self.openids.append(openid)
-        return [str(id), openid]
+        return [openid, str(id), self.random_date()]
 
     def gen_lp_person(self, id):
         """ Returns a sequence representing a Person.
@@ -190,7 +192,7 @@
             renewal_policy, personal_standing, personal_standing_reason,
             mail_resumption_date, mailing_list_auto_subscribe_policy,
             mailing_list_receive_duplicates, visibility,
-            verbose_bugnotifications, lp_account)
+            verbose_bugnotifications)
         """
         displayname = self.random_string(12)
         nick = self.random_string(8) + str(id)
@@ -198,7 +200,7 @@
         datecreated = self.random_date()
         account_id = (id - self.ranges['lp_person'][0] +
             self.ranges['lp_account'][0])
-        return [str(id), displayname, 'NULL', '', nick,
+        return [str(account_id), displayname, 'NULL', '', nick,
             'NULL', '', '0', '0',
             '1', 'NULL', datecreated, '',
             '', '', '', '', 'NULL', '',
@@ -206,7 +208,7 @@
             str(AccountCreationRationale.USER_CREATED), '', 'NULL', 'NULL',
             '10', '0', '',
             'NULL', '1', 't', '1',
-            'f', str(account_id)]
+            'f']
 
     def gen_emailaddress(self, id):
         """ Returns a sequence representing an EmailAddress.

=== modified file 'identityprovider/models/account.py'
--- identityprovider/models/account.py	2010-11-11 16:13:52 +0000
+++ identityprovider/models/account.py	2010-12-20 18:58:30 +0000
@@ -1,7 +1,7 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-import datetime
+from datetime import date, datetime, timedelta
 
 from django.conf import settings
 from django.contrib.auth import get_backends
@@ -20,8 +20,8 @@
     'Account',
     'AccountPassword',
     'DisplaynameField',
-    'LPAccount',
     'PasswordField',
+    'LPOpenIdIdentifier'
 )
 
 
@@ -71,14 +71,14 @@
 
 
 class Account(models.Model):
-    date_created = models.DateTimeField(default=datetime.datetime.utcnow,
+    date_created = models.DateTimeField(default=datetime.utcnow,
                                         editable=False)
     creation_rationale = \
             models.IntegerField(
                 choices=AccountCreationRationale._get_choices())
 
     status = models.IntegerField(choices=AccountStatus._get_choices())
-    date_status_set = models.DateTimeField(default=datetime.datetime.utcnow)
+    date_status_set = models.DateTimeField(default=datetime.utcnow)
     displayname = DisplaynameField()
     openid_identifier = models.TextField(default=generate_openid_identifier)
     status_comment = models.TextField(blank=True, null=True)
@@ -122,8 +122,8 @@
         Current rule of thumb is to return all sites accessed within previous
         24 hours.
         """
-        max_date_last_used = (datetime.datetime.now() -
-                              datetime.timedelta(hours=age_hours))
+        max_date_last_used = (datetime.now() -
+                              timedelta(hours=age_hours))
         sites = self.openidrpsummary_set.filter(
             date_last_used__gte=max_date_last_used)
         return sites.order_by('-date_last_used')
@@ -157,10 +157,15 @@
     @property
     def person(self):
         if not hasattr(self, '_person'):
-            lpaccounts = LPAccount.objects.filter(
-                openid_identifier=self.openid_identifier)
-            if len(lpaccounts) > 0:
-                persons = lpaccounts[0].person_set.all()
+            open_ids = LPOpenIdIdentifier.objects.filter(
+                identifier=self.openid_identifier)
+            if len(open_ids) > 0:
+                # Look up Person object with the same lp_account id as it's in
+                # lp_OpenIdIdentifier table
+                lp_account = open_ids[0].lp_account
+                # Importing it here to prevent cyclic import issue
+                from .person import Person
+                persons = Person.objects.filter(lp_account=lp_account)
                 if len(persons) > 0:
                     self._person = persons[0]
         return getattr(self, '_person', None)
@@ -293,17 +298,19 @@
         return _("Password for %s") % unicode(self.account)
 
 
-class LPAccount(models.Model):
-    """ A projected ghost of an account in LP.  Only the openid_identifier is
-        replicated over.
-    """
-    openid_identifier = models.TextField(unique=True)
+class LPOpenIdIdentifier(models.Model):
+    """
+    Mapping between Launchpad accounts and OpenID identifiers
+    """
+    identifier = models.TextField(unique=True, primary_key=True)
+    lp_account = models.IntegerField(null=False, db_column='account')
+    date_created = models.DateTimeField(null=False, default=date.today)
 
     class Meta:
         app_label = 'identityprovider'
-        db_table = u'lp_account'
-        verbose_name = _('LP account')
-        verbose_name_plural = _('LP accounts')
+        db_table = u'lp_openididentifier'
+        verbose_name = _("LP OpenID Identifier")
+        verbose_name_plural = _("LP OpenID Identifiers")
 
     def __unicode__(self):
-        return _("LP account for %s") % unicode(self.openid_identifier)
+        return _("LP OpenID Idetifier for %s") % unicode(self.account)

=== modified file 'identityprovider/models/person.py'
--- identityprovider/models/person.py	2010-05-21 13:38:16 +0000
+++ identityprovider/models/person.py	2010-12-20 18:58:30 +0000
@@ -3,8 +3,9 @@
 
 from django.db import models
 
-from identityprovider.models import (LPAccount, Account, Country, Language,
-                                      LibraryFileAlias)
+from identityprovider.models import (
+    Account, Country, Language, LibraryFileAlias, LPOpenIdIdentifier,
+)
 from identityprovider.models.const import AccountCreationRationale
 
 __all__ = (
@@ -63,8 +64,7 @@
     mailing_list_receive_duplicates = models.BooleanField(default=True)
     visibility = models.IntegerField(default=1)
     verbose_bugnotifications = models.BooleanField(default=False)
-    lp_account = models.ForeignKey(LPAccount, db_column='account',
-                                   null=True, blank=True)
+    lp_account = models.IntegerField(null=True, db_column='account')
 
     class Meta:
         app_label = 'identityprovider'
@@ -83,7 +83,7 @@
             except Person.DoesNotExist:
                 return False
         try:
-            tp = TeamParticipation.objects.get(team=team, person=self)
+            TeamParticipation.objects.get(team=team, person=self)
             return True
         except TeamParticipation.DoesNotExist:
             if self.id == team.teamowner.id:
@@ -93,10 +93,14 @@
     @property
     def account(self):
         if self.lp_account is not None:
-            accounts = Account.objects.filter(
-                openid_identifier=self.lp_account.openid_identifier)
-            if len(accounts) > 0:
-                return accounts[0]
+            open_ids = LPOpenIdIdentifier.objects.filter(
+                lp_account=self.lp_account)
+            if len(open_ids) > 0:
+                openid_identifier = open_ids[0].identifier
+                accounts = Account.objects.filter(
+                    openid_identifier=openid_identifier)
+                if len(accounts) > 0:
+                    return accounts[0]
 
     def is_team(self):
         return self.teamowner is not None

=== modified file 'identityprovider/tests/test_admin.py'
--- identityprovider/tests/test_admin.py	2010-10-14 13:52:06 +0000
+++ identityprovider/tests/test_admin.py	2010-12-20 18:58:30 +0000
@@ -6,8 +6,10 @@
 
 from identityprovider.admin import (AccountPasswordInline,
     EmailAddressInline)
-from identityprovider.models import (Account, AccountPassword, EmailAddress,
-    OpenIDRPConfig, APIUser, Person, LPAccount)
+from identityprovider.models import (EmailAddress,
+                                     OpenIDRPConfig, APIUser, Person)
+from identityprovider.models.account import (Account, AccountPassword,
+                                             LPOpenIdIdentifier)
 from identityprovider.models.const import EmailStatus
 from identityprovider.utils import validate_launchpad_password
 
@@ -29,7 +31,7 @@
         for model in (Account, OpenIDRPConfig, APIUser, EmailAddress):
             self.assertRaises(AlreadyRegistered, admin.site.register, model)
 
-        for model in (AccountPassword, Person, LPAccount):
+        for model in (AccountPassword, Person, LPOpenIdIdentifier):
             self.assertRaises(NotRegistered, admin.site.unregister, model)
 
     def test_openidrpconfig_allowed_sreg_checkboxes(self):

=== modified file 'identityprovider/tests/test_command_cleanup.py'
--- identityprovider/tests/test_command_cleanup.py	2010-11-02 19:44:09 +0000
+++ identityprovider/tests/test_command_cleanup.py	2010-12-20 18:58:30 +0000
@@ -12,7 +12,7 @@
 class CleanupCommandTestCase(TestCase):
     def tearDown(self):
         cursor = connection.cursor()
-        cursor.execute("""TRUNCATE lp_account, account, accountpassword,
+        cursor.execute("""TRUNCATE lp_openididentifier, account, accountpassword,
             emailaddress, lp_person, django_session, openidnonce,
             openidassociation CASCADE""")
         connection.connection.commit()

=== modified file 'identityprovider/tests/test_command_populate.py'
--- identityprovider/tests/test_command_populate.py	2010-10-13 19:26:09 +0000
+++ identityprovider/tests/test_command_populate.py	2010-12-20 18:58:30 +0000
@@ -4,12 +4,12 @@
 from django.test import TestCase
 
 from identityprovider.models import (Account, AccountPassword, EmailAddress,
-    Person, LPAccount, OpenIDAssociation, OpenIDNonce)
+    Person, LPOpenIdIdentifier, OpenIDAssociation, OpenIDNonce)
 
 class PopulateCommandTestCase(TestCase):
     def tearDown(self):
         cursor = connection.cursor()
-        cursor.execute("""TRUNCATE lp_account, account, accountpassword,
+        cursor.execute("""TRUNCATE lp_openididentifier, account, accountpassword,
             emailaddress, lp_person, django_session, openidnonce,
             openidassociation CASCADE""")
         connection.connection.commit()
@@ -18,7 +18,7 @@
 
     def check_populate_populates_correctly(self, naccounts=0, nsessions=0,
         nnonces=0, nassociations=0):
-        self.assertEqual(0, LPAccount.objects.count())
+        self.assertEqual(0, LPOpenIdIdentifier.objects.count())
         self.assertEqual(0, Account.objects.count())
         self.assertEqual(0, AccountPassword.objects.count())
         self.assertEqual(0, EmailAddress.objects.count())
@@ -30,7 +30,7 @@
         call_command('populate', accounts=naccounts, sessions=nsessions,
             nonces=nnonces, associations=nassociations, verbosity=0)
 
-        self.assertEqual(naccounts, LPAccount.objects.count())
+        self.assertEqual(naccounts, LPOpenIdIdentifier.objects.count())
         self.assertEqual(naccounts, Account.objects.count())
         self.assertEqual(naccounts, AccountPassword.objects.count())
         self.assertEqual(naccounts, EmailAddress.objects.count())

=== modified file 'identityprovider/tests/test_middleware.py'
--- identityprovider/tests/test_middleware.py	2010-11-23 12:27:53 +0000
+++ identityprovider/tests/test_middleware.py	2010-12-20 18:58:30 +0000
@@ -1,21 +1,17 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-import functools
 import logging
 import re
 import sys
-from urlparse import urlsplit
 
 from django.conf import settings
 from django.contrib.auth.models import User, AnonymousUser
-from django.http import QueryDict
-import django.test.client
 
 from openid.message import (IDENTIFIER_SELECT, OPENID1_URL_LIMIT, OPENID2_NS)
 
 from identityprovider.tests.utils import (BasicAccountTestCase, MockRequest,
-    OpenIDProviderTestCase, TestCase)
+    TestCase)
 from identityprovider.models import Account, EmailAddress, OpenIDRPConfig
 from identityprovider.middleware.exception import LogExceptionMiddleware
 from identityprovider.middleware.useraccount import (
@@ -32,6 +28,8 @@
 
 class UserAccountConversionMiddlewareTestCase(BasicAccountTestCase):
 
+    fixtures = ['test']
+
     def setUp(self):
         email = EmailAddress.objects.get(email__iexact='[e-mail]')
         self.account = email.account
@@ -158,6 +156,8 @@
 # The tests perform a login in order to acquire this session cookie.
 class CSRFMiddlewareTestCase(BasicAccountTestCase):
 
+    fixtures = ['test']
+
     def _land(self, client=None):
         client = client or self.client
         r = client.get('/')

=== modified file 'identityprovider/tests/test_models_account.py'
--- identityprovider/tests/test_models_account.py	2010-10-01 12:14:43 +0000
+++ identityprovider/tests/test_models_account.py	2010-12-20 18:58:30 +0000
@@ -6,7 +6,7 @@
 from django.contrib.auth.models import User
 from identityprovider.tests.utils import BasicAccountTestCase
 from identityprovider.models.account import (Account, AccountPassword,
-    AccountStatus, LPAccount)
+    AccountStatus)
 from identityprovider.models import account as a
 from identityprovider.models.emailaddress import EmailAddress
 from identityprovider.models.const import AccountCreationRationale, EmailStatus
@@ -161,7 +161,8 @@
         return account, get_backends
 
     def get_new_account(self):
-        return Account(openid_identifier='non-existing-identifier')
+        return Account.objects.create_account(
+            'test account', '[e-mail]', 'password')
 
     def get_existing_account(self):
         return Account.objects.get_by_email('[e-mail]')
@@ -321,9 +322,3 @@
         password = AccountPassword(account=account, password='password')
         self.assertEqual(unicode(password), u'Password for displayname')
 
-
-class LPAccountTestCase(BasicAccountTestCase):
-    def test_unicode(self):
-        account = LPAccount(openid_identifier='oid')
-        self.assertEqual(unicode(account), u'LP account for oid')
-

=== modified file 'identityprovider/tests/test_models_person.py'
--- identityprovider/tests/test_models_person.py	2010-05-21 13:42:36 +0000
+++ identityprovider/tests/test_models_person.py	2010-12-20 18:58:30 +0000
@@ -1,8 +1,8 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-
-
-from identityprovider.models.account import Account, LPAccount
+from random import randint
+
+from identityprovider.models.account import Account, LPOpenIdIdentifier
 from identityprovider.models.const import (AccountCreationRationale,
     AccountStatus)
 from identityprovider.models.person import Person
@@ -11,10 +11,12 @@
 
 
 class PersonTestCase(SQLCachedTestCase):
+
     pgsql_functions = ['generate_openid_identifier']
 
     def setUp(self):
-        lp_account = LPAccount.objects.create(openid_identifier='oid')
+        lp_account = randint(100, 10000)
+        LPOpenIdIdentifier.objects.create(identifier='oid', lp_account=lp_account)
         self.person1 = Person.objects.create(displayname='Person',
             name='person', lp_account=lp_account)
         self.person2 = Person.objects.create(displayname='Other', name='other')

=== modified file 'identityprovider/tests/test_utils.py'
--- identityprovider/tests/test_utils.py	2010-08-03 12:56:27 +0000
+++ identityprovider/tests/test_utils.py	2010-12-20 18:58:30 +0000
@@ -3,12 +3,12 @@
 import urllib2
 
 from unittest import TestCase
-from cStringIO import StringIO
 from django.utils.translation import ugettext as _
 
 from identityprovider.tests.utils import (BasicAccountTestCase,
     LPAccountTestCase, SQLCachedTestCase)
 from identityprovider.models.person import Person
+from identityprovider.models.account import LPOpenIdIdentifier
 from identityprovider.models.emailaddress import EmailAddress
 from identityprovider.utils import (canonical_url,
     get_person_and_account_by_email, password_policy_compliant,
@@ -46,21 +46,14 @@
 
 
 class LPGetPersonAndAccountByEmailTestCase(LPAccountTestCase):
+
     def test_person_does_not_exist(self):
-        # create email address with broken foreign key
-        email = EmailAddress.objects.get(email__iexact='[e-mail]')
-        lp_person_id = email.lp_person_id
-        email.lp_person_id = 0
-        email.save()
+        LPOpenIdIdentifier.objects.all().delete()
 
         # test method
         person, account = get_person_and_account_by_email('[e-mail]')
         self.assertEquals(None, person)
 
-        # restore model integrity
-        email.lp_person_id = lp_person_id
-        email.save()
-
 
 class PasswordPolicyCompliantTestCase(SQLCachedTestCase):
 

=== modified file 'identityprovider/tests/test_views_server.py'
--- identityprovider/tests/test_views_server.py	2010-09-15 13:41:44 +0000
+++ identityprovider/tests/test_views_server.py	2010-12-20 18:58:30 +0000
@@ -3,7 +3,8 @@
 
 import datetime
 import urlparse
-from copy import deepcopy
+
+from random import randint
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase
@@ -12,13 +13,13 @@
 
 from openid.message import (Message, IDENTIFIER_SELECT, OPENID1_URL_LIMIT,
     OPENID2_NS)
-from openid.server.server import Server, ProtocolError
 from openid.yadis.constants import YADIS_HEADER_NAME
 from urllib import quote, quote_plus
 
 import identityprovider.signed as signed
-from identityprovider.models import (Account, LPAccount, OpenIDAuthorization,
+from identityprovider.models import (Account, OpenIDAuthorization,
     OpenIDRPConfig, Person)
+from identityprovider.models.account import LPOpenIdIdentifier
 from identityprovider.models.const import (AccountStatus, EmailStatus,
     AccountCreationRationale)
 from identityprovider.models.person import PersonLocation
@@ -807,9 +808,11 @@
             status=AccountStatus.ACTIVE,
             displayname='User')
         self.account.save()
-        lp_account = LPAccount(
-            openid_identifier=self.account.openid_identifier)
-        lp_account.save()
+
+        lp_account = randint(1, 9999)
+        LPOpenIdIdentifier.objects.create(
+            identifier=self.account.openid_identifier,
+            lp_account=lp_account)
         person = Person(lp_account=lp_account)
         person.save()
         now = datetime.datetime.now()

=== modified file 'identityprovider/tests/test_widgets.py'
--- identityprovider/tests/test_widgets.py	2010-07-18 03:58:26 +0000
+++ identityprovider/tests/test_widgets.py	2010-12-20 18:58:30 +0000
@@ -5,7 +5,8 @@
 from django.conf import settings
 from unittest import TestCase
 
-from identityprovider.models import Account, LPAccount
+from identityprovider.models import Account
+from identityprovider.models.account import LPOpenIdIdentifier
 from identityprovider.tests.utils import SQLCachedTestCase
 from identityprovider.widgets import (CommaSeparatedWidget, ROAwareSelect,
     ROAwareTextInput, StatusWidget, ReadOnlyDateTimeWidget, LPUsernameWidget)
@@ -139,7 +140,7 @@
 
 
 class LPUsernameWidgetTestCase(SQLCachedTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+
     fixtures = ['test']
 
     def setUp(self):
@@ -158,7 +159,7 @@
 
     def test_render_account_no_person(self):
         # unlink person
-        LPAccount.objects.filter(
-            openid_identifier=self.widget.account.openid_identifier).delete()
+        LPOpenIdIdentifier.objects.filter(
+            identifier=self.widget.account.openid_identifier).delete()
         r = self.widget.render('test', None)
         self.assertEqual(r, '')

=== modified file 'identityprovider/tests/utils.py'
--- identityprovider/tests/utils.py	2010-10-27 14:46:02 +0000
+++ identityprovider/tests/utils.py	2010-12-20 18:58:30 +0000
@@ -53,7 +53,7 @@
 class BasicAccountTestCase(SQLCachedTestCase):
     """ This SQLCachedTestCase subclass has some initial fixtures
     and functions set for basic tests. """
-    fixtures = ['lp_account', 'lp_accountpassword', 'lp_emailaddress_noperson']
+    fixtures = ['test']
     pgsql_functions = ['generate_openid_identifier']
 
     def reset_csrf(self):

=== modified file 'identityprovider/webservice/models.py'
--- identityprovider/webservice/models.py	2010-11-09 16:43:27 +0000
+++ identityprovider/webservice/models.py	2010-12-20 18:58:30 +0000
@@ -85,9 +85,8 @@
     if preferred_email is not None:
         preferred_email = preferred_email.email
 
-    people = Person.objects.filter(lp_account=user)
-    if people.count() == 1:
-        username = people[0].name
+    if user.person:
+        username = user.person.name
     else:
         username = user.openid_identifier