Merge lp:~marcustomlinson/unity-scope-youtube/install_account_service into lp:unity-scope-youtube

[Marcus Tomlinson]

Use new scopes::OnlineAccountClient class to get and monitor the youtube OA service

[Pete Woods (pete-woods)]

At a high level, these changes look really good. There are a couple of variables I'd want to extract out of the .desktop and .application files, but overall this is a big +1

[Pete Woods (pete-woods)]

Another question is, do we need to explicitly compile and link against libaccounts/signon any more?

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-09 10:28:21 +0000
+++ CMakeLists.txt	2014-09-11 08:39:29 +0000
@@ -29,7 +29,7 @@
   gio-unix-2.0
   libaccounts-glib
   libsignon-glib
-  libunity-scopes>=0.6.0
+  libunity-scopes>=0.6.6
   jsoncpp
   net-cpp>=1.1.0
   process-cpp
 
=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2014-09-09 10:28:21 +0000
+++ click/CMakeLists.txt	2014-09-11 08:39:29 +0000
@@ -9,6 +9,9 @@
   FILES
     "${CMAKE_CURRENT_BINARY_DIR}/manifest.json"
     "apparmor.json"
+    "youtube.application"
+    "youtube.service"
+    "youtube.desktop"
   DESTINATION ${CMAKE_INSTALL_PREFIX}
 )
 
 
=== modified file 'click/apparmor.json'
--- click/apparmor.json	2014-07-31 09:38:11 +0000
+++ click/apparmor.json	2014-09-11 08:39:29 +0000
@@ -1,6 +1,7 @@
 {
     "template": "ubuntu-scope-network",
     "policy_groups": [
+        "accounts"
     ],
     "policy_version": 1.2
 }
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-09-09 12:48:43 +0000
+++ click/manifest.json.in	2014-09-11 08:39:29 +0000
@@ -5,12 +5,15 @@
     "hooks": {
         "youtube": {
             "scope": "youtube",
-            "apparmor": "apparmor.json"
+            "apparmor": "apparmor.json",
+            "account-application": "youtube.application",
+            "account-service": "youtube.service",
+            "desktop": "youtube.desktop"
         }
     },
-    "icon": "icon",
+    "icon": "youtube/icon.png",
     "maintainer": "Ubuntu Developers <[e-mail]>",
     "name": "@SCOPE_NAME@",
     "title": "YouTube scope",
-    "version": "1.0.11"
+    "version": "1.0.12"
 }
 
=== added file 'click/youtube.application'
--- click/youtube.application	1970-01-01 00:00:00 +0000
+++ click/youtube.application	2014-09-11 08:39:29 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="com.ubuntu.scopes.youtube_youtube">
+  <description>YouTube</description>
+  <desktop-entry>com.ubuntu.scopes.youtube_youtube_1.0.12.desktop</desktop-entry>
+  <services>
+    <service id="com.ubuntu.scopes.youtube_youtube">
+      <description>Watch your favorite YouTube videos</description>
+    </service>
+  </services>
+</application>
 
=== added file 'click/youtube.desktop'
--- click/youtube.desktop	1970-01-01 00:00:00 +0000
+++ click/youtube.desktop	2014-09-11 08:39:29 +0000
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=YouTube
+Icon=youtube/icon.png
+OnlyShowIn=OnlineAccountsSettingsPage
+Exec=
 
=== renamed file 'data/accounts/services/youtube.service' => 'click/youtube.service'
--- data/accounts/services/youtube.service	2014-08-11 10:35:09 +0000
+++ click/youtube.service	2014-09-11 08:39:29 +0000
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<service id="youtube">
+<service id="com.ubuntu.scopes.youtube_youtube">
   <type>sharing</type>
   <icon>youtube</icon>
