Merge lp:~alecu/unity-lens-music/musicstore-purchase into lp:~unity-team/unity-lens-music/libunity7-compatible

[Alejandro J. Cura]

- Use payment preview for music purchases (LP: #1154176).

Use the payment preview for music purchases in the musicstore scope.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~alecu/unity-lens-music/musicstore-purchase]

143. By Alejandro J. Cura on 2013-03-20

Remove FIXME comment

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~alecu/unity-lens-music/musicstore-purchase]

144. By Alejandro J. Cura on 2013-03-21

Apply missing fixes

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

329 + var cover_pixbuf = new Pixbuf.from_stream (cover_file.read ());

Doing a blocking read on an http connection before actually returning a preview is a very bad idea. Please move this elsewhere.

[lp:~alecu/unity-lens-music/musicstore-purchase]

145. By Alejandro J. Cura on 2013-03-21

Don't set notification icon before it's needed

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Better, thanks.

review: Approve

[lp:~alecu/unity-lens-music/musicstore-purchase]

146. By Alejandro J. Cura on 2013-03-22

fixed pay url

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Online services QA gave its +1, let's get it merged

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-03-14 18:45:38 +0000
+++ configure.ac	2013-03-22 04:32:21 +0000
@@ -75,6 +75,7 @@
                   sqlite3 >= 3.7.7
                   gee-1.0
                   json-glib-1.0
+                  libnotify
                   libsoup-2.4
                   oauth
                   unity >= 6.90.0

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-15 13:22:25 +0000
+++ debian/changelog	2013-03-22 04:32:21 +0000
@@ -1,11 +1,16 @@
-unity-lens-music (6.8.1daily13.03.04-0ubuntu2) UNRELEASED; urgency=low
+unity-lens-music (6.8.1daily13.03.04-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Didier Roche ]
   * debian/control:
     - bump build-deps to new libunity
   * debian/*install:
     - installing/renaming files
 
- -- Didier Roche <[e-mail]>  Fri, 15 Mar 2013 14:21:36 +0100
+  [ Alejandro J. Cura ]
+  * debian/control:
+    - added libnotify-dev build dependency
+
+ -- Alejandro J. Cura <[e-mail]>  Tue, 19 Mar 2013 18:45:38 -0300
 
 unity-lens-music (6.8.1daily13.03.04-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-03-15 13:11:43 +0000
+++ debian/control	2013-03-22 04:32:21 +0000
@@ -11,6 +11,7 @@
                libglib2.0-dev (>= 2.32),
                libgee-dev,
                libjson-glib-dev,
+               libnotify-dev,
                libsoup2.4-dev,
                liboauth-dev,
                libdee-dev (>= 1.0.7),

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-03-13 12:14:27 +0000
+++ src/Makefile.am	2013-03-22 04:32:21 +0000
@@ -72,8 +72,9 @@
 
 unity_musicstore_daemon_VALAFLAGS = \
   --pkg json-glib-1.0 \
+  --pkg libnotify \
+  --pkg libsoup-2.4 \
   --pkg oauth \
-  --pkg libsoup-2.4 \
   $(unity_music_daemon_VALAFLAGS)
 
 unity_musicstore_daemon_LDADD = \

=== modified file 'src/album.vala'
--- src/album.vala	2012-09-11 12:50:34 +0000
+++ src/album.vala	2013-03-22 04:32:21 +0000
@@ -28,5 +28,6 @@
     public string uri { get; set; }
     public string artwork_path { get; set; }
     public string formatted_price { get; set; }
+    public string purchase_sku { get; set; }
   }
 }
\ No newline at end of file

=== modified file 'src/musicstore-collection.vala'
--- src/musicstore-collection.vala	2013-03-13 12:14:27 +0000
+++ src/musicstore-collection.vala	2013-03-22 04:32:21 +0000
@@ -104,6 +104,18 @@
               track.duration = (int)root_obj.get_member ("duration").get_int ();
               tracks.append (track);
             }
+
+            if (root_obj.has_member ("id"))
+            {
+                album.purchase_sku = root_obj.get_string_member ("id");
+            }
+            else
+            {
+                // U1MS does not allow purchases of an album with no purchase_sku
+                album.purchase_sku = "";
+                warning ("Json has no purchase_sku in '%s'", details_uri);
+            }
+
           }
           else
           {

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-03-13 12:14:27 +0000
+++ src/musicstore-scope.vala	2013-03-22 04:32:21 +0000
@@ -18,14 +18,27 @@
  */
 
 using GLib;
