Changeset 713d611

Timestamp:

2010-04-26T21:50:48Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c42e8b9

Parents:

acba168

Message:

Twitter module now generates authorize URLs.

Files:

• lib/oauth.c (modified) (3 diffs)
• lib/oauth.h (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (4 diffs)
• protocols/twitter/twitter.h (modified) (1 diff)

lib/oauth.c

@@ -298 +298 @@
                 st->auth_params = g_strdup( req->reply_body );
                 oauth_params_parse( &params, st->auth_params );
-                st->token = g_strdup( oauth_params_get( &params, "oauth_token" ) );
+                st->request_token = g_strdup( oauth_params_get( &params, "oauth_token" ) );
                 oauth_params_free( &params );
         }
         
-        //st->func( st );
+        st->func( st );
 }
 
@@ -311 +311 @@
         GSList *params = NULL;
         
-        oauth_params_add( &params, "oauth_token", st->token );
+        oauth_params_add( &params, "oauth_token", st->request_token );
         oauth_params_add( &params, "oauth_verifier", pin );
         
@@ -324 +324 @@
                 st->access_token = g_strdup( req->reply_body );
         
-        //st->func( st );
+        st->func( st );
 }
 

lib/oauth.h

@@ -35 +35 @@
         
         char *auth_params;
-        char *token;
+        char *request_token;
         
         char *access_token;

protocols/twitter/twitter.c

@@ -23 +23 @@
 
 #include "nogaim.h"
+#include "oauth.h"
 #include "twitter.h"
 #include "twitter_http.h"
@@ -49 +50 @@
         // If we are still logged in run this function again after timeout.
         return (ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN;
+}
+
+static void twitter_main_loop_start( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        imcb_log( ic, "Connecting to Twitter" );
+
+        // Run this once. After this queue the main loop function.
+        twitter_main_loop(ic, -1, 0);
+
+        // Queue the main_loop
+        // Save the return value, so we can remove the timeout on logout.
+        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+}
+
+static void twitter_oauth_callback( struct oauth_info *info );
+
+static void twitter_oauth_start( struct im_connection *ic )
+{
+        oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+}
+
+static void twitter_oauth_callback( struct oauth_info *info )
+{
+        struct im_connection *ic = info->data;
+        
+        if( info->request_token && info->access_token == NULL )
+        {
+                char name[strlen(ic->acc->user)+9], *msg;
+                
+                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 );
+                imcb_buddy_msg( ic, name, msg, 0, 0 );
+                g_free( msg );
+        }
 }
 
@@ -67 +106 @@
         s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "oauth", "true", set_eval_bool, acc );
 }
 
@@ -80 +121 @@
 
         twitter_connections = g_slist_append( twitter_connections, ic );
-
+        ic->proto_data = td;
+        
         td->user = acc->user;
-        if( strstr( acc->pass, "oauth_token=" ) == NULL )
+        if( !set_getbool( &acc->set, "oauth" ) )
                 td->pass = g_strdup( acc->pass );
-        else
+        else if( strstr( acc->pass, "oauth_token=" ) )
                 td->oauth = g_strdup( acc->pass );
         td->home_timeline_id = 0;
-
-        ic->proto_data = td;
-
-        imcb_log( ic, "Connecting to Twitter" );
-
-        // Run this once. After this queue the main loop function.
-        twitter_main_loop(ic, -1, 0);
-
-        // Queue the main_loop
-        // Save the return value, so we can remove the timeout on logout.
-        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
         
         sprintf( name, "twitter_%s", acc->user );
         imcb_add_buddy( ic, name, NULL );
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
+        
+        if( td->pass || td->oauth )
+                twitter_main_loop_start( ic );
+        else
+                twitter_oauth_start( ic );
 }
 

protocols/twitter/twitter.h

@@ -51 +51 @@
 GSList *twitter_connections;
 
+#define TWITTER_OAUTH_REQUEST_TOKEN "http://api.twitter.com/oauth/request_token"
+#define TWITTER_OAUTH_ACCESS_TOKEN  "http://api.twitter.com/oauth/access_token"
+#define TWITTER_OAUTH_AUTHORIZE     "http://api.twitter.com/oauth/authorize"
+
 #endif //_TWITTER_H