-  <name>Youtube</name>
-  <provider>youtube</provider>
+  <name>YouTube</name>
+  <provider>google</provider>
   <translations>unity-scope-youtube</translations>
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">web_server</setting>
+      <group name="oauth2">
+        <group name="web_server">
+          <setting name="Host">accounts.google.com</setting>
+          
+          <setting name="AuthPath">o/oauth2/auth?access_type=offline</setting>
+          <setting name="TokenPath">o/oauth2/token</setting>
+          <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
+          <setting name="ResponseType">code</setting>
+          <setting type="as" name="Scope">['https://www.googleapis.com/auth/youtube.readonly']</setting>
+          <setting name="ClientId">368477111780-4tf0t65ol86nkvf6guksr8d1om0aebob.apps.googleusercontent.com</setting>
+          <setting name="ClientSecret">bNfrMJzYmesl2sm1XutVnlmv</setting>
+          <setting type="as" name="AllowedSchemes">['https','http']</setting>
+        </group>
+      </group>
+    </group>
+  </template>
 </service>
 
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-07-22 10:12:43 +0000
+++ data/CMakeLists.txt	2014-09-11 08:39:29 +0000
@@ -18,4 +18,3 @@
   DESTINATION
     "${SCOPE_INSTALL_DIR}"
 )
-
 
=== removed directory 'data/accounts'
=== removed directory 'data/accounts/providers'
=== removed file 'data/accounts/providers/youtube.provider'
--- data/accounts/providers/youtube.provider	2014-08-11 10:35:09 +0000
+++ data/accounts/providers/youtube.provider	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<provider id="youtube">
-  <name>Youtube</name>
-  <description>Connect your Youtube account</description>
-  <icon>youtube</icon>
-  <translations>unity-scope-youtube</translations>
-  <domains>.*google\.com</domains>
-  <plugin>generic-oauth</plugin>
-
-  <template>
-    <group name="auth">
-      <setting name="method">oauth2</setting>
-      <setting name="mechanism">web_server</setting>
-      <group name="oauth2">
-        <group name="web_server">
-          <setting name="Host">accounts.google.com</setting>
-          
-          <setting name="AuthPath">o/oauth2/auth?access_type=offline</setting>
-          <setting name="TokenPath">o/oauth2/token</setting>
-          <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
-          <setting name="ResponseType">code</setting>
-          <setting type="as" name="Scope">['https://www.googleapis.com/auth/youtube.readonly']</setting>
-          <setting name="ClientId">368477111780-4tf0t65ol86nkvf6guksr8d1om0aebob.apps.googleusercontent.com</setting>
-          <setting name="ClientSecret">bNfrMJzYmesl2sm1XutVnlmv</setting>
-          <setting type="as" name="AllowedSchemes">['https','http']</setting>
-        </group>
-      </group>
-    </group>
-  </template>
-</provider>
 
=== removed directory 'data/accounts/qml-plugins'
=== removed directory 'data/accounts/qml-plugins/youtube'
=== removed file 'data/accounts/qml-plugins/youtube/Main.qml'
--- data/accounts/qml-plugins/youtube/Main.qml	2014-08-11 10:35:09 +0000
+++ data/accounts/qml-plugins/youtube/Main.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-import Ubuntu.OnlineAccounts.Plugin 1.0
-
-OAuthMain {
-
-    // Override creationComponent so we can retreive that account's username
-    // This then appears in the accounts management page
-    creationComponent: OAuth {
-        function completeCreation(reply) {
-            console.log("Vimeo got reply: " + reply.AccessToken)
-            var http = new XMLHttpRequest()
-            var url = "https://api.vimeo.com/me";
-            http.open("GET", url, true);
-            http.setRequestHeader("Authorization", "Bearer " + reply.AccessToken)
-            http.setRequestHeader("Accept", "application/vnd.vimeo.*+json; version=3.0")
-            http.setRequestHeader("User-Agent", "unity-scope-vimeo 0.1; (http: //developer.vimeo.com/api/docs)")
-            http.onreadystatechange = function() {
-                if (http.readyState === 4) {
-                    if (http.status == 200) {
-                        console.log("ok")
-                        var response = JSON.parse(http.responseText)
-                        console.log("got name: " + response.name)
-                        account.updateDisplayName(response.name)
-                        account.synced.connect(finished)
-                        account.sync()
-                    } else {
-                        console.log("error: " + http.responseText)
-                        cancel()
-                    }
-                }
-            };
-
-            http.send(null);
-        }
-    }
-}
 
