Changeset 36533bf

Timestamp:

2011-12-19T12:54:49Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4b53c65

Parents:

4be0e34

Message:

When updating the XMPP password field with OAuth data, try harder to preserve
existing data. (Like refresh tokens which we'll need again on next login.)

Files:

• lib/oauth.h (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (2 diffs)

lib/oauth.h

@@ -96 +96 @@
 void oauth_params_free( GSList **params );
 char *oauth_params_string( GSList *params );
+void oauth_params_set( GSList **params, const char *key, const char *value );
 const char *oauth_params_get( GSList **params, const char *key );

protocols/jabber/sasl.c

@@ -528 +528 @@
         struct im_connection *ic = data;
         struct jabber_data *jd;
+        GSList *auth = NULL;
         
         if( g_slist_find( jabber_connections, ic ) == NULL )
@@ -540 +541 @@
                 return;
         }
-        if( refresh_token != NULL )
-        {
-                g_free( ic->acc->pass );
-                ic->acc->pass = g_strdup_printf( "refresh_token=%s", refresh_token );
-        }
-        /* Should do this, but only in the Facebook case where we get an access
-           token that never expires. Shouldn't overwrite a refresh token with
-           an access token.
-        else
-        {
-                g_free( ic->acc->pass );
-                ic->acc->pass = g_strdup_printf( "access_token=%s", access_token );
-        } */
+        
+        oauth_params_parse( &auth, ic->acc->pass );
+        if( refresh_token )
+                oauth_params_set( &auth, "refresh_token", refresh_token );
+        if( access_token )
+                oauth_params_set( &auth, "access_token", access_token );
+        
+        g_free( ic->acc->pass );
+        ic->acc->pass = oauth_params_string( auth );
+        oauth_params_free( &auth );
         
         g_free( jd->oauth2_access_token );