Changeset bf57cd1

Timestamp:

2011-12-19T00:17:38Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4be0e34

Parents:

9b0ad7e

Message:

Facebook OAuth2 should now be fully usable.

Location:

lib

Files:

• oauth.c (modified) (2 diffs)
• oauth2.c (modified) (2 diffs)

lib/oauth.c

@@ -134 +134 @@
         GSList *l, *n;
         
+        if( params == NULL )
+                return NULL;
+        
         for( l = *params; l; l = n )
         {
@@ -157 +160 @@
         int key_len = strlen( key );
         GSList *l;
+        
+        if( params == NULL )
+                return NULL;
         
         for( l = *params; l; l = l->next )

lib/oauth2.c

@@ -103 +103 @@
         struct oauth2_access_token_data *cb_data = req->data;
         char *atoken = NULL, *rtoken = NULL;
+        const char *content_type;
         
         if( getenv( "BITLBEE_DEBUG" ) && req->reply_body )
                 printf( "%s\n", req->reply_body );
         
-        if( req->status_code == 200 )
+        content_type = get_rfc822_header( req->reply_headers, "Content-Type", 0 );
+        
+        if( req->status_code != 200 )
+        {
+        }
+        else if( strstr( content_type, "application/json" ) )
         {
                 atoken = oauth2_json_dumb_get( req->reply_body, "access_token" );
@@ -113 +119 @@
                 if( getenv( "BITLBEE_DEBUG" ) )
                         printf( "Extracted atoken=%s rtoken=%s\n", atoken, rtoken );
+        }
+        else
+        {
+                /* Facebook use their own odd format here, seems to be URL-encoded. */
+                GSList *p_in = NULL;
+                
+                oauth_params_parse( &p_in, req->reply_body );
+                atoken = g_strdup( oauth_params_get( &p_in, "access_token" ) );
+                rtoken = g_strdup( oauth_params_get( &p_in, "refresh_token" ) );
+                oauth_params_free( &p_in );
         }
         cb_data->func( cb_data->data, atoken, rtoken );