+using Notify;
+using Unity;
+using Gdk;
+using Ubuntuone.Webservice;
 
 namespace Unity.MusicLens {
+  private const string FORGOTTEN_PASSWORD_URL = "https://login.ubuntu.com/+forgot_password";
+  private const string CHANGE_PAYMENT_METHOD_URL = "https://pay.ubuntu.com/account/";
+  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";
 
   public class MusicStoreScopeProxy : SimpleScope
   {
     private MusicStoreCollection collection;
     private Unity.MusicPreview? music_preview;
     private PreferencesManager preferences = PreferencesManager.get_default ();
+    private HashTable<string, Album> album_map;
+    private PurchaseService purchase_service;
+    private Notification notification;
 
     public MusicStoreScopeProxy ()
     {
@@ -41,7 +54,11 @@
 
       base.initialize ();
 
+      Notify.init ("Music Store Scope");
+      notification = new Notification("Album name", _("Purchase started"), "");
       collection = new MusicStoreCollection ();
+      album_map = new HashTable<string, Album>(str_hash, str_equal);
+      purchase_service = new PurchaseService ();
 
       preferences.notify["remote-content-search"].connect((obj, pspec) => { scope.queue_search_changed(SearchType.DEFAULT); });
 
@@ -66,11 +83,11 @@
       else
       {
         warning ("Failed to generate preview for %s", uri);
-        return download_album (uri);
+        return open_uri (uri);
       }
     }
 
-    public Unity.ActivationResponse download_album (string uri)
+    public Unity.ActivationResponse open_uri (string uri)
     {
       /* launch the music store streaming client  or the webstore or whatevz */
       try {
@@ -90,6 +107,7 @@
 
       if (album != null)
       {
+        album_map.insert (uri, album);
         File cover_file = File.new_for_uri (album.artwork_path); //artwork path is a remote uri
         var cover = new FileIcon (cover_file);
 
@@ -110,10 +128,10 @@
         }
 
         GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
-        var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
+        var download_action = new Unity.PreviewAction ("show_purchase_preview", _("Download"), icon);
         if (album.formatted_price != null)
             download_action.extra_text = album.formatted_price;
-        download_action.activated.connect (download_album);
+        download_action.activated.connect (show_purchase_preview);
         music_preview.add_action (download_action);
       }
       return music_preview;
@@ -146,6 +164,202 @@
       } catch (IOError e) {
 	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);
+
+    private Unity.ActivationResponse build_error_preview (string uri, string error_header, string link_text, LinkHandler link_handler)
+    {
+      Album album = null;
+      SList<Track> tracks = null;
+      collection.get_album_details (uri, out album, out tracks);
+      debug ("album art uri: %s", album.artwork_path);
+      File cover_file = File.new_for_uri (album.artwork_path); //artwork path is a remote uri
+      var cover = new FileIcon (cover_file);
+      var error_preview = new Unity.PaymentPreview.for_error(album.title, album.artist, cover);
+      error_preview.header = error_header;
+      var error_action = new Unity.PreviewAction ("open_u1_link", link_text, null);
+      error_action.activated.connect (() => link_handler (uri));
+      error_preview.add_action (error_action);
+      return new Unity.ActivationResponse.with_preview (error_preview);
+    }
+
+    public Unity.ActivationResponse open_forgot_password_url (string uri)
+    {
+      return open_uri (FORGOTTEN_PASSWORD_URL);
+    }
+
+    public Unity.ActivationResponse change_payment_method (string uri)
+    {
+      return open_uri (CHANGE_PAYMENT_METHOD_URL);
+    }
+
+    public Unity.ActivationResponse cancel_purchase (string uri)
+    {
+      return new Unity.ActivationResponse.with_preview (preview (uri));
+    }
+
+    public Unity.ActivationResponse open_sso_login (string uri)
+    {
+      Album album = null;
+      SList<Track> tracks = null;
+      collection.get_album_details (uri, out album, out tracks);
+
+      var ui_path = Environment.find_program_in_path (U1_SSO_UI);
+      GLib.Pid child_pid;
+      string argv[11] = {
+        ui_path,
+        "--album", album.title,
+        "--artist", album.artist,
+        "--price", album.formatted_price,
+        "--picture", album.artwork_path,
+        "--url", uri
+      };
+      if (ui_path != null) {
+        try {
+          bool was_started = Process.spawn_async (null, argv, null, 0, null, out child_pid);
+          // hide dash
+          if (was_started) {
+              return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
+          }
+        } catch (GLib.SpawnError e) {
+          debug ("Failed to start u1_sso_ui for uri %s", uri);
+        }
+      }
+      return open_uri (uri);
+    }
+
+    public Unity.ActivationResponse show_purchase_preview (string uri)
+    {
+      if (purchase_service.got_credentials () == false)
+      {
+        debug ("no credentials available, opening sso login. %s", uri);
+        return build_error_preview (uri, ERROR_MESSAGE_NOT_LOGGED_IN, _("Continue"), open_sso_login);
+      }
+
+      Album album = null;
+      SList<Track> tracks = null;
+      collection.get_album_details (uri, out album, out tracks);
+      if (album != null)
+      {
+        try {
+          purchase_service.fetch_payment_info (album.purchase_sku);
+          debug ("retrieved payment method: %s", purchase_service.selected_payment_method);
+          return new Unity.ActivationResponse.with_preview (purchase_preview (uri, null));
+        } catch (PurchaseError e) {
+          debug ("can't get default payment method: %s", e.message);
+          return build_error_preview (uri, ERROR_MESSAGE_NO_PAYMENT_METHOD, _("Choose Payment Method"), change_payment_method);
+        }
+      }
+      return open_uri (uri);
+    }
+
+    public Unity.ActivationResponse purchase_album (Unity.PreviewAction action, string uri)
+    {
+      var password = action.hints["password"].get_string();
+
+      if (password == null) {
+          var preview = purchase_preview (uri, _("Please enter your password"));
+          debug ("empty password.");
+          return new Unity.ActivationResponse.with_preview (preview);
+      }
+
+      var album = album_map.get (uri);
+
+      File cover_file = File.new_for_uri (album.artwork_path); //artwork path is a remote uri
+      try {
+        var cover_pixbuf = new Pixbuf.from_stream (cover_file.read ());
+        notification.set_icon_from_pixbuf (cover_pixbuf);
+      } catch (GLib.Error e) {
+        debug ("Cannot set notification icon from uri %s", uri);
+      }
+
+      notification.summary = album.title;
+      notification.body = _("Authorizing purchase");
+      try {
+        notification.show ();
+      } catch (GLib.Error e) {
+        debug ("Error while showing notification: %s", e.message);
+      }
+
+      try {
+        purchase_service.purchase (album.purchase_sku, password);
+        debug ("purchase completed.");
+        notification.update (album.title, _("Purchase completed"), "");
+        try {
+          notification.show ();
+        } catch (GLib.Error e) {
+          debug ("Error while showing notification: %s", e.message);
+        }
+        return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
+      } catch (PurchaseError e) {
+        if (e is PurchaseError.WRONG_PASSWORD_ERROR) {
+            debug ("wrong password error: %s", e.message);
+            return new Unity.ActivationResponse.with_preview (purchase_preview (uri, _("Wrong password")));
+        } else {
+            debug ("got purchase error: %s", e.message);
+            return build_error_preview (uri, ERROR_MESSAGE_TECHNICAL_PROBLEM, _("Continue"), open_uri);
+        }
+      }
+    }
+
+    public Unity.Preview purchase_preview (string uri, string? error_message)
+    {
+      Unity.PaymentPreview album_purchase_preview = null;
+      Album album = null;
+      SList<Track> tracks = null;
+      collection.get_album_details (uri, out album, out tracks);
+
+      if (album != null)
+      {
+        File cover_file = File.new_for_uri (album.artwork_path); //artwork path is a remote uri
+
+        var cover = new FileIcon (cover_file);
+        album_purchase_preview = new Unity.PaymentPreview.for_music(album.title, album.artist, cover);
+
+        album_purchase_preview.header = _("Hi %s, you purchased in the past from Ubuntu One,"
+        + " would you like to use the same payment details? Please review your order.").printf (purchase_service.nickname);
+        album_purchase_preview.email = purchase_service.email;
+        album_purchase_preview.payment_method = purchase_service.selected_payment_method;
+        album_purchase_preview.purchase_prize = album.formatted_price;
+        album_purchase_preview.purchase_type = _("Digital CD");
+
+        // data
+
+        var data = new HashTable<string, Variant>(str_hash, str_equal);
+        if (error_message != null) {
+            data["error_message"] = error_message;
+        }
+
+        InfoHint info_hint = new InfoHint.with_variant("album_purchase_preview", "", null, data);
+        album_purchase_preview.add_info(info_hint);
+
+        // actions
+
+        var purchase_action = new Unity.PreviewAction ("purchase_album", _("Purchase"), null);
+        purchase_action.activated.connect (purchase_album);
+        album_purchase_preview.add_action (purchase_action);
+
+        var forgot_password_action = new Unity.PreviewAction ("forgot_password", _("forgotten your Ubuntu One password?"), null);
+        forgot_password_action.activated.connect (open_forgot_password_url);
+        album_purchase_preview.add_action (forgot_password_action);
+
+        var cancel_action = new Unity.PreviewAction ("cancel_purchase", _("Cancel"), null);
+        cancel_action.activated.connect (cancel_purchase);
+        album_purchase_preview.add_action (cancel_action);
+
+        var change_payment_method_action = new Unity.PreviewAction ("change_payment_method", _("change payment method"), null);
+        change_payment_method_action.activated.connect (change_payment_method);
+        album_purchase_preview.add_action (change_payment_method_action);
+      }
+      return album_purchase_preview;
     }
 
   }

=== modified file 'src/ubuntuone-webservices.vala'
--- src/ubuntuone-webservices.vala	2012-12-06 15:39:38 +0000
+++ src/ubuntuone-webservices.vala	2013-03-22 04:32:21 +0000
@@ -28,19 +28,20 @@
     public abstract void find_credentials () throws IOError;
 }
 
