Changeset 3b878a1 for protocols/twitter/twitter.c

Timestamp:

2010-05-02T21:20:09Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6824fb3

Parents:

839189b (diff), f4b0911 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

OAuth sanity fix: Twitter-specific stuff should *not* be in lib/oauth.c.
Somewhat intrusive, should've done this right immediately. :-/

File:

• protocols/twitter/twitter.c (modified) (11 diffs)

protocols/twitter/twitter.c

@@ -28 +28 @@
 #include "twitter_lib.h"
 
-
 /**
  * Main loop function
@@ -66 +65 @@
 }
 
+
+static const struct oauth_service twitter_oauth =
+{
+        "http://api.twitter.com/oauth/request_token",
+        "http://api.twitter.com/oauth/access_token",
+        "http://api.twitter.com/oauth/authorize",
+        .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
+        .consumer_secret = "FCxqcr0pXKzsF9ajmP57S3VQ8V6Drk4o2QYtqMcOszo",
+};
+
 static gboolean twitter_oauth_callback( struct oauth_info *info );
 
@@ -74 +83 @@
         imcb_log( ic, "Requesting OAuth request token" );
 
-        td->oauth_info = oauth_request_token(
-                TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+        td->oauth_info = oauth_request_token( &twitter_oauth, twitter_oauth_callback, ic );
 }
 
@@ -100 +108 @@
                 sprintf( name, "twitter_%s", ic->acc->user );
                 msg = g_strdup_printf( "To finish OAuth authentication, please visit "
-                                       "%s?%s and respond with the resulting PIN code.",
-                                       TWITTER_OAUTH_AUTHORIZE, info->auth_params );
+                                       "%s and respond with the resulting PIN code.",
+                                       info->auth_url );
                 imcb_buddy_msg( ic, name, msg, 0, 0 );
                 g_free( msg );
@@ -107 +115 @@
         else if( info->stage == OAUTH_ACCESS_TOKEN )
         {
-                if( info->access_token == NULL )
+                if( info->token == NULL || info->token_secret == NULL )
                 {
                         imcb_error( ic, "OAuth error: %s", info->http->status_string );
@@ -114 +122 @@
                 }
                 
-                td->oauth = g_strdup( info->access_token );
-                
                 /* IM mods didn't do this so far and it's ugly but I should
                    be able to get away with it... */
                 g_free( ic->acc->pass );
-                ic->acc->pass = g_strdup( info->access_token );
+                ic->acc->pass = oauth_to_string( info );
                 
                 twitter_main_loop_start( ic );
@@ -126 +132 @@
         return TRUE;
 }
+
 
 static char *set_eval_mode( set_t *set, char *value )
@@ -165 +172 @@
                 td->pass = g_strdup( acc->pass );
         else if( strstr( acc->pass, "oauth_token=" ) )
-                td->oauth = g_strdup( acc->pass );
+                td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
         td->home_timeline_id = 0;
         
@@ -172 +179 @@
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
-        if( td->pass || td->oauth )
+        if( td->pass || td->oauth_info )
                 twitter_main_loop_start( ic );
         else
@@ -197 +204 @@
         {
                 oauth_info_free( td->oauth_info );
-                
                 g_free( td->pass );
-                g_free( td->oauth );
                 g_free( td );
         }
@@ -216 +221 @@
             g_strcasecmp(who + 8, ic->acc->user) == 0)
         {
-                if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth_info )
+                if( set_getbool( &ic->acc->set, "oauth" ) &&
+                    td->oauth_info && td->oauth_info->token == NULL )
                 {
-                        oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
-                        td->oauth_info = NULL;
+                        if( !oauth_access_token( message, td->oauth_info ) )
+                        {
+                                imcb_error( ic, "OAuth error: %s", "Failed to send access token request" );
+                                imc_logout( ic, TRUE );
+                                return FALSE;
+                        }
                 }
                 else