Merge lp:~dobey/unity-scope-click/send-device-id into lp:unity-scope-click

[dobey]

Set the device header on all requests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/680/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/80/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'libclickscope/click/configuration.cpp'
--- libclickscope/click/configuration.cpp	2014-10-01 13:11:49 +0000
+++ libclickscope/click/configuration.cpp	2015-11-24 19:28:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -30,6 +30,9 @@
 #include <string>
 #include <vector>
 
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDBusConnection>
 #include <QDir>
 #include <QProcess>
 #include <QStringList>
@@ -182,6 +185,24 @@
         != FULL_LANG_CODES.end();
 }
 
+std::string Configuration::deviceIdFromWhoopsie()
+{
+    QDBusInterface iface("com.ubuntu.WhoopsiePreferences",
+                         "/com/ubuntu/WhoopsiePreferences",
+                         "com.ubuntu.WhoopsiePreferences",
+                         QDBusConnection::systemBus(), 0);
+    QDBusReply<QString> reply = iface.call("GetIdentifier");
+    auto value = reply.value();
+
+    return value.toStdString();
+}
+
+std::string Configuration::get_device_id()
+{
+    static const std::string whoopsie_id {deviceIdFromWhoopsie()};
+    return whoopsie_id;
+}
+
 const std::vector<std::string> Configuration::get_dconf_strings(const std::string& schema, const std::string& key) const
 {
     if (!QGSettings::isSchemaInstalled(schema.c_str()))

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-11-17 13:53:23 +0000
+++ libclickscope/click/configuration.h	2015-11-24 19:28:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -62,6 +62,8 @@
     virtual std::string get_accept_languages();
     static bool is_full_lang_code(const std::string& language);
 
+    virtual std::string get_device_id();
+
     constexpr static const char* COREAPPS_SCHEMA {"com.canonical.Unity.ClickScope"};
     constexpr static const char* COREAPPS_KEY {"coreApps"};
 
@@ -70,6 +72,7 @@
 protected:
     virtual std::vector<std::string> list_folder(const std::string &folder, const std::string &pattern);
     virtual std::string architectureFromDpkg();
+    virtual std::string deviceIdFromWhoopsie();
     virtual const std::vector<std::string> get_dconf_strings(const std::string& schema, const std::string& key) const;
     static const std::vector<std::string>& get_default_core_apps() {
         static std::vector<std::string> default_apps {

=== modified file 'libclickscope/click/webclient.cpp'
--- libclickscope/click/webclient.cpp	2014-10-17 17:07:31 +0000
+++ libclickscope/click/webclient.cpp	2015-11-24 19:28:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -119,6 +119,9 @@
         responsePtr->setReply(reply);
     };
 
+    auto deviceId = Configuration().get_device_id();
+    request->setRawHeader(DEVICE_ID_HEADER.c_str(), deviceId.data());
+
     if (sign && !impl->sso.isNull()) {
         click::utils::SmartConnect sc(responsePtr.data());
         sc.connect(impl->sso.data(), &click::CredentialsService::credentialsFound,

=== modified file 'libclickscope/click/webclient.h'
--- libclickscope/click/webclient.h	2014-10-01 15:27:44 +0000
+++ libclickscope/click/webclient.h	2015-11-24 19:28:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -52,6 +52,7 @@
 const std::string ACCEPT_LANGUAGE_HEADER ="Accept-Language";
 const std::string AUTHORIZATION_HEADER = "Authorization";
 const std::string CONTENT_TYPE_HEADER = "Content-Type";
+const std::string DEVICE_ID_HEADER = "X-Device-Id";
 
 const std::string CONTENT_TYPE_JSON = "application/json";
 
@@ -123,6 +124,7 @@
         const std::string& data = "",
         const CallParams& params = CallParams());
     void setCredentialsService(const QSharedPointer<click::CredentialsService>& sso);
+
 private:
     struct Private;
     QScopedPointer<Private> impl;

=== modified file 'libclickscope/tests/test_configuration.cpp'
--- libclickscope/tests/test_configuration.cpp	2014-11-17 14:59:03 +0000
+++ libclickscope/tests/test_configuration.cpp	2015-11-24 19:28:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -42,6 +42,7 @@
 class FakeConfiguration : public click::Configuration
 {
 public:
+    MOCK_METHOD0(deviceIdFromWhoopsie, std::string());
     MOCK_METHOD2(list_folder, std::vector<std::string>(
                      const std::string& folder, const std::string& pattern));
     MOCK_CONST_METHOD2(get_dconf_strings, const std::vector<std::string>(const std::string& schema, const std::string& key));
@@ -276,3 +277,20 @@
     EXPECT_EQ("USD", Configuration().get_currency());
     ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
 }
+
+TEST(Configuration, getDeviceIdCached)
+{
+    using namespace ::testing;
+    FakeConfiguration c;
+    FakeConfiguration d;
+
+    const char* expected = "HAL-9000";
+
+    EXPECT_CALL(c, deviceIdFromWhoopsie()).Times(1).
+        WillOnce(Return(expected));
+
+    EXPECT_EQ(expected, c.get_device_id());
+
+    EXPECT_CALL(d, deviceIdFromWhoopsie()).Times(0);
+    EXPECT_EQ(expected, d.get_device_id());
+}