-const string WEBAPI_URI = "https://edge.one.ubuntu.com/";
-const string ACCOUNT_URI = WEBAPI_URI + "api/account";
-const string PAYMENT_METHOD_URI = WEBAPI_URI + "music-store/api/1/user/retrieve-payment-method?purchase_sku=%s";
-const string PURCHASE_WITH_DEFAULT_PAYMENT_URI = WEBAPI_URI + "music-store/api/1/user/purchase-with-default-payment?purchase_sku=%s&authentication=%s";
-const string AUTHENTICATION_URI = "https://login.staging.ubuntu.com/api/1.1/authentications";
+const string WEBAPI_SERVER = "https://one.ubuntu.com/";
+const string ACCOUNT_PATH = "api/account";
+const string PAYMENT_METHOD_PATH = "music-store-up/api/1/user/retrieve-payment-method?purchase_sku=%s";
+const string PURCHASE_WITH_DEFAULT_PAYMENT_PATH = "music-store-up/api/1/user/purchase-with-default-payment?purchase_sku=%s&authentication=%s";
+const string AUTHENTICATION_SERVER = "https://login.ubuntu.com/";
+const string AUTHENTICATION_PATH = "api/1.1/authentications";
 const string AUTHENTICATE_PARAMS = "ws.op=authenticate&token_name=Purchase_Token";
