Merge lp:~alecu/unity-lens-music/rework-credentials-check into lp:~unity-team/unity-lens-music/libunity7-compatible

[Alejandro J. Cura]

- Move account checking to payment preview (LP: #1170773).

* Credentials check was moved from search to the payment preview (LP: #1170773)
* Fixed the path and parameters for the new login ui

[dobey (dobey)]

The autotools portions (which alecu asked me to review) look good to me.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-lens-music/rework-credentials-check]

148. By Alejandro J. Cura on 2013-04-25

fix for the tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/14/rebuild

review: Approve (continuous-integration)

[lp:~alecu/unity-lens-music/rework-credentials-check]

149. By Alejandro J. Cura on 2013-04-25

fix formatting issue

[Michal Hruby (mhr3)]

Looks reasonable to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/15

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/15/rebuild

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-04-23 08:09:36 +0000
+++ configure.ac	2013-04-25 16:47:27 +0000
@@ -116,6 +116,9 @@
 AS_AC_EXPAND(DATADIR, $datarootdir)
 AC_SUBST(DATADIR)
 
+AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+AC_SUBST(LIBEXECDIR)
+
 #####################################################
 # Look for dbus service dir
 #####################################################
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-04-17 15:02:43 +0000
+++ src/Makefile.am	2013-04-25 16:47:27 +0000
@@ -4,6 +4,7 @@
 EXTRA_DIST =
 
 DATADIR = $(datadir)
+LIBEXECDIR = $(libexecdir)
 
 # we're using Vala, C warnings are useless
 AM_CFLAGS = -w
@@ -70,6 +71,7 @@
   $(NULL)
 
 unity_musicstore_daemon_CPPFLAGS = \
+  -DLIBEXECDIR=\"$(LIBEXECDIR)\" \
   $(unity_music_daemon_CPPFLAGS)
 
 unity_musicstore_daemon_VALAFLAGS = \
 
=== modified file 'src/config.vala.in'
--- src/config.vala.in	2013-03-13 12:14:27 +0000
+++ src/config.vala.in	2013-04-25 16:47:27 +0000
@@ -8,6 +8,8 @@
   
   const string BINDIR = "@prefix@/bin";
   
+  const string LIBEXECDIR = "@LIBEXECDIR@";
+  
   const string LOCALEDIR = "@DATADIR@/locale";
   
   const string PACKAGE = "@PACKAGE@";
 
=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-04-22 09:02:29 +0000
+++ src/musicstore-scope.vala	2013-04-25 16:47:27 +0000
@@ -29,7 +29,7 @@
   private const string ERROR_MESSAGE_NOT_LOGGED_IN = _("It seems you don't have an Ubuntu One account, or you are not logged in. To continue, please login and visit the Ubuntu One online store.");
   private const string ERROR_MESSAGE_NO_PAYMENT_METHOD = _("It seems you haven't set yet your preferred Ubuntu One payment method. To add a payment method, please visit the Ubuntu One online store.");
   private const string ERROR_MESSAGE_TECHNICAL_PROBLEM = _("Sorry, we have encountered a technical problem. No money has been taken from your account. To try your purchase again, please visit the Ubuntu One online store.");
-  private const string U1_SSO_UI = "u1_login_register";
+  private const string UBUNTUONE_MUSIC_LOGIN = Config.LIBEXECDIR + "/ubuntuone-credentials/ubuntuone-music-login";
 
   public class MusicStoreScopeProxy : SimpleScope
   {
@@ -164,12 +164,6 @@
 	warning ("Failed to search for '%s': %s", search.search_string, e.message);
       }
 
-      try {
-        yield purchase_service.fetch_account_info ();
-        debug ("retrieved account info: %s %s", purchase_service.nickname, purchase_service.email);
-      } catch (PurchaseError e) {
-        debug ("can't get account info: %s", e.message);
-      }
     }
 
     delegate Unity.ActivationResponse LinkHandler (string uri);
@@ -211,15 +205,16 @@
       SList<Track> tracks = null;
       collection.get_album_details (uri, out album, out tracks);
 
-      var ui_path = Environment.find_program_in_path (U1_SSO_UI);
+      debug ("Finding %s", UBUNTUONE_MUSIC_LOGIN);
+      var ui_path = Environment.find_program_in_path (UBUNTUONE_MUSIC_LOGIN);
       GLib.Pid child_pid;
