Merge lp:~dobey/unity-scope-click/oa-direct into lp:unity-scope-click

[dobey]

Bump dependency on libunity-scopes-api for fixes to OnlineAccountClient API.
Use online accounts API to open login UI directly.

This needs the changes from https://code.launchpad.net/~marcustomlinson/unity-scopes-shell/lp-1374394/+merge/236535 and https://code.launchpad.net/~unity-team/unity-scopes-api/staging/+merge/237605 to build and work correctly.

[lp:~dobey/unity-scope-click/oa-direct]

284. By dobey on 2014-10-10

Drop OA connection for pay button as pay-ui will take care of login issues.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/532/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/72/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/532/rebuild

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-01 15:04:19 +0000
+++ CMakeLists.txt	2014-10-10 17:53:56 +0000
@@ -22,7 +22,7 @@
 include(UseGSettings)
 find_package (PkgConfig REQUIRED)
 
-pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.0 libunity-api>=0.1.3)
+pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)

=== modified file 'debian/control'
--- debian/control	2014-08-28 18:27:23 +0000
+++ debian/control	2014-10-10 17:53:56 +0000
@@ -17,7 +17,7 @@
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev,
                libunity-api-dev (>= 7.80.7),
-               libunity-scopes-dev (>= 0.6.0),
+               libunity-scopes-dev (>= 0.6.7~),
                libgsettings-qt-dev,
                pkg-config,
                python3-all:native,

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-10-01 02:49:21 +0000
+++ libclickscope/click/preview.cpp	2014-10-10 17:53:56 +0000
@@ -184,7 +184,9 @@
 }
 
 PreviewStrategy::PreviewStrategy(const unity::scopes::Result& result)
-    : result(result)
+    : result(result),
+      oa_client("ubuntuone", "ubuntuone", "ubuntuone",
+                scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop)
 {
 }
 
@@ -193,7 +195,9 @@
     result(result),
     client(client),
     index(new click::Index(client)),
-    reviews(new click::Reviews(client))
+    reviews(new click::Reviews(client)),
+    oa_client("ubuntuone", "ubuntuone", "ubuntuone",
+              scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop)
 {
 }
 
@@ -404,13 +408,29 @@
                         scopes::Variant(_("Close")));
 }
 