-const int PASSWORD_CACHE_SECONDS = 300;
-const int PAYMENT_METHOD_CACHE_SECONDS = 120;
+
 
 namespace Ubuntuone.Webservice
 {
     public errordomain PurchaseError
     {
+        MISSING_CREDENTIALS_ERROR,
         PURCHASE_ERROR,
         WRONG_PASSWORD_ERROR,
         UNSPECIFIED_ERROR
@@ -56,17 +57,13 @@
         public string selected_payment_method { get; internal set; default = null; }
         public string consumer_key { get; private set; default = null; }
         public string token { get; private set; default = null; }
-        internal DateTime _selected_payment_method_expiry;
-        DateTime _password_expiry;
+        public string open_url { get; private set; default = null; }
         internal HashTable <string, string> _ubuntuone_credentials = null;
 
         construct {
             http_session = build_http_session ();
             http_session_sso = build_http_session ();
 
-            reset_payment_method_cache (0);
-            reset_password_cache (0);
-
             credentials_management = build_credentials_management ();
         }
 
@@ -77,24 +74,40 @@
             return session;
         }
 
-        internal DateTime now ()
-        {
-            return new DateTime.now_utc ();
-        }
-
-        internal bool expired_payment_method_cache ()
-        {
-            return _selected_payment_method_expiry.compare (now ()) <= 0;
-        }
-
-        internal void reset_payment_method_cache (int seconds_from_now)
-        {
-            _selected_payment_method_expiry = now ().add_seconds (seconds_from_now);
-        }
-
-        internal void reset_password_cache (int seconds_from_now)
-        {
-            _password_expiry = now ().add_seconds (seconds_from_now);
+        string webapi_server ()
+        {
+            string staging_webapi = Environment.get_variable ("U1_STAGING_WEBAPI");
+            return staging_webapi != null ? staging_webapi : WEBAPI_SERVER;
+        }
+
+        string account_uri ()
+        {
+            return webapi_server() + ACCOUNT_PATH;
+        }
+
+        string payment_method_uri ()
+        {
+            return webapi_server() + PAYMENT_METHOD_PATH;
+        }
+
+        string purchase_with_default_payment_uri ()
+        {
+            return webapi_server() + PURCHASE_WITH_DEFAULT_PAYMENT_PATH;
+        }
+
+        string authentication_server ()
+        {
+            string staging_authentication = Environment.get_variable ("U1_STAGING_AUTHENTICATION");
+            return staging_authentication != null ? staging_authentication : AUTHENTICATION_SERVER;
+        }
+
+        string authentication_uri ()
+        {
+            return authentication_server() + AUTHENTICATION_PATH;
+        }
+
+        public bool got_credentials () {
+            return _ubuntuone_credentials != null;
         }
 
         internal virtual CredentialsManagement build_credentials_management ()
@@ -125,25 +138,33 @@
             email = root_object.get_string_member("email");
         }
 
-        internal void parse_payment_method_json (string json_string) throws GLib.Error
+        internal void parse_payment_method_json (string json_string) throws GLib.Error, PurchaseError
         {
             var root_object = parse_json (json_string);
-            Json.Object payload = root_object.get_object_member("payload");
-            selected_payment_method = payload.get_string_member("selected_payment_method");
+            if (root_object.has_member ("selected_payment_method")) {
+                selected_payment_method = root_object.get_string_member("selected_payment_method");
+            } else {
+                open_url = root_object.get_string_member ("open_url");
+                var error_message = root_object.get_string_member ("error_message");
+                throw new PurchaseError.PURCHASE_ERROR (error_message);
+            }
         }
 
         internal void parse_authentication_json (string json_string) throws GLib.Error
         {
             var root_object = parse_json (json_string);
-            consumer_key = root_object.get_string_member("consumer_key");
-            token = root_object.get_string_member("token");
+            consumer_key = root_object.get_string_member ("consumer_key");
+            token = root_object.get_string_member ("token");
         }
 
         internal string parse_purchase_json (string json_string) throws GLib.Error
         {
             var root_object = parse_json (json_string);
-            Json.Object payload = root_object.get_object_member("payload");
-            return payload.get_string_member("open_url");
+            if (root_object.has_member ("open_url")) {
+                return root_object.get_string_member("open_url");
+            } else {
+                return "";
+            }
         }
 
         internal virtual async void fetch_credentials () throws PurchaseError
@@ -156,7 +177,7 @@
                 fetch_credentials.callback ();
             });
             ulong error_handler = credentials_management.credentials_error.connect (() => {
-                error = new PurchaseError.PURCHASE_ERROR ("Can't get Ubuntu One tokens.");
+                error = new PurchaseError.MISSING_CREDENTIALS_ERROR ("Can't get Ubuntu One tokens.");
                 fetch_credentials.callback ();
             });
 