=== removed directory 'data/accounts/services'
=== modified file 'debian/control'
--- debian/control	2014-09-09 10:28:21 +0000
+++ debian/control	2014-09-11 08:39:29 +0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Build-Depends: cmake (>= 2.8.10),
-Build-Depends: cmake-extras (>= 0.2),
+               cmake-extras (>= 0.2),
                debhelper (>= 9),
                dh-translations,
                g++-4.9,
@@ -16,7 +16,7 @@
                libnet-cpp-dev (>= 1.1.0),
                libprocess-cpp-dev,
                libsignon-glib-dev,
-               libunity-scopes-dev (>= 0.6.0),
+               libunity-scopes-dev (>= 0.6.6),
                pkg-config,
                python-tornado,
 Maintainer: Ubuntu Developers <[e-mail]>
 
=== removed file 'include/youtube/api/simple-oauth.h'
--- include/youtube/api/simple-oauth.h	2014-06-27 13:08:32 +0000
+++ include/youtube/api/simple-oauth.h	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of version 3 of the GNU Lesser General Public License as published
- * by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Pete Woods <[e-mail]>
- */
-
-#ifndef VIMEO_API_SIMPLEOAUTH_H_
-#define VIMEO_API_SIMPLEOAUTH_H_
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include <glib.h>
-#include <libaccounts-glib/accounts-glib.h>
-#include <libsignon-glib/signon-glib.h>
-
-namespace youtube {
-namespace api {
-
-class SimpleOAuth {
-public:
-    struct AuthData {
-        std::string client_id;
-        std::string client_secret;
-        std::string access_token;
-    };
-
-    SimpleOAuth(const std::string &service_name);
-
-    virtual ~SimpleOAuth() = default;
-
-    virtual SimpleOAuth::AuthData auth_data() const;
-
-protected:
-    void auth_login(const std::string &clientId, const std::string &clientSecret,
-            const std::string &accessToken);
-
-    static void login_cb(GObject *source, GAsyncResult *result,
-            void *user_data);
-
-    void login(SignonAuthSession *source, GAsyncResult *result);
-
-    void login_service();
-
-    void logout_service();
-
-    void lookup_account_service();
-
-    static void account_enabled_cb(AgManager *manager, guint account_id,
-            void *user_data);
-
-    void account_enabled(AgManager *manager, guint account_id);
-
-    gboolean setup_context();
-
-    static gboolean setup_context_cb(void *user_data);
-
-    std::string service_name_;
-
-    std::shared_ptr<GMainLoop> main_loop_;
-    std::shared_ptr<AgManager> manager_;
-    std::shared_ptr<AgAccountService> account_service_;
-    AgAuthData *ag_auth_data_;
-    std::shared_ptr<SignonAuthSession> session_;
-
-    std::shared_ptr<GVariant> auth_params_;
-    std::shared_ptr<GVariant> session_data_;
-
-    AuthData auth_data_;
-};
-
-}
-}
-
-#endif // VIMEO_API_SIMPLEOAUTH_H_
 
=== modified file 'include/youtube/scope/scope.h'
--- include/youtube/scope/scope.h	2014-08-01 15:26:57 +0000
+++ include/youtube/scope/scope.h	2014-09-11 08:39:29 +0000
@@ -20,13 +20,12 @@
 #define YOUTUBE_SCOPE_SCOPE_H_
 
 #include <youtube/api/config.h>
-#include <youtube/api/simple-oauth.h>
 
+#include <unity/scopes/OnlineAccountClient.h>
+#include <unity/scopes/PreviewQueryBase.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/ReplyProxyFwd.h>
 #include <unity/scopes/ScopeBase.h>
