Merge lp:~marcustomlinson/unity-scopes-api/oa_ui_policy-rtm into lp:unity-scopes-api/rtm-14.09

[Marcus Tomlinson]

* Use SIGNON_POLICY_NO_USER_INTERACTION by default unless UNITY_SCOPES_OA_UI_POLICY env var is set.
* Update the accounts we already know about when refresh_service_statuses() is called.

[Paweł Stołowski (stolowski)]

LGTM.

review: Approve

=== modified file 'src/scopes/internal/OnlineAccountClientImpl.cpp'
--- src/scopes/internal/OnlineAccountClientImpl.cpp	2014-10-13 15:13:12 +0000
+++ src/scopes/internal/OnlineAccountClientImpl.cpp	2014-12-11 09:00:52 +0000
@@ -160,8 +160,24 @@
         }
 
         // Get authorization parameters then attempt to signon
+        GVariantBuilder builder;
+        g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+
+        if (getenv("UNITY_SCOPES_OA_UI_POLICY"))
+        {
+            g_variant_builder_add(&builder, "{sv}",
+                                  SIGNON_SESSION_DATA_UI_POLICY,
+                                  g_variant_new_int32(SIGNON_POLICY_DEFAULT));  // LCOV_EXCL_LINE
+        }
+        else
+        {
+            g_variant_builder_add(&builder, "{sv}",
+                                  SIGNON_SESSION_DATA_UI_POLICY,
+                                  g_variant_new_int32(SIGNON_POLICY_NO_USER_INTERACTION));
+        }
+
         info->auth_params.reset(
-            g_variant_ref_sink(ag_auth_data_get_login_parameters(auth_data.get(), nullptr)), free_variant);
+            g_variant_ref_sink(ag_auth_data_get_login_parameters(auth_data.get(), g_variant_builder_end(&builder))), free_variant);
 
         // Start signon process
         signon_auth_session_process_async(info->session.get(),
@@ -377,6 +393,13 @@
         std::rethrow_exception(thread_exception_);  // LCOV_EXCL_LINE
     }
 
+    // Update the accounts we already know about
+    for (auto const& info : accounts_)
+    {
+        service_update_cb(info.second->account_service.get(), ag_account_service_get_enabled(info.second->account_service.get()), info.second.get());
+    }
+
+    // Find new account we don't yet know about
     std::shared_ptr<GList> enabled_accounts(ag_manager_list(manager_.get()), ag_manager_list_free);
     GList* it;
     for (it = enabled_accounts.get(); it; it = it->next)

=== modified file 'test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp'
--- test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp	2014-10-13 15:13:12 +0000
+++ test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp	2014-12-11 09:00:52 +0000
@@ -459,49 +459,6 @@
     EXPECT_TRUE(wait_for_service_update(disabled_status));
 }
 
-TEST_F(OnlineAccountClientTestNoMainLoop, refresh_services_no_main_loop)
-{
-    auto statuses = oa_client()->get_service_statuses();
-    EXPECT_EQ(0, statuses.size());
-
-    create_account();
-    oa_client()->refresh_service_statuses();
-
-    statuses = oa_client()->get_service_statuses();
-    EXPECT_EQ(1, statuses.size());
-    EXPECT_FALSE(statuses[0].service_enabled);
-
-    enable_service();
-    oa_client()->refresh_service_statuses();
-
-    statuses = oa_client()->get_service_statuses();
-    EXPECT_TRUE(statuses[0].service_enabled);
-
-    disable_service();
-    oa_client()->refresh_service_statuses();
-
-    statuses = oa_client()->get_service_statuses();
-    EXPECT_FALSE(statuses[0].service_enabled);
-
-    enable_service();
-    oa_client()->refresh_service_statuses();
-
-    statuses = oa_client()->get_service_statuses();
-    EXPECT_TRUE(statuses[0].service_enabled);
-
-    disable_account();
-    oa_client()->refresh_service_statuses();
-
-    statuses = oa_client()->get_service_statuses();
-    EXPECT_FALSE(statuses[0].service_enabled);
-
-    enable_account();
-    oa_client()->refresh_service_statuses();
-
-    statuses = oa_client()->get_service_statuses();
-    EXPECT_TRUE(statuses[0].service_enabled);
-}
-
 TEST_F(OnlineAccountClientTestNoMainLoop, authentication)
 {
     OnlineAccountClient::ServiceStatus auth_status;