-      string argv[11] = {
+      string argv[6] = {
         ui_path,
-        "--album", album.title,
-        "--artist", album.artist,
-        "--price", album.formatted_price,
-        "--picture", album.artwork_path,
-        "--url", uri
+        "--album=" + album.title,
+        "--artist=" + album.artist,
+        "--price=" + album.formatted_price,
+        "--picture=" + album.artwork_path,
+        "--url=" + uri
       };
       if (ui_path != null) {
         try {
@@ -229,14 +224,61 @@
               return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
           }
         } catch (GLib.SpawnError e) {
-          debug ("Failed to start u1_sso_ui for uri %s", uri);
+          debug ("Failed to start ubuntuone-music-login for uri %s", uri);
         }
       }
       return open_uri (uri);
     }
 
+    bool run_with_timeout (MainLoop ml, uint timeout_ms)
+    {
+        bool timeout_reached = false;
+        var t_id = Timeout.add (timeout_ms, () => {
+            timeout_reached = true;
+            debug ("Timeout reached");
+            ml.quit ();
+            return false;
+        });
+
+        ml.run ();
+
+        if (!timeout_reached) {
+            Source.remove (t_id);
+        }
+
+        return !timeout_reached;
+    }
+
+    void fetch_account_info_sync () throws PurchaseError
+    {
+        PurchaseError failure = null;
+        MainLoop mainloop = new MainLoop ();
+        purchase_service.fetch_account_info.begin((obj, res) => {
+            mainloop.quit ();
+            try {
+                purchase_service.fetch_account_info.end (res);
+            } catch (PurchaseError e) {
+                failure = e;
+            }
+        });
+        if (!run_with_timeout (mainloop, 10000)) {
+            throw new PurchaseError.MISSING_CREDENTIALS_ERROR ("Timeout getting credentials.");
+        }
+        if (failure != null) {
+            throw failure;
+        }
+    }
+
     public Unity.ActivationResponse show_purchase_preview (string uri)
     {
+
+      try {
+        fetch_account_info_sync ();
+        debug ("retrieved account info: %s %s", purchase_service.nickname, purchase_service.email);
+      } catch (PurchaseError e) {
+        debug ("can't get account info: %s", e.message);
+      }
+
       if (purchase_service.got_credentials () == false)
       {
         debug ("no credentials available, opening sso login. %s", uri);
 
=== modified file 'src/ubuntuone-webservices.vala'
--- src/ubuntuone-webservices.vala	2013-04-17 19:25:40 +0000
+++ src/ubuntuone-webservices.vala	2013-04-25 16:47:27 +0000
@@ -22,7 +22,9 @@
 [DBus (name = "com.ubuntuone.CredentialsManagement")]
 interface CredentialsManagement : GLib.Object {
     public signal void credentials_found (HashTable <string, string> info);
-    public signal void credentials_error ();
+    public signal void credentials_not_found ();
+    public signal void credentials_error (HashTable <string, string> error_dict);
+
 
     [DBus (name = "find_credentials")]
     public abstract void find_credentials () throws Error;
@@ -176,8 +178,14 @@
                 debug ("got credentials");
                 fetch_credentials.callback ();
             });
-            ulong error_handler = credentials_management.credentials_error.connect (() => {
+            ulong not_found_handler = credentials_management.credentials_not_found.connect (() => {
+                error = new PurchaseError.MISSING_CREDENTIALS_ERROR ("No Ubuntu One tokens.");
+                debug ("not found handler");
+                fetch_credentials.callback ();
+            });
+            ulong error_handler = credentials_management.credentials_error.connect ((error_dict) => {
                 error = new PurchaseError.MISSING_CREDENTIALS_ERROR ("Can't get Ubuntu One tokens.");
+                debug ("error handler");
                 fetch_credentials.callback ();
             });
 
@@ -189,6 +197,7 @@
             }
 
             credentials_management.disconnect (found_handler);
+            credentials_management.disconnect (not_found_handler);
             credentials_management.disconnect (error_handler);
 
             if (error != null) {
 
=== modified file 'tests/unit/test-ubuntuone-purchases.vala'
--- tests/unit/test-ubuntuone-purchases.vala	2013-03-19 21:41:57 +0000
+++ tests/unit/test-ubuntuone-purchases.vala	2013-04-25 16:47:27 +0000
@@ -201,10 +201,18 @@
 
   class FailingCredentialsManagement : GLib.Object, CredentialsManagement
   {
+    private HashTable <string, string> fake_error_info;
+
+    construct
+    {
+      fake_error_info = new HashTable <string, string> (str_hash, str_equal);
+      fake_error_info["error"] = "fake_error";
+    }
+
     public void find_credentials () throws IOError
     {
       Idle.add (() => {
-        credentials_error ();
+        credentials_error (fake_error_info);
         return false;
       });
     }