-#include <unity/scopes/QueryBase.h>
-#include <unity/scopes/ReplyProxyFwd.h>
-#include <unity/scopes/QueryBase.h>
-#include <unity/scopes/PreviewQueryBase.h>
 
 namespace youtube {
 
@@ -34,8 +33,12 @@
 
 class Scope: public unity::scopes::ScopeBase {
 public:
-    void start(std::string const&)
-            override;
+    Scope();
+
+    void service_update(unity::scopes::OnlineAccountClient::ServiceStatus const& status);
+    void update_config();
+
+    void start(std::string const&) override;
 
     void stop() override;
 
@@ -48,6 +51,8 @@
 
 protected:
     youtube::api::Config::Ptr config_;
+    std::mutex config_mutex_;
+    unity::scopes::OnlineAccountClient oa_client_;
 };
 
 }
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-19 11:09:19 +0000
+++ src/CMakeLists.txt	2014-09-11 08:39:29 +0000
@@ -23,7 +23,6 @@
   youtube/api/guide-category.cpp
   youtube/api/playlist.cpp
   youtube/api/playlist-item.cpp
-  youtube/api/simple-oauth.cpp
   youtube/api/search-list-response.cpp
   youtube/api/video.cpp
   youtube/scope/preview.cpp
 
=== removed file 'src/youtube/api/simple-oauth.cpp'
--- src/youtube/api/simple-oauth.cpp	2014-06-27 13:08:32 +0000
+++ src/youtube/api/simple-oauth.cpp	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of version 3 of the GNU Lesser General Public License as published
- * by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Pete Woods <[e-mail]>
- */
-
-#include <youtube/api/simple-oauth.h>
-
-#include <iostream>
-
-using namespace youtube::api;
-using namespace std;
-
-SimpleOAuth::SimpleOAuth(const std::string &service_name) :
-        service_name_(service_name) {
-    main_loop_.reset(g_main_loop_new(nullptr, true), g_main_loop_unref);
-
-    manager_.reset(ag_manager_new(), g_object_unref);
-    g_idle_add(setup_context_cb, this);
-
-    g_main_loop_run(main_loop_.get());
-}
-
-SimpleOAuth::AuthData SimpleOAuth::auth_data() const {
-    return auth_data_;
-}
-
-void SimpleOAuth::auth_login(const string &clientId, const string &clientSecret,
-        const string &accessToken) {
-    auth_data_.client_id = clientId;
-    auth_data_.client_secret = clientSecret;
-    auth_data_.access_token = accessToken;
-
-    g_main_loop_quit(main_loop_.get());
-}
-
-void SimpleOAuth::login_cb(GObject *source, GAsyncResult *result,
-        void *user_data) {
-    SignonAuthSession *session = (SignonAuthSession *) source;
-    SimpleOAuth *accounts = static_cast<SimpleOAuth*>(user_data);
-    accounts->login(session, result);
-}
-
-void SimpleOAuth::login(SignonAuthSession *session, GAsyncResult *result) {
-    GError *error = nullptr;
-    session_data_.reset(
-            signon_auth_session_process_finish(session, result, &error),
-            g_variant_unref);
-
-    session_.reset();
-
-    if (error) {
-        cerr << "Authentication failed: " << error->message << endl;
-        g_error_free(error);
-        return;
-    }
-
-    char *tmp = nullptr;
-    string client_id;
-    string client_secret;
-    string access_token;
-    if (g_variant_lookup(auth_params_.get(), "ClientId", "&s", &tmp)) {
-        client_id = tmp;
-    }
-    if (g_variant_lookup(auth_params_.get(), "ClientSecret", "&s", &tmp)) {
-        client_secret = tmp;
-    }
-    if (g_variant_lookup(session_data_.get(), "AccessToken", "&s", &tmp)) {
-        access_token = tmp;
-    }
-
-    auth_login(client_id, client_secret, access_token);
-}
-
-void SimpleOAuth::login_service() {
-    ag_auth_data_ = ag_account_service_get_auth_data(account_service_.get());
-
-    GError *error = NULL;
-    session_.reset(
-            signon_auth_session_new(
-                    ag_auth_data_get_credentials_id(ag_auth_data_),
-                    ag_auth_data_get_method(ag_auth_data_), &error),
-            g_object_unref);
-    if (error != NULL) {
-        cerr << "Could not set up auth session: " << error->message << endl;
-        g_error_free(error);
-        return;
-    }
-
-    GVariantBuilder builder;
-    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
-    g_variant_builder_add(&builder, "{sv}",
-    SIGNON_SESSION_DATA_UI_POLICY,
-            g_variant_new_int32(SIGNON_POLICY_NO_USER_INTERACTION));
-
-    auth_params_.reset(
-            g_variant_ref_sink(
-                    ag_auth_data_get_login_parameters(ag_auth_data_,
-                            g_variant_builder_end(&builder))), g_variant_unref);
-
-    signon_auth_session_process_async(session_.get(), auth_params_.get(),
-            ag_auth_data_get_mechanism(ag_auth_data_),
-            NULL, /* cancellable */
-            login_cb, this);
-}
-
-void SimpleOAuth::logout_service() {
-    session_data_.reset();
-    auth_params_.reset();
-    if (session_) {
-        signon_auth_session_cancel(session_.get());
-        session_.reset();
-    }
-    ag_auth_data_ = nullptr;
-    account_service_.reset();
-
-    auth_login(string(), string(), string());
-}
-
-void SimpleOAuth::lookup_account_service() {
-    GList *account_services = ag_manager_get_account_services(
-            manager_.get());
-    GList *tmp;
-    for (tmp = account_services; tmp != nullptr; tmp = tmp->next) {
-        AgAccountService *acct_svc = AG_ACCOUNT_SERVICE(tmp->data);
-        AgService *service = ag_account_service_get_service(acct_svc);
-        if (service_name_ == ag_service_get_name(service)) {
-            account_service_.reset(AG_ACCOUNT_SERVICE(g_object_ref(acct_svc)),
-                    g_object_unref);
-            break;
-        }
-    }
-    ag_manager_list_free(account_services);
-
-    if (account_service_) {
-        login_service();
-    } else {
-        cerr << "Could not find account service" << endl;
-        g_main_loop_quit(main_loop_.get());
-    }
-}
-
-void SimpleOAuth::account_enabled_cb(AgManager *manager, guint account_id,
-        void *user_data) {
-    SimpleOAuth *accounts = static_cast<SimpleOAuth*>(user_data);
-    accounts->account_enabled(manager, account_id);
-}
-
-void SimpleOAuth::account_enabled(AgManager *, guint) {
-    if (account_service_
-            && !ag_account_service_get_enabled(account_service_.get())) {
-        logout_service();
-    }
-    lookup_account_service();
-}
-
-gboolean SimpleOAuth::setup_context_cb(void *user_data) {
-    SimpleOAuth *accounts = static_cast<SimpleOAuth*>(user_data);
-    return accounts->setup_context();
-}
-
-gboolean SimpleOAuth::setup_context() {
-    lookup_account_service();
-    g_signal_connect(manager_.get(), "enabled-event",
-            G_CALLBACK(account_enabled_cb), this);
-    return FALSE;
-}
 
