Merge lp:~mardy/gnome-control-center-signon/update-params into lp:gnome-control-center-signon

[Alberto Mardegan]

OAuthPlugin: update authentication parameters on re-authentication

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:100
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/44/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/44/console

review: Needs Fixing (continuous-integration)

[David King (amigadave)]

The Jenkins failure is just a conflict in configure.ac; the tests all build and pass fine here. Looks good!

review: Approve

=== modified file 'libaccount-plugin/oauth-plugin.c'
--- libaccount-plugin/oauth-plugin.c	2012-09-06 15:45:33 +0000
+++ libaccount-plugin/oauth-plugin.c	2012-09-10 11:23:22 +0000
@@ -163,6 +163,27 @@
 }
 
 static void
+unset_authentication_settings (AgAccount *account,
+                               const gchar *method,
+                               const gchar *mechanism)
+{
+    AgAccountSettingIter iter;
+    const gchar *key;
+    const GValue *value;
+    gchar *prefix, *full_key;
+
+    prefix = g_strdup_printf ("auth/%s/%s/", method, mechanism);
+    ag_account_settings_iter_init (account, &iter, prefix);
+    while (ag_account_settings_iter_next (&iter, &key, &value))
+    {
+        full_key = g_strconcat (prefix, key, NULL);
+        ag_account_set_value (account, full_key, NULL);
+        g_free (full_key);
+    }
+    g_free (prefix);
+}
+
+static void
 store_authentication_parameters (ApOAuthPlugin *self, AgAccount *account)
 {
     ApOAuthPluginPrivate *priv = self->priv;
@@ -188,6 +209,13 @@
     g_value_set_static_string (&v_mechanism, priv->mechanism);
     ag_account_set_value (account, "auth/mechanism", &v_mechanism);
 
+    /* Delete any existing parameter (if the account is not new) */
+    if (account->id != 0)
+    {
+        unset_authentication_settings (account,
+                                       oauth_method, priv->mechanism);
+    }
+
     /* Add all the provider-specific OAuth parameters. */
     parameters = priv->account_oauth_params != NULL ?
         priv->account_oauth_params : priv->oauth_params;
@@ -282,7 +310,12 @@
     {
         /* re-authenticated account */
         ap_plugin_set_need_authentication ((ApPlugin *)self, FALSE);
-        g_idle_add ((GSourceFunc)emit_finished, self);
+
+        /* Store the authentication parameters, in case they have changed.
+         * This might be removed or reviewed once the following is implemented:
+         * http://code.google.com/p/accounts-sso/issues/detail?id=111
+         */
+        store_account (self);
     }
 }