Merge lp:~mandel/unity-lens-music/plan-b into lp:unity-lens-music

[Manuel de la Peña]

Add code to ensure that a label is shown when u1 creds are not present.

Unmerged revisions

133. By Manuel de la Peña on 2013-04-11

Check creds.

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-02-28 09:48:46 +0000
+++ src/musicstore-scope.vala	2013-04-11 14:16:23 +0000
@@ -18,15 +18,19 @@
  */
 
 using GLib;
+using Ubuntuone.Webservice;
 
 namespace Unity.MusicLens {
 
   public class MusicStoreScopeProxy : SimpleScope
   {
+    const string NO_CREDENTIALS_LABEL_TEXT = _("Before you can purchase music you need to log in to the Ubuntu One app");
     private MusicStoreCollection collection;
     private Unity.Extras.PreviewPlayerController preview_player;
     private Unity.MusicPreview? music_preview;
     private PreferencesManager preferences = PreferencesManager.get_default ();
+    private PurchaseService purchase_service;
+    private bool have_credentials = false;
 
     public MusicStoreScopeProxy ()
     {
@@ -41,6 +45,7 @@
       base.initialize ();
 
       collection = new MusicStoreCollection ();
+      purchase_service = new PurchaseService ();
 
       preferences.notify["remote-content-search"].connect((obj, pspec) => { scope.queue_search_changed(SearchType.DEFAULT); });
 
@@ -111,12 +116,19 @@
           }
         }
 
-        GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
+        if (have_credentials) {
+            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);
         if (album.formatted_price != null)
             download_action.extra_text = album.formatted_price;
         download_action.activated.connect (download_album);
         music_preview.add_action (download_action);
+        } else {
+            var data = new HashTable<string, Variant>(str_hash, str_equal);
+            data["no_credentials_label"] = NO_CREDENTIALS_LABEL_TEXT;
+            InfoHint info_hint = new InfoHint.with_variant("music_preview", "", null, data);
+            music_preview.add_info(info_hint);
+        }
       }
       return music_preview;
     }
@@ -142,6 +154,14 @@
       }
 
       try {
+        yield purchase_service.fetch_credentials ();
+        have_credentials = true;
+      } catch (PurchaseError e) {
+        // this is not a serious error, just missing credentials
+        have_credentials = false;
+      }
+
+      try {
 	debug ("model has %u rows before search", search.results_model.get_n_rows ());
 	yield collection.search (search, search_type, (owned) filters, max_results, cancellable);
 	debug ("model has %u rows after search", search.results_model.get_n_rows ());

=== modified file 'src/ubuntuone-webservices.vala'
--- src/ubuntuone-webservices.vala	2012-12-06 15:39:38 +0000
+++ src/ubuntuone-webservices.vala	2013-04-11 14:16:23 +0000
@@ -21,26 +21,29 @@
 
 [DBus (name = "com.ubuntuone.CredentialsManagement")]
 interface CredentialsManagement : GLib.Object {
+    public signal void authorization_denied ();
     public signal void credentials_found (HashTable <string, string> info);
+    public signal void credentials_not_found ();
     public signal void credentials_error ();
 
     [DBus (name = "find_credentials")]
     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 +59,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 +76,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,28 +140,38 @@
             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
         {
+            stdout.printf("Response is \n%s\n", json_string);
             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
         {
+	          stdout.printf ("Creds are %s\n", json_string);
             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
+        public virtual async void fetch_credentials () throws PurchaseError
         {
             PurchaseError error = null;
 
@@ -155,8 +180,12 @@
                 debug ("got credentials");
                 fetch_credentials.callback ();
             });
+            ulong not_found_handler = credentials_management.credentials_not_found.connect ((credentials) => {
+                error = new PurchaseError.MISSING_CREDENTIALS_ERROR ("Can't get Ubuntu One tokens.");
+                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,10 +193,11 @@
                 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);
+            credentials_management.disconnect (not_found_handler);
             credentials_management.disconnect (error_handler);
 
             if (error != null) {
@@ -208,7 +238,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 +254,40 @@
             }
         }
 
-        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 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 +313,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,12 +326,14 @@
 
         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) {
                 throw new PurchaseError.PURCHASE_ERROR (e.message);
             }
+
+	          stdout.printf ("%s:%s\n", consumer_key, token);
             return "%s:%s".printf (consumer_key, token);
         }
 
@@ -311,14 +345,24 @@
             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);
+            stdout.printf("Uri is %s\n", uri);
+
             var message = send_signed_webservice_call ("GET", uri);
 
             if (message.status_code != Soup.KnownStatusCode.OK) {
+                stdout.printf("Purchase request failed: HTTP %u", message.status_code);
+                stdout.printf("Reason: %s", message.reason_phrase);
                 debug ("Purchase request failed: HTTP %u", message.status_code);
                 debug ("Reason: %s", message.reason_phrase);
+                try {
+                    message.response_body.flatten ();
+                    stdout.printf("body: ------\n%s\n------\n", (string) message.response_body.data);
+                    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 +380,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.");
         }
     }
 }