Merge lp:~dobey/ubuntuone-client/cp-account-info into lp:ubuntuone-client

[dobey]

Add code to get account details and show them in the Account tab in CP

[Martin Albisetti (beuno)]

review: Approve

[Rick McBride (rmcbride)]

Cool!

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-02-17 04:01:37 +0000
+++ bin/ubuntuone-preferences	2010-02-17 19:37:14 +0000
@@ -84,7 +84,6 @@
 
             self.__bus = dbus.SessionBus()
             self.keyring = gnomekeyring
-            self.httpclient = httplib2.Http()
 
             try:
                   client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
@@ -205,8 +204,8 @@
                         'percent' : percent })
             self.usage_graph.set_fraction(percent / 100)
 
-      def request_quota_info(self):
-            """Request new quota info from server, and update display."""
+      def request_REST_info(self, url, method):
+            """Make a REST request and return the resulting dict, or None."""
             consumer = oauth.OAuthConsumer("ubuntuone", "hammertime")
             items = []
             items = self.keyring.find_items_sync(
@@ -215,25 +214,36 @@
                    'oauth-consumer-key': consumer.key})
             token = oauth.OAuthToken.from_string(items[0].secret)
             request = oauth.OAuthRequest.from_consumer_and_token(
-                  http_url='https://one.ubuntu.com/api/quota/',
-                  http_method='GET',
-                  oauth_consumer=consumer,
+                  http_url=url, http_method=method, oauth_consumer=consumer,
                   token=token)
             request.sign_request(oauth.OAuthSignatureMethod_HMAC_SHA1(),
                                  consumer, token)
-            client = self.httpclient
+            client = httplib2.Http()
             headers = {}
             headers.update(request.to_header())
-            resp, content = client.request(request.http_url,
-                                           request.http_method,
-                                           headers=headers)
+            resp, content = client.request(url, method, headers=headers)
             if resp['status'] == '200':
-                  quota = simplejson.loads(content)
-                  self.update_quota_display(quota['used'], quota['total'])
+                  return simplejson.loads(content)
                   # FIXME: Log json parsing failures
             else:
                   # FIXME: Log errors
-                  return
+                  return None
+
+      def request_quota_info(self):
+            """Request new quota info from server, and update display."""
+            quota = self.request_REST_info('https://one.ubuntu.com/api/quota/',
+                                           'GET')
+            if quota:
+                  self.update_quota_display(quota['used'], quota['total'])
+
+      def request_account_info(self):
+            """Request account info from server, and update display."""
+            user = self.request_REST_info('https://one.ubuntu.com/api/account/',
+                                          'GET')
+            if user:
+                  self.name_label.set_text(user['nickname'])
+                  self.user_label.set_text(user['username'])
+                  self.mail_label.set_text(user['email'])
 
       def __construct(self):
             """Construct the dialog's layout."""
@@ -280,6 +290,49 @@
             self.notebook.set_tab_label_text(account, _("Account"))
             account.show()
 
+            # User info in account tab
+            table = gtk.Table(rows=3, columns=2)
+            table.set_row_spacings(6)
+            table.set_col_spacings(6)
+            account.pack_start(table, False, False)
+            table.show()
+
+            label = gtk.Label(_("_Name:"))
+            label.set_use_underline(True)
+            label.set_alignment(0.0, 0.5)
+            table.attach(label, 0, 1, 0, 1)
+            label.show()
+
+            self.name_label = gtk.Label("")
+            self.name_label.set_use_underline(True)
+            self.name_label.set_alignment(0.0, 0.5)
+            table.attach(self.name_label, 1, 2, 0, 1)
+            self.name_label.show()
+
+            label = gtk.Label(_("_Username:"))
+            label.set_use_underline(True)
+            label.set_alignment(0.0, 0.5)
+            table.attach(label, 0, 1, 1, 2)
+            label.show()
+
+            self.user_label = gtk.Label("")
+            self.user_label.set_use_underline(True)
+            self.user_label.set_alignment(0.0, 0.5)
+            table.attach(self.user_label, 1, 2, 1, 2)
+            self.user_label.show()
+
+            label = gtk.Label(_("_E-mail:"))
+            label.set_use_underline(True)
+            label.set_alignment(0.0, 0.5)
+            table.attach(label, 0, 1, 2, 3)
+            label.show()
+
+            self.mail_label = gtk.Label("")
+            self.mail_label.set_use_underline(True)
+            self.mail_label.set_alignment(0.0, 0.5)
+            table.attach(self.mail_label, 1, 2, 2, 3)
+            self.mail_label.show()
+
             # Devices tab
             devices = gtk.VBox(spacing=12)
             devices.set_border_width(6)
@@ -361,6 +414,7 @@
             self.disconnect_signal_handlers()
             dialog = UbuntuOneDialog()
             dialog.request_quota_info()
+            dialog.request_account_info()
             dialog.show()
 
       def got_oautherror(self, message=None):
 
=== modified file 'tests/test_preferences.py'
--- tests/test_preferences.py	2010-02-17 04:01:37 +0000
+++ tests/test_preferences.py	2010-02-17 19:37:14 +0000
@@ -48,6 +48,7 @@
 
         # For testing keyring queries
         self.keyring = self.mocker.mock()
+        self.u1prefs.httplib2 = self.mocker.mock()
         self.item = self.mocker.mock(gnomekeyring.Found)
 
         self.item_id = 999
@@ -114,13 +115,13 @@
         """Test that we can request the quota info properly."""
         self.mock_has_token()
         dialog = self.u1prefs.UbuntuOneDialog()
+        self.assertTrue(dialog is not None)
         dialog.keyring = self.keyring
         self.assertEqual(dialog.usage_graph.get_fraction(), 0.0)
-        self.assertTrue(dialog is not None)
         response = { 'status' : '200' }
         content = '{"total":2048, "used":1024}'
         client = self.mocker.mock()
-        dialog.httpclient = client
+        self.expect(self.u1prefs.httplib2.Http()).result(client)
         self.expect(client.request('https://one.ubuntu.com/api/quota/',
                                    'GET', KWARGS)).result((response, content))
         self.mocker.replay()
@@ -128,6 +129,27 @@
         self.assertEqual(dialog.usage_graph.get_fraction(), 0.5)
         dialog.destroy()
 
+    def test_request_account_info(self):
+        """Test that we can request the account info properly."""
+        self.mock_has_token()
+        dialog = self.u1prefs.UbuntuOneDialog()
+        self.assertTrue(dialog is not None)
+        dialog.keyring = self.keyring
+        response = { 'status' : '200' }
+        content = '''{"username": "ubuntuone", "nickname": "Ubuntu One",
+                     "email": "[e-mail]"}
+                  '''
+        client = self.mocker.mock()
+        self.expect(self.u1prefs.httplib2.Http()).result(client)
+        self.expect(client.request('https://one.ubuntu.com/api/account/',
+                                   'GET', KWARGS)).result((response, content))
+        self.mocker.replay()
+        dialog.request_account_info()
+        self.assertEqual(dialog.name_label.get_text(), 'Ubuntu One')
+        self.assertEqual(dialog.user_label.get_text(), 'ubuntuone')
+        self.assertEqual(dialog.mail_label.get_text(), '[e-mail]')
+        dialog.destroy()
+
     def test_login_check(self):
         """Test that our login check works correctly."""
         self.mocker.replay()