=== modified file 'src/youtube/scope/query.cpp'
--- src/youtube/scope/query.cpp	2014-09-09 10:28:21 +0000
+++ src/youtube/scope/query.cpp	2014-09-11 08:39:29 +0000
@@ -28,6 +28,7 @@
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/CategoryRenderer.h>
+#include <unity/scopes/OnlineAccountClient.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/SearchReply.h>
 #include <unity/scopes/SearchMetadata.h>
@@ -295,7 +296,13 @@
 
     sc::CategorisedResult res(cat);
     res.set_title(_("Log-in to YouTube"));
-    res.set_uri("settings:///system/online-accounts");
+
+    sc::OnlineAccountClient oa_client("com.ubuntu.scopes.youtube_youtube", "sharing", "google");
+    oa_client.register_account_login_item(res,
+                                          query(),
+                                          sc::OnlineAccountClient::InvalidateResults,
+                                          sc::OnlineAccountClient::DoNothing);
+
     reply->push(res);
 }
 
@@ -668,10 +675,9 @@
             search(reply, query_string);
         }
 
-//        FIXME Add this back when direct activation can be controlled
-//        if (!client_->config()->authenticated) {
-//            add_login_nag(reply);
-//        }
+        if (!client_->config()->authenticated) {
+            add_login_nag(reply);
+        }
     } catch (domain_error &e) {
         cerr << "ERROR: " << e.what() << endl;
     }
 