@@ -164,7 +185,7 @@
                 credentials_management.find_credentials ();
                 yield;
             } catch (IOError e) {
-                error = new PurchaseError.PURCHASE_ERROR ("Can't get Ubuntu One tokens: %s", e.message);
+                error = new PurchaseError.MISSING_CREDENTIALS_ERROR ("Can't get Ubuntu One tokens: %s", e.message);
             }
 
             credentials_management.disconnect (found_handler);
@@ -208,7 +229,7 @@
         internal virtual async void fetch_account () throws PurchaseError
         {
             string response;
-            PurchaseError error = yield call_api ("GET", ACCOUNT_URI, out response);
+            PurchaseError error = yield call_api ("GET", account_uri(), out response);
 
             if (error != null) {
                 debug ("Error while fetching U1 account: %s.", error.message);
@@ -224,43 +245,39 @@
             }
         }
 
-        internal virtual async void fetch_payment_method (string purchase_sku) throws PurchaseError
+        internal virtual void fetch_payment_method (string purchase_sku) throws PurchaseError
         {
-            string response;
-            var uri = PAYMENT_METHOD_URI.printf (purchase_sku);
-            PurchaseError error = yield call_api ("GET", uri, out response);
+            var uri = payment_method_uri().printf (purchase_sku);
 
-            if (error != null) {
-                debug ("Error while fetching payment method: %s.", error.message);
-                throw error;
+            var message = send_signed_webservice_call ("GET", uri);
+            if (message.status_code != Soup.KnownStatusCode.OK) {
+                debug ("Purchase request failed: HTTP %u", message.status_code);
+                debug ("Reason: %s", message.reason_phrase);
+                try {
+                    message.response_body.flatten ();
+                    debug ("body: ------\n%s\n------\n", (string) message.response_body.data);
+                } catch (Error e) {
+                }
+                throw new PurchaseError.PURCHASE_ERROR ("Retrieve payment method failed: %s".printf (message.reason_phrase));
             }
-
             try {
-                parse_payment_method_json (response);
-                debug ("got payment method");
+                message.response_body.flatten ();
+                var result = (string) message.response_body.data;
+                parse_payment_method_json (result);
             } catch (GLib.Error e) {
-                debug ("Error while getting payment method: %s.", e.message);
                 throw new PurchaseError.PURCHASE_ERROR (e.message);
             }
         }
 
-        internal virtual async void refetch_payment_info (string purchase_sku) throws PurchaseError
+        public virtual async void fetch_account_info () throws PurchaseError
         {
             yield fetch_credentials ();
             yield fetch_account ();
-            yield fetch_payment_method (purchase_sku);
-            reset_payment_method_cache (PAYMENT_METHOD_CACHE_SECONDS);
         }
 
-        public async void fetch_payment_info (string purchase_sku) throws PurchaseError
+        public virtual void fetch_payment_info (string purchase_sku) throws PurchaseError
         {
-            if (expired_payment_method_cache ())
-            {
-                debug ("refetching");
-                yield refetch_payment_info (purchase_sku);
-            } else {
-                debug ("in cache");
-            }
+            fetch_payment_method (purchase_sku);
         }
 
         internal virtual void _do_sso_webcall (Soup.Message message, string password)
@@ -286,6 +303,11 @@
                 if (message.status_code == Soup.KnownStatusCode.UNAUTHORIZED) {
                     throw new PurchaseError.WRONG_PASSWORD_ERROR ("Wrong password");
                 }
+                try {
+                    message.response_body.flatten ();
+                    debug ("body: ------\n%s\n------\n", (string) message.response_body.data);
+                } catch (Error e) {
+                }
                 throw new PurchaseError.PURCHASE_ERROR (message.reason_phrase);
             }
             message.response_body.flatten ();