-scopes::PreviewWidgetList PreviewStrategy::loginErrorWidgets()
+scopes::PreviewWidgetList PreviewStrategy::loginErrorWidgets(const PackageDetails& details)
 {
-    return errorWidgets(scopes::Variant(_("Login Error")),
-                        scopes::Variant(_("Please log in to your Ubuntu One account.")),
-                        scopes::Variant(click::Preview::Actions::OPEN_ACCOUNTS),
-                        scopes::Variant(_("Go to Accounts")),
-                        scopes::Variant("settings:///system/online-accounts"));
+    auto widgets = errorWidgets(scopes::Variant(_("Login Error")),
+                                scopes::Variant(_("Please log in to your Ubuntu One account.")),
+                                scopes::Variant(click::Preview::Actions::INSTALL_CLICK),
+                                scopes::Variant(_("Go to Accounts")));
+    auto buttons = widgets.back();
+    widgets.pop_back();
+
+    scopes::VariantBuilder builder;
+    builder.add_tuple(
+        {
+            {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
+            {"label", scopes::Variant(_("Go to Accounts"))},
+            {"download_url", scopes::Variant(details.download_url)},
+            {"download_sha512", scopes::Variant(details.download_sha512)},
+        });
+    buttons.add_attribute_value("actions", builder.end());
+    oa_client.register_account_login_item(buttons,
+                                          scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
+                                          scopes::OnlineAccountClient::PostLoginAction::DoNothing);
+    widgets.push_back(buttons);
+    return widgets;
 }
 
 scopes::PreviewWidgetList PreviewStrategy::errorWidgets(const scopes::Variant& title,
@@ -497,30 +517,36 @@
     downloader->startDownload(download_url, download_sha512, result["name"].get_string(),
             [this, reply] (std::pair<std::string, click::InstallError> rc){
               // NOTE: details not needed by fooErrorWidgets, so no need to populateDetails():
+              bool login_error = false;
               switch (rc.second)
               {
-              case InstallError::CredentialsError:
-                  qWarning() << "InstallingPreview got error in getting credentials during startDownload";
-                  reply->push(loginErrorWidgets());
-                  return;
               case InstallError::DownloadInstallError:
                   qWarning() << "Error received from UDM during startDownload:" << rc.first.c_str();
                   reply->push(downloadErrorWidgets());
                   return;
+              case InstallError::CredentialsError:
+                  qWarning() << "InstallingPreview got error in getting credentials during startDownload";
+                  login_error = true;
               default:
                   std::string object_path = rc.first;
                   qDebug() << "Successfully created UDM Download.";
-                  populateDetails([this, reply, object_path](const PackageDetails &details) {
+                  populateDetails([this, reply, object_path, login_error](const PackageDetails &details) {
                           store_department(details);
-                          pushPackagePreviewWidgets(reply, details, progressBarWidget(object_path));
-                          startLauncherAnimation(details);
+                          if (login_error) {
+                              reply->push(loginErrorWidgets(details));
+                          } else {
+                              pushPackagePreviewWidgets(reply, details, progressBarWidget(object_path));
+                              startLauncherAnimation(details);
+                          }
                       },
-                      [this, reply](const ReviewList& reviewlist,
+                      [this, reply, login_error](const ReviewList& reviewlist,
                                     click::Reviews::Error error) {
-                          if (error == click::Reviews::Error::NoError) {
-                              reply->push(reviewsWidgets(reviewlist));
-                          } else {
-                              qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
+                          if (!login_error) {
+                              if (error == click::Reviews::Error::NoError) {
+                                  reply->push(reviewsWidgets(reviewlist));
+                              } else {
+                                  qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
+                              }
                           }
                           reply->finished();
                       });
@@ -876,6 +902,8 @@
         tuple["download_url"] = details.download_url;
         tuple["download_sha512"] = details.download_sha512;
         payments.add_attribute_value("source", scopes::Variant(tuple));
+        // NOTE: No need to connect payments button to online-accounts API
+        // here, as pay-ui will take care of any login needs.
         widgets.push_back(payments);
     } else {
         scopes::PreviewWidget buttons("buttons", "actions");
@@ -888,6 +916,9 @@
                 {"download_sha512", scopes::Variant(details.download_sha512)},
             });
         buttons.add_attribute_value("actions", builder.end());
+        oa_client.register_account_login_item(buttons,
+                                              scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
+                                              scopes::OnlineAccountClient::PostLoginAction::DoNothing);
         widgets.push_back(buttons);
     }
 

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-08-26 14:21:42 +0000
+++ libclickscope/click/preview.h	2014-10-10 17:53:56 +0000
@@ -38,6 +38,7 @@
 #include <click/network_access_manager.h>
 
 #include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/OnlineAccountClient.h>
 #include <unity/scopes/PreviewQueryBase.h>
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/Result.h>
@@ -136,7 +137,7 @@
     virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
     virtual scopes::PreviewWidgetList reviewsWidgets(const click::ReviewList &reviewlist);
     virtual scopes::PreviewWidgetList downloadErrorWidgets();
-    virtual scopes::PreviewWidgetList loginErrorWidgets();
+    virtual scopes::PreviewWidgetList loginErrorWidgets(const PackageDetails& details);
     virtual scopes::PreviewWidgetList errorWidgets(const scopes::Variant& title,
                                                    const scopes::Variant& subtitle,
                                                    const scopes::Variant& action_id,
@@ -156,6 +157,7 @@
     QSharedPointer<click::Reviews> reviews;
     click::web::Cancellable reviews_operation;
     click::web::Cancellable submit_operation;
+    scopes::OnlineAccountClient oa_client;
 };
 
 class DownloadErrorPreview : public PreviewStrategy