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

[Marcus Tomlinson]

Use SIGNON_POLICY_NO_USER_INTERACTION by default unless UNITY_SCOPES_OA_UI_POLICY env var is set.

[lp:~marcustomlinson/unity-scopes-api/oa_ui_policy]

274. By Marcus Tomlinson on 2014-12-10

Merged staging

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'src/scopes/internal/OnlineAccountClientImpl.cpp'
--- src/scopes/internal/OnlineAccountClientImpl.cpp	2014-12-03 10:44:45 +0000
+++ src/scopes/internal/OnlineAccountClientImpl.cpp	2014-12-10 10:18:08 +0000
@@ -163,8 +163,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(),