@@ -294,7 +316,7 @@
 
         internal virtual string get_purchase_token (string password) throws PurchaseError
         {
-            var result = authenticated_sso_webcall ("POST", AUTHENTICATION_URI, AUTHENTICATE_PARAMS, password);
+            var result = authenticated_sso_webcall ("POST", authentication_uri(), AUTHENTICATE_PARAMS, password);
             try {
                 parse_authentication_json (result);
             } catch (GLib.Error e) {
@@ -311,14 +333,19 @@
             return message;
         }
 
-        internal virtual void purchase_with_default_payment (string sku, string purchase_token) throws PurchaseError
+        internal virtual void purchase_with_default_payment (string album_id, string purchase_token) throws PurchaseError
         {
-            var uri = PURCHASE_WITH_DEFAULT_PAYMENT_URI.printf (sku, purchase_token);
+            var uri = purchase_with_default_payment_uri().printf (album_id, purchase_token);
             var message = send_signed_webservice_call ("GET", uri);
 
             if (message.status_code != Soup.KnownStatusCode.OK) {
                 debug ("Purchase request failed: HTTP %u", message.status_code);
                 debug ("Reason: %s", message.reason_phrase);
+                try {
+                    message.response_body.flatten ();
+                    debug ("body: ------\n%s\n------\n", (string) message.response_body.data);
+                } catch (Error e) {
+                }
                 throw new PurchaseError.PURCHASE_ERROR ("Purchase failed: %s".printf (message.reason_phrase));
             }
             try {
@@ -336,7 +363,9 @@
         public void purchase (string album_id, string password) throws PurchaseError
         {
             var purchase_token = get_purchase_token (password);
+            debug ("purchasing...");
             purchase_with_default_payment (album_id, purchase_token);
+            debug ("purchase completed.");
         }
     }
 }

=== modified file 'tests/unit/test-ubuntuone-purchases.vala'
--- tests/unit/test-ubuntuone-purchases.vala	2012-12-06 15:39:38 +0000
+++ tests/unit/test-ubuntuone-purchases.vala	2013-03-22 04:32:21 +0000
@@ -25,7 +25,7 @@
 
 const string FAKE_URL = "http://fake/url";
 const string FAKE_PASSWORD = "PezEspada";
-const string FAKE_SKU = "fake_store:fake_album:id";
+const string FAKE_SKU = "7digital:fake_album:id";
 const string FAKE_TOKEN = "a fake token";
 
 const string BROKEN_JSON = """
@@ -45,14 +45,17 @@
 
 const string FAKE_JSON_PAYMENT_METHOD = """
     {
-        "meta": {
-            "status": "Ok"
-        },
-        "payload": {
-            "open_url": "",
-            "user_email": "[e-mail]",
-            "selected_payment_method": "Visa 1234"
-        }
+        "open_url": "",
+        "user_email": "[e-mail]",
+        "selected_payment_method": "Visa 1234"
+    }
+""";
+
+
+const string FAKE_JSON_PAYMENT_METHOD_ERROR = """
+    {
+        "open_url": "http://somewhere/else",
+        "error_message": "No default payment method selected."
     }
 """;
 
@@ -69,30 +72,18 @@
 
 const string FAKE_JSON_PURCHASE = """
     {
-        "meta": {
-            "status": "Ok"
-        },
-        "payload": {
-            "order_id": "1111",
-            "order_status": "OK",
-            "order_detail": "TBD",
-            "open_url": ""
-        }
+        "order_id": "1111",
+        "order_status": "OK"
     }
 """;
 
 
 const string FAKE_JSON_PURCHASE_FAILURE = """
     {
-        "meta": {
-            "status": "Ok"
-        },
-        "payload": {
-            "order_id": "1111",
-            "order_status": "PAYMENT_FAILURE",
-            "order_detail": "TBD",
-            "open_url": "http://slashdot.org/"
-        }
+        "order_id": "1111",
+        "order_status": "PAYMENT_FAILURE",
+        "order_detail": "TBD",
+        "open_url": "http://slashdot.org/"
     }
 """;
 
@@ -113,12 +104,11 @@
     Test.add_data_func ("/Unit/PurchaseChecker/ParseAccount", test_parse_account);
     Test.add_data_func ("/Unit/PurchaseChecker/ParseBrokenAccount", test_parse_broken_account);
     Test.add_data_func ("/Unit/PurchaseChecker/ParsePaymentMethod", test_parse_payment_method);
+    Test.add_data_func ("/Unit/PurchaseChecker/ParsePaymentMethodError", test_parse_payment_method_error);
     Test.add_data_func ("/Unit/PurchaseChecker/ParseAuthentication", test_parse_authentication);
     Test.add_data_func ("/Unit/PurchaseChecker/ReadyToPurchase", test_ready_to_purchase);
-    Test.add_data_func ("/Unit/PurchaseChecker/FetchPaymentInvalidated", test_fetch_payment_invalidated);
-    Test.add_data_func ("/Unit/PurchaseChecker/FetchPaymentCached", test_fetch_payment_cached);
-    Test.add_data_func ("/Unit/PurchaseChecker/ReFetchPayment", test_refetch_payment);
-    Test.add_data_func ("/Unit/PurchaseChecker/ReFetchPaymentSetsCache", test_refetch_payment_sets_cache);
+    Test.add_data_func ("/Unit/PurchaseChecker/FetchAccountInfo", test_fetch_account_info);
+    Test.add_data_func ("/Unit/PurchaseChecker/FetchPaymentInfo", test_fetch_payment_info);
     Test.add_data_func ("/Unit/PurchaseChecker/FetchCredentials", test_fetch_credentials);
     Test.add_data_func ("/Unit/PurchaseChecker/FetchCredentialsFails", test_fetch_credentials_fails);
     Test.add_data_func ("/Unit/PurchaseChecker/FetchCredentialsFailsExtra", test_fetch_credentials_fails_extra);
@@ -163,11 +153,12 @@
   async void irl_test_async ()
   {
     var purchase_service = new PurchaseService();
-    var purchase_sku = "1";
+    var purchase_sku = "7digital:album:1347423:WORLD";
     try {
-      yield purchase_service.fetch_payment_info (purchase_sku);
+      yield purchase_service.fetch_account_info ();
+      purchase_service.fetch_payment_info (purchase_sku);
       debug ("data was available: %s %s %s", purchase_service.nickname, purchase_service.email, purchase_service.selected_payment_method);
-      var real_user_password = "****fake_password_in_bzr***";
+      var real_user_password = FAKE_PASSWORD;
       purchase_service.purchase (purchase_sku, real_user_password);
       debug ("purchase completed.");
     } catch (PurchaseError e) {
@@ -186,7 +177,7 @@
       });
       return false;
     });
-    assert (run_with_timeout (loop, 10000));
+    assert (run_with_timeout (loop, 60000));
   }
 
   class FakeCredentialsManagement : GLib.Object, CredentialsManagement
@@ -290,6 +281,19 @@
     assert_cmpstr (purchase_service.selected_payment_method, OperatorType.EQUAL, "Visa 1234");
   }
 
+  private static void test_parse_payment_method_error ()
+  {
+    var purchase_service = new BaseTestPurchaseService ();
+    try
+    {
+        purchase_service.parse_payment_method_json (FAKE_JSON_PAYMENT_METHOD_ERROR);
+        assert_not_reached ();
+    } catch (PurchaseError e)
+    {
+        assert_cmpstr (purchase_service.open_url, OperatorType.EQUAL, "http://somewhere/else");
+    }
+  }
+
   private static void test_parse_authentication ()
   {
     var purchase_service = new BaseTestPurchaseService ();
@@ -313,30 +317,6 @@
     assert (purchase_service.ready_to_purchase == true);
   }
 
-  class TestFetchPurchaseService : BaseTestPurchaseService {
-    internal bool fetch_called = false;
-    internal override async void refetch_payment_info (string purchase_sku)
-    {
-      fetch_called = true;
-    }
-  }
-
-  private static void test_fetch_payment_invalidated ()
-  {
-    var purchase_service = new TestFetchPurchaseService ();
-    purchase_service._selected_payment_method_expiry = new DateTime.now_utc ();
-    purchase_service.fetch_payment_info ("fake_sku");
-    assert (purchase_service.fetch_called);
-  }
-
-  private static void test_fetch_payment_cached ()
-  {
-    var purchase_service = new TestFetchPurchaseService ();
-    purchase_service._selected_payment_method_expiry = new DateTime.now_utc ().add_seconds (60);
-    purchase_service.fetch_payment_info ("fake_sku");
-    assert (purchase_service.fetch_called == false);
-  }
-
   class TestRefetchPurchaseService : BaseTestPurchaseService {
     internal bool credentials_fetched = false;
     internal bool account_fetched = false;
@@ -360,26 +340,21 @@
       });
       yield;
     }
-    internal override async void fetch_payment_method (string purchase_sku)
+    internal override void fetch_payment_method (string purchase_sku)
     {
-      Idle.add (() => {
-        payment_method_fetched = true;
-        fetch_payment_method.callback ();
-        return false;
-      });
-      yield;
+      payment_method_fetched = true;
     }
   }
 
-  private static void test_refetch_payment ()
+  private static void test_fetch_account_info ()
   {
     var purchase_service = new TestRefetchPurchaseService ();
 
     MainLoop mainloop = new MainLoop ();
-    purchase_service.refetch_payment_info.begin("fake_sku", (obj, res) => {
+    purchase_service.fetch_account_info.begin((obj, res) => {
         mainloop.quit ();
         try {
-            purchase_service.refetch_payment_info.end (res);
+            purchase_service.fetch_account_info.end (res);
         } catch (PurchaseError e) {
             error ("Can't fetch payment info: %s", e.message);
         }
@@ -388,29 +363,19 @@
 
     assert (purchase_service.credentials_fetched);
     assert (purchase_service.account_fetched);
+  }
+
+  private static void test_fetch_payment_info ()
+  {
+    var purchase_service = new TestRefetchPurchaseService ();
+    try {
+        purchase_service.fetch_payment_info("fake_sku");
+    } catch (PurchaseError e) {
+        error ("Can't fetch payment info: %s", e.message);
+    }
     assert (purchase_service.payment_method_fetched);
   }
 
-  private static void test_refetch_payment_sets_cache ()
-  {
-    var purchase_service = new TestRefetchPurchaseService ();
-
-    assert (true == purchase_service.expired_payment_method_cache ());
-
-    MainLoop mainloop = new MainLoop ();
-    purchase_service.refetch_payment_info.begin("fake_sku", (obj, res) => {
-        mainloop.quit ();
-        try {
-            purchase_service.refetch_payment_info.end (res);
-        } catch (PurchaseError e) {
-            error ("Can't fetch payment info: %s", e.message);
-        }
-    });
-    assert (run_with_timeout (mainloop, 1000));
-
-    assert (false == purchase_service.expired_payment_method_cache ());
-  }
-
   private static void test_fetch_credentials ()
   {
     var purchase_service = new BaseTestPurchaseService ();
@@ -431,7 +396,7 @@
 
   private static void test_fetch_credentials_fails ()
   {
-    bool failed = false;
+    PurchaseError failure = null;
     var purchase_service = new FailingCredentialsPurchaseService ();
 
     MainLoop mainloop = new MainLoop ();
@@ -440,17 +405,16 @@
         try {
             purchase_service.fetch_credentials.end (res);
         } catch (PurchaseError e) {
-            failed = true;
+            failure = e;
         }
     });
     assert (run_with_timeout (mainloop, 1000));
-
-    assert (failed);
+    assert (failure is PurchaseError.MISSING_CREDENTIALS_ERROR);
   }
 
   private static void test_fetch_credentials_fails_extra ()
   {
-    bool failed = false;
+    PurchaseError failure = null;
     var purchase_service = new ExtraFailingCredentialsPurchaseService ();
 
     MainLoop mainloop = new MainLoop ();
@@ -459,12 +423,11 @@
         try {
             purchase_service.fetch_credentials.end (res);
         } catch (PurchaseError e) {
-            failed = true;
+            failure = e;
         }
     });
     assert (run_with_timeout (mainloop, 1000));
-
-    assert (failed);
+    assert (failure is PurchaseError.MISSING_CREDENTIALS_ERROR);
   }
 
   class FakeWebcallPurchaseService : BaseTestPurchaseService
@@ -565,21 +528,7 @@
   {
     var purchase_service = new FakeWebcallPurchaseService (_status_code, _found_json);
     purchase_service._ubuntuone_credentials = new HashTable <string, string> (str_hash, str_equal);
-
-    PurchaseError error = null;
-    MainLoop mainloop = new MainLoop ();
-    purchase_service.fetch_payment_method.begin("fake_sku", (obj, res) => {
-        mainloop.quit ();
-        try {
-            purchase_service.fetch_payment_method.end (res);
-        } catch (PurchaseError e) {
-            error = e;
-        }
-    });
-    assert (run_with_timeout (mainloop, 1000));
-    if (error != null) {
-        throw error;
-    }
+    purchase_service.fetch_payment_method("fake_sku");
     return purchase_service;
   }
 
@@ -616,7 +565,7 @@
   class TestPurchaseService : BaseTestPurchaseService
   {
     internal string password;
-    internal string sku;
+    internal string album_id;
     internal string purchase_token;
 
     internal override string get_purchase_token (string password)
@@ -624,9 +573,9 @@
         this.password = password;
         return FAKE_TOKEN;
     }
-    internal override void purchase_with_default_payment (string sku, string purchase_token)
+    internal override void purchase_with_default_payment (string album_id, string purchase_token)
     {
-        this.sku = sku;
+        this.album_id = album_id;
         this.purchase_token = purchase_token;
     }
   }
@@ -637,7 +586,7 @@
         var purchase_service = new TestPurchaseService ();
         purchase_service.purchase (FAKE_SKU, FAKE_PASSWORD);
         assert_cmpstr (purchase_service.password, OperatorType.EQUAL, FAKE_PASSWORD);
-        assert_cmpstr (purchase_service.sku, OperatorType.EQUAL, FAKE_SKU);
+        assert_cmpstr (purchase_service.album_id, OperatorType.EQUAL, FAKE_SKU);
         assert_cmpstr (purchase_service.purchase_token, OperatorType.EQUAL, FAKE_TOKEN);
     } catch (Error e) {
         assert_not_reached ();
@@ -722,6 +671,7 @@
     try {
       purchase_service.purchase_with_default_payment (FAKE_SKU, FAKE_TOKEN);
     } catch (PurchaseError e) {
+      warning (e.message);
       assert_not_reached ();
     }
   }