Merge lp:~nataliabidart/ubuntu-sso-client/displayname-stable into lp:ubuntu-sso-client/stable-1-0

[Natalia Bidart]

- Register now uses the 'displayname' field to pass it on to SSO as display name (LP: #709494).

To properly test please use the SRU instructions in the attached bug report. Thanks!

[Eric Casteleijn (thisfred)]

Confirmed that I can't leave name blank, and the full name shows up in login.ubuntu.com, after using this branch to register from a maverick machine.

review: Approve

[Manuel de la Peña (mandel)]

Looks good, I launched the UI and everything worked as expected. Code looks good too.

review: Approve

=== modified file 'data/ui.glade'
--- data/ui.glade	2010-08-27 20:13:59 +0000
+++ data/ui.glade	2011-03-24 14:16:06 +0000
@@ -264,36 +264,62 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHButtonBox" id="hbuttonbox1">
+      <object class="GtkHBox" id="hbox2">
         <property name="visible">True</property>
-        <property name="spacing">5</property>
-        <property name="layout_style">end</property>
         <child>
-          <object class="GtkButton" id="join_cancel_button">
-            <property name="label">gtk-cancel</property>
+          <object class="GtkLinkButton" id="login_button">
+            <property name="label">login button</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
+            <property name="relief">none</property>
+            <signal name="clicked" handler="on_sign_in_button_clicked" swapped="no"/>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="join_ok_button">
-            <property name="label">gtk-go-forward</property>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
-            <signal name="clicked" handler="on_join_ok_button_clicked"/>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="join_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="join_ok_button">
+                <property name="label">gtk-go-forward</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_join_ok_button_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -303,24 +329,6 @@
         <property name="position">12</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkLinkButton" id="login_button">
-        <property name="label" translatable="yes">login button</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="has_tooltip">True</property>
-        <property name="relief">none</property>
-        <signal name="clicked" handler="on_sign_in_button_clicked"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">13</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkVBox" id="processing_vbox">
     <property name="visible">True</property>
 
=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-12-15 21:39:30 +0000
+++ ubuntu_sso/gui.py	2011-03-24 14:16:06 +0000
@@ -387,8 +387,6 @@
                 msg = 'UbuntuSSOClientGUI: failed set_transient_for win id %r'
                 logger.exception(msg, window_id)
 
-        # Hidding unused widgets to save some space (LP #627440).
-        self.name_entry.hide()
         self.yes_to_updates_checkbutton.hide()
 
         self.window.show()
@@ -769,11 +767,10 @@
 
         error = False
 
-        # Hidding unused widgets to save some space (LP #627440).
-        #name = self.name_entry.get_text()
-        #if not name:
-        #    self.name_entry.set_warning(self.FIELD_REQUIRED)
-        #    error = True
+        name = self.name_entry.get_text()
+        if not name:
+            self.name_entry.set_warning(self.FIELD_REQUIRED)
+            error = True
 
         # check email
         email1 = self.email1_entry.get_text()
@@ -812,10 +809,11 @@
         self.user_password = password1
 
         logger.info('Calling register_user with email %r, password <hidden>,' \
-                    ' captcha_id %r and captcha_solution %r.', email1,
-                    self._captcha_id, captcha_solution)
+                    ' name %r, captcha_id %r and captcha_solution %r.', email1,
+                    name, self._captcha_id, captcha_solution)
         f = self.backend.register_user
-        f(self.app_name, email1, password1, self._captcha_id, captcha_solution,
+        f(self.app_name, email1, password1, name,
+          self._captcha_id, captcha_solution,
           reply_handler=NO_OP, error_handler=NO_OP)
 
     def on_tc_button_clicked(self, *args, **kwargs):
 
=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-12-15 21:39:30 +0000
+++ ubuntu_sso/main.py	2011-03-24 14:16:06 +0000
@@ -171,11 +171,12 @@
 
         return captcha['captcha_id']
 
-    def register_user(self, email, password, captcha_id, captcha_solution):
+    def register_user(self, email, password, displayname,
+                      captcha_id, captcha_solution):
         """Register a new user with 'email' and 'password'."""
         logger.debug('register_user: email: %r password: <hidden>, '
-                     'captcha_id: %r, captcha_solution: %r',
-                     email, captcha_id, captcha_solution)
+                     'displayname: %r, captcha_id: %r, captcha_solution: %r',
+                     email, displayname, captcha_id, captcha_solution)
         sso_service = self.sso_service_class(None, self.service_url)
         if not self._valid_email(email):
             logger.error('register_user: InvalidEmailError for email: %r',
@@ -186,7 +187,9 @@
             raise InvalidPasswordError()
 
         result = sso_service.registrations.register(
-                    email=email, password=password, captcha_id=captcha_id,
+                    email=email, password=password,
+                    displayname=displayname,
+                    captcha_id=captcha_id,
                     captcha_solution=captcha_solution)
         logger.info('register_user: email: %r result: %r', email, result)
 
@@ -377,13 +380,13 @@
                      'app_name "%s" and error %r', app_name, error)
 
     @dbus.service.method(dbus_interface=DBUS_IFACE_USER_NAME,
-                         in_signature='sssss')
-    def register_user(self, app_name, email, password,
+                         in_signature='ssssss')
+    def register_user(self, app_name, email, password, name,
                       captcha_id, captcha_solution):
         """Call the matching method in the processor."""
         def f():
             """Inner function that will be run in a thread."""
