Merge lp:~mhall119/summit/auto-set-user-openid into lp:summit

[Michael Hall]

Set user openid when creating a new user from lpupdate

Set user openid when creating a new user from lpupdate.

If we create a user from launchpad without setting their openid, then when they try to log in they won't be able to use their launchpad username, since it will already exist but without their openid association. Previously this would cause them to get {launchpad_username}2 as their username, but with the introduction of the OPENID_STRICT_USERNAMES policy it would cause their login to fail.

[James Westby (james-w)]

review: Approve

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2011-09-30 20:08:35 +0000
+++ summit/schedule/models/summitmodel.py	2011-10-21 13:46:18 +0000
@@ -33,6 +33,8 @@
 from django.contrib.auth.models import User
 
 from summit.schedule.fields import NameField
+from summit.schedule import launchpad
+
 
 __all__ = (
     'Summit',
@@ -259,6 +261,7 @@
                 user = User.objects.get(username__exact=username[:30])
             except ObjectDoesNotExist:
                 user = User.objects.create_user(username[:30], '', password=None)
+                launchpad.set_user_openid(user)
 
             # Create with any start/end time since we overwrite shortly
             attendee = self.attendee_set.create(user=user,

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-10-20 12:30:40 +0000
+++ summit/schedule/tests.py	2011-10-21 13:46:18 +0000
@@ -34,6 +34,7 @@
 
 from summit.schedule.models import *
 from summit.schedule.render import Schedule
+from summit.schedule import launchpad
 
 # Monkey-patch our NameField into the types of fields that the factory
 # understands.  This is simpler than trying to subclass the Mommy
@@ -1665,3 +1666,18 @@
                 auto=False)
         summit.reschedule()
         self.assertEqual(1, slot.agenda_set.all().count())
+
+    def test_update_from_launchpad_adds_attendees(self):
+        def mock_set_openid(user, force=False):
+            self.assertEquals(user.username, 'testuser')
+            mock_set_openid.called = True
+            return True
+        mock_set_openid.called = False
+        launchpad.set_user_openid = mock_set_openid
+
+        summit = factory.make_one(Summit)
+        attendee_node = LaunchpadExportNode(name='testuser')
+        summit.update_attendee_from_launchpad(attendee_node)
+
+        self.assertEqual(1, summit.attendee_set.filter(user__username__exact="testuser").count())
+        self.assertTrue(mock_set_openid.called)