Merge lp:~mvo/software-center/auto-fill-email-5.2 into lp:software-center/5.2

[Michael Vogt]

Backport of the auto-fill-email branch from quantal for 5.2

[Gary Lasker (gary-lasker)]

Michael, awesome that you backported this. I think it's a really nice usability improvement and folks will appreciate it!

review: Approve

=== modified file 'softwarecenter/backend/ubuntusso.py'
--- softwarecenter/backend/ubuntusso.py	2012-04-24 14:16:06 +0000
+++ softwarecenter/backend/ubuntusso.py	2012-09-05 12:15:24 +0000
@@ -30,6 +30,7 @@
 # mostly for testing
 from fake_review_settings import FakeReviewSettings, network_delay
 from spawn_helper import SpawnHelper
+from softwarecenter.config import get_config
 
 LOG = logging.getLogger(__name__)
 
@@ -52,6 +53,10 @@
         GObject.GObject.__init__(self)
 
     def _on_whoami_data(self, spawner, piston_whoami):
+        # once we have data, make sure to save it
+        config = get_config()
+        config.set("general", "email", piston_whoami["preferred_email"])
+        # emit
         self.emit("whoami", piston_whoami)
 
     def whoami(self):

=== modified file 'softwarecenter/config.py'
--- softwarecenter/config.py	2012-05-15 07:51:29 +0000
+++ softwarecenter/config.py	2012-09-05 12:15:24 +0000
@@ -67,7 +67,6 @@
                      self.configfile, e)
             pass
 
-
 _software_center_config = None
 
 

=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
--- softwarecenter/ui/gtk3/views/purchaseview.py	2012-04-02 18:23:20 +0000
+++ softwarecenter/ui/gtk3/views/purchaseview.py	2012-09-05 12:15:24 +0000
@@ -112,6 +112,11 @@
     def init_view(self):
         if self.wk is None:
             self.wk = ScrolledWebkitWindow()
+            # automatically fill in the email in the login page
+            email = ""
+            if self.config.has_option("general", "email"):
+                email = self.config.get("general", "email")
+            self.wk.webkit.set_auto_insert_email(email)
             #self.wk.webkit.connect("new-window-policy-decision-requested",
             #    self._on_new_window)
             self.wk.webkit.connect("create-web-view", self._on_create_web_view)

=== modified file 'softwarecenter/ui/gtk3/views/webkit.py'
--- softwarecenter/ui/gtk3/views/webkit.py	2012-08-28 14:26:41 +0000
+++ softwarecenter/ui/gtk3/views/webkit.py	2012-09-05 12:15:24 +0000
@@ -54,16 +54,30 @@
     - send Accept-Language headers from the users language
     - disable plugings
     - send a custom user-agent string
+    - auto-fill in id_email in login.ubuntu.com
     """
 
+    # javascript to auto fill email login on login.ubuntu.com
+    AUTO_FILL_SERVER = "https://login.ubuntu.com"
+    AUTO_FILL_EMAIL_JS = """
+document.getElementById("id_email").value="%s";
+document.getElementById("id_password").focus();
+"""
+
     def __init__(self):
         # actual webkit init
         webkit.WebView.__init__(self)
         self.connect("resource-request-starting",
                      self._on_resource_request_starting)
+        self.connect("notify::load-status",
+            self._on_load_status_changed)
         settings = self.get_settings()
         settings.set_property("enable-plugins", False)
         settings.set_property("user-agent", self._get_user_agent_string())
+        self._auto_fill_email = ""
+
+    def set_auto_insert_email(self, email):
+        self._auto_fill_email = email
 
     def _get_user_agent_string(self):
         settings = self.get_settings()
@@ -83,6 +97,20 @@
         #    print name, value
         #headers.foreach(_show_header, None)
 
+    def _maybe_auto_fill_in_username(self):
+        uri = self.get_uri()
+        if self._auto_fill_email and uri.startswith(self.AUTO_FILL_SERVER):
+            self.execute_script(
+                self.AUTO_FILL_EMAIL_JS % self._auto_fill_email)
+            # ensure that we have the keyboard focus
+            self.grab_focus()
+
+    def _on_load_status_changed(self, view, pspec):
+        prop = pspec.name
+        status = view.get_property(prop)
+        if status == webkit.LoadStatus.FINISHED:
+            self._maybe_auto_fill_in_username()
+
 
 class ScrolledWebkitWindow(Gtk.VBox):
 

=== modified file 'test/gtk3/test_webkit.py'
--- test/gtk3/test_webkit.py	2012-08-28 14:26:41 +0000
+++ test/gtk3/test_webkit.py	2012-09-05 12:15:24 +0000
@@ -1,6 +1,10 @@
 import unittest
 
-from gi.repository import Soup, WebKit
+from gi.repository import (
+    GObject,
+    Soup,
+    WebKit,
+    )
 
 from mock import patch
 
@@ -36,7 +40,22 @@
         self.assertTrue(
             canary in settings.get_property("user-agent"))
         
-        
+    def test_auto_fill_in_email(self):
+        def _load_status_changed(view, status):
+            if view.get_property("load-status") == WebKit.LoadStatus.FINISHED:
+                loop.quit()
+        loop =  GObject.MainLoop(GObject.main_context_default())       
+        webview = SoftwareCenterWebView()
+        email = "foo@bar"
+        webview.set_auto_insert_email(email)
+        with patch.object(webview, "execute_script") as mock_execute_js:
+            webview.connect("notify::load-status", _load_status_changed)
+            webview.load_uri("https://login.ubuntu.com")
+            loop.run()
+            mock_execute_js.assert_called()
+            mock_execute_js.assert_called_with(
+                SoftwareCenterWebView.AUTO_FILL_EMAIL_JS % email)
+
 
 if __name__ == "__main__":
     unittest.main()