-            return self.processor.register_user(email, password,
+            return self.processor.register_user(email, password, name,
                                                 captcha_id, captcha_solution)
         blocking(f, app_name, self.UserRegistered, self.UserRegistrationError)
 
 
=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-11-03 17:43:17 +0000
+++ ubuntu_sso/tests/test_gui.py	2011-03-24 14:16:06 +0000
@@ -678,7 +678,7 @@
         expected = 'register_user'
         self.assertIn(expected, self.ui.backend._called)
         self.assertEqual(self.ui.backend._called[expected],
-                         ((APP_NAME, EMAIL, PASSWORD, CAPTCHA_ID,
+                         ((APP_NAME, EMAIL, PASSWORD, NAME, CAPTCHA_ID,
                            CAPTCHA_SOLUTION),
                           dict(reply_handler=gui.NO_OP,
                                error_handler=gui.NO_OP)))
@@ -1163,11 +1163,6 @@
                                           self.ui.FIELD_REQUIRED)
         self.assertNotIn('register_user', self.ui.backend._called)
 
-    # Unused variable 'skip'
-    # pylint: disable=W0612
-    test_warning_is_shown_if_name_empty.skip = \
-        'Unused for now, will be hidden to save space (LP: #627440).'
-
     def test_warning_is_shown_if_empty_email(self):
         """A warning message is shown if emails are empty."""
         self.ui.email1_entry.set_text('')
 
=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-12-15 21:39:30 +0000
+++ ubuntu_sso/tests/test_main.py	2011-03-24 14:16:06 +0000
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
 # test_main - tests for ubuntu_sso.main
 #
 # Author: Natalia Bidart <[e-mail]>
@@ -63,6 +65,7 @@
 EMAIL_ALREADY_REGISTERED = '[e-mail]'
 EMAIL_TOKEN = 'B2Pgtf'
 HELP = 'help text'
+NAME = 'Juanito Pérez'
 PASSWORD = 'be4tiFul'
 RESET_PASSWORD_TOKEN = '8G5Wtq'
 TOKEN = {u'consumer_key': u'xQ7xDAz',
@@ -107,7 +110,8 @@
 class FakedRegistrations(object):
     """Fake the registrations service."""
 
-    def register(self, email, password, captcha_id, captcha_solution):
+    def register(self, email, password, displayname,
+                 captcha_id, captcha_solution):
         """Fake registration. Return a fix result."""
         if email == EMAIL_ALREADY_REGISTERED:
             return {'status': 'error',
@@ -196,6 +200,7 @@
         """Init."""
         self.processor = SSOLoginProcessor(sso_service_class=FakedSSOServer)
         self.register_kwargs = dict(email=EMAIL, password=PASSWORD,
+                                    displayname=NAME,
                                     captcha_id=CAPTCHA_ID,
                                     captcha_solution=CAPTCHA_SOLUTION)
         self.login_kwargs = dict(email=EMAIL, password=PASSWORD,
@@ -510,8 +515,8 @@
         """Test that the register_user method works ok."""
         d = Deferred()
         expected_result = "expected result"
-        self.create_mock_processor().register_user(EMAIL, PASSWORD, CAPTCHA_ID,
-                                                   CAPTCHA_SOLUTION)
+        self.create_mock_processor().register_user(EMAIL, PASSWORD, NAME,
+            CAPTCHA_ID, CAPTCHA_SOLUTION)
         self.mocker.result(expected_result)
         self.patch(ubuntu_sso.main, "blocking", self.fake_ok_blocking)
         self.mocker.replay()
@@ -526,7 +531,7 @@
                           sso_login_processor_class=self.mockprocessorclass)
         self.patch(client, "UserRegistered", verify)
         self.patch(client, "UserRegistrationError", d.errback)
-        client.register_user(APP_NAME, EMAIL, PASSWORD, CAPTCHA_ID,
+        client.register_user(APP_NAME, EMAIL, PASSWORD, NAME, CAPTCHA_ID,
                              CAPTCHA_SOLUTION)
         return d
 
@@ -534,8 +539,8 @@
         """Test that the register_user method fails as expected."""
         d = Deferred()
         expected_result = "expected result"
-        self.create_mock_processor().register_user(EMAIL, PASSWORD, CAPTCHA_ID,
-                                                   CAPTCHA_SOLUTION)
+        self.create_mock_processor().register_user(EMAIL, PASSWORD, NAME,
+            CAPTCHA_ID, CAPTCHA_SOLUTION)
         self.mocker.result(expected_result)
         self.patch(ubuntu_sso.main, "blocking", self.fake_err_blocking)
         self.mocker.replay()
@@ -550,7 +555,7 @@
                           sso_login_processor_class=self.mockprocessorclass)
         self.patch(client, "UserRegistered", d.errback)
         self.patch(client, "UserRegistrationError", verify)
-        client.register_user(APP_NAME, EMAIL, PASSWORD, CAPTCHA_ID,
+        client.register_user(APP_NAME, EMAIL, PASSWORD, NAME, CAPTCHA_ID,
                              CAPTCHA_SOLUTION)
         return d