[gnome-online-accounts/gnome-3-8] identity: don't queue two temporary accounts for one identity

[Ray Strode <halfline src gnome org>]

commit 46a5fd825d9dcbdb23939acbd7cf65205eab236d
Author: Ray Strode <rstrode redhat com>
Date:   Mon Sep 30 14:06:28 2013 -0400

    identity: don't queue two temporary accounts for one identity
    
    There are cases where more than one temporary g-o-a account can get
    created on kinit. That is because creating a temporary account is
    asynchronous, and kinit can trigger multiple refreshes of the credential
    cache in one go.
    
    This commit accounts for all pending temporary account additions in a
    hash table, and filters out duplicates.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=709103

 src/goaidentity/goaidentityservice.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/src/goaidentity/goaidentityservice.c b/src/goaidentity/goaidentityservice.c
index 476c6fc..1639868 100644
--- a/src/goaidentity/goaidentityservice.c
+++ b/src/goaidentity/goaidentityservice.c
@@ -53,6 +53,7 @@ struct _GoaIdentityServicePrivate
 
   GHashTable               *watched_client_connections;
   GHashTable               *key_holders;
+  GHashTable               *pending_temporary_account_results;
 
   /* FIXME: This is a little ucky, since the goa service
    * is in process, we should able to use direct calls.
@@ -675,6 +676,12 @@ goa_identity_service_init (GoaIdentityService *self)
                                                    g_free,
                                                    (GDestroyNotify)
                                                    g_object_unref);
+  self->priv->pending_temporary_account_results = g_hash_table_new_full (g_str_hash,
+                                                                         g_str_equal,
+                                                                         (GDestroyNotify)
+                                                                         g_free,
+                                                                         (GDestroyNotify)
+                                                                         g_object_unref);
 }
 
 static void
@@ -697,6 +704,8 @@ goa_identity_service_finalize (GObject *object)
                    (GDestroyNotify) g_hash_table_unref);
   g_clear_pointer (&self->priv->key_holders,
                    (GDestroyNotify) g_hash_table_unref);
+  g_clear_pointer (&self->priv->pending_temporary_account_results,
+                   (GDestroyNotify) g_hash_table_unref);
 
   G_OBJECT_CLASS (goa_identity_service_parent_class)->finalize (object);
 }
@@ -787,8 +796,13 @@ on_temporary_account_created_for_identity (GoaIdentityService *self,
                                            GoaIdentity        *identity)
 {
   GoaObject   *object;
+  const char  *principal;
   GError      *error;
 
+  principal = goa_identity_get_identifier (identity);
+  g_hash_table_remove (self->priv->pending_temporary_account_results,
+                       principal);
+
   error = NULL;
   if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), &error))
     {
@@ -867,9 +881,19 @@ add_temporary_account (GoaIdentityService *self,
   GSimpleAsyncResult *operation_result;
   GVariantBuilder     credentials;
   GVariantBuilder     details;
+  GoaObject *object;
 
   principal = goa_identity_get_identifier (identity);
 
+  object = g_hash_table_lookup (self->priv->pending_temporary_account_results,
+                                principal);
+
+  if (object != NULL)
+    {
+      goa_debug ("GoaIdentityService: would add temporary identity %s, but it's already pending", principal);
+      return;
+    }
+
   goa_debug ("GoaIdentityService: adding temporary identity %s", principal);
 
   /* If there's no account for this identity then create a temporary one.
@@ -894,6 +918,9 @@ add_temporary_account (GoaIdentityService *self,
                                                 on_temporary_account_created_for_identity,
                                                 identity,
                                                 add_temporary_account);
+  g_hash_table_insert (self->priv->pending_temporary_account_results,
+                       g_strdup (principal),
+                       g_object_ref (operation_result));
 
   goa_manager_call_add_account (self->priv->accounts_manager,
                                 "kerberos",