Changeset 18c6d36 for lib

Timestamp:

2011-12-18T19:25:44Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

64b6635

Parents:

6e9ae72

Message:

More generic OAuth support now. Should work well for all GTalk accounts now
and somewhat for MS Messenger. The fb part needs different parsing of the
authorize request, and possibly some other work.

Location:

lib

Files:

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

lib/oauth2.c

@@ -28 +28 @@
 #include "url.h"
 
-struct oauth2_service oauth2_service_google =
-{
-        "https://accounts.google.com/o/oauth2/auth",
-        "https://accounts.google.com/o/oauth2/token",
-        "urn:ietf:wg:oauth:2.0:oob",
-        "783993391592.apps.googleusercontent.com",
-        "6C-Zgf7Tr7gEQTPlBhMUgo7R",
-};
-struct oauth2_service oauth2_service_facebook =
-{
-        "https://www.facebook.com/dialog/oauth",
-        "https://graph.facebook.com/oauth/access_token",
-        "http://www.bitlbee.org/main.php/fb.html",
-        "126828914005625",
-        "4b100f0f244d620bf3f15f8b217d4c32",
-};
-
-char *oauth2_url( const struct oauth2_service *sp, const char *scope )
+char *oauth2_url( const struct oauth2_service *sp )
 {
         return g_strconcat( sp->auth_url,
-                            "?scope=", scope,
+                            "?scope=", sp->scope,
                             "&response_type=code"
                             "&redirect_uri=", sp->redirect_url, 
@@ -121 +104 @@
         char *atoken = NULL, *rtoken = NULL;
         
+        if( getenv( "BITLBEE_DEBUG" ) && req->reply_body )
+                printf( "%s\n", req->reply_body );
+        
         if( req->status_code == 200 )
         {
                 atoken = oauth2_json_dumb_get( req->reply_body, "access_token" );
                 rtoken = oauth2_json_dumb_get( req->reply_body, "refresh_token" );
+                if( getenv( "BITLBEE_DEBUG" ) )
+                        printf( "Extracted atoken=%s rtoken=%s\n", atoken, rtoken );
         }
         cb_data->func( cb_data->data, atoken, rtoken );

lib/oauth2.h

@@ -32 +32 @@
         char *token_url;
         char *redirect_url;
+        char *scope;
         char *consumer_key;
         char *consumer_secret;
 };
-
-/* Currently suitable for authenticating to Google Talk only, and only for
-   accounts that have 2-factor authorization enabled. */
-extern struct oauth2_service oauth2_service_google;
-
-extern struct oauth2_service oauth2_service_facebook;
 
 #define OAUTH2_AUTH_CODE "authorization_code"
@@ -47 +42 @@
 /* Generate a URL the user should open in his/her browser to get an
    authorization code. */
-char *oauth2_url( const struct oauth2_service *sp, const char *scope );
+char *oauth2_url( const struct oauth2_service *sp );
 
 /* Exchanges an auth code or refresh token for an access token.