=== modified file 'src/youtube/scope/scope.cpp'
--- src/youtube/scope/scope.cpp	2014-09-09 10:56:09 +0000
+++ src/youtube/scope/scope.cpp	2014-09-11 08:39:29 +0000
@@ -30,32 +30,56 @@
 using namespace youtube::scope;
 using namespace youtube::api;
 
-void Scope::start(string const&) {
-    setlocale(LC_ALL, "");
-    string translation_directory = ScopeBase::scope_directory() + "/../share/locale/";
-    bindtextdomain(GETTEXT_PACKAGE, translation_directory.c_str());
-
+Scope::Scope()
+    : oa_client_("com.ubuntu.scopes.youtube_youtube",
+                 "sharing",
+                 "google",
+                 sc::OnlineAccountClient::CreateInternalMainLoop)
+{
+    oa_client_.set_service_update_callback(std::bind(&Scope::service_update, this, std::placeholders::_1));
+}
+
+void Scope::service_update(sc::OnlineAccountClient::ServiceStatus const&)
+{
+    update_config();
+}
+
+void Scope::update_config()
+{
+    std::lock_guard<std::mutex> lock(config_mutex_);
     config_ = make_shared<Config>();
 
     if (getenv("YOUTUBE_SCOPE_APIROOT")) {
         config_->apiroot = getenv("YOUTUBE_SCOPE_APIROOT");
     }
 
-    SimpleOAuth oauth("youtube");
-    SimpleOAuth::AuthData auth_data;
     if (getenv("YOUTUBE_SCOPE_IGNORE_ACCOUNTS") == nullptr) {
-        auth_data = oauth.auth_data();
+        auto statuses = oa_client_.get_service_statuses();
+        for (auto const& status : statuses)
+        {
+            if (status.service_enabled)
+            {
+                config_->authenticated = true;
+                config_->access_token = status.access_token;
+                config_->client_id = status.client_id;
+                config_->client_secret = status.client_secret;
+                break;
+            }
+        }
     }
-    if (auth_data.access_token.empty()) {
+
+    if (!config_->authenticated) {
         cerr << "YouTube scope is unauthenticated" << endl;
     } else {
         cerr << "YouTube scope is authenticated" << endl;
-        config_->authenticated = true;
     }
+}
 
-    config_->access_token = auth_data.access_token;
-    config_->client_id = auth_data.client_id;
-    config_->client_secret = auth_data.client_secret;
+void Scope::start(string const&) {
+    setlocale(LC_ALL, "");
+    string translation_directory = ScopeBase::scope_directory() + "/../share/locale/";
+    bindtextdomain(GETTEXT_PACKAGE, translation_directory.c_str());
+    update_config();
 }
 
 void Scope::stop() {
@@ -63,12 +87,14 @@
 
 sc::SearchQueryBase::UPtr Scope::search(const sc::CannedQuery &query,
         const sc::SearchMetadata &metadata) {
+    std::lock_guard<std::mutex> lock(config_mutex_);
     auto client = make_shared<Client>(config_);
     return sc::SearchQueryBase::UPtr(new Query(query, metadata, client));
 }
 
 sc::PreviewQueryBase::UPtr Scope::preview(sc::Result const& result,
         sc::ActionMetadata const& metadata) {
+    std::lock_guard<std::mutex> lock(config_mutex_);
     auto client = make_shared<Client>(config_);
     return sc::PreviewQueryBase::UPtr(new Preview(result, metadata, client));
 }