Changeset 39a939c

Timestamp:

2011-07-31T14:55:00Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e1c926f

Parents:

aa9f1ac

Message:

oauth2 changes to address ​http://twitter.com/Wilmer/status/96715400124968960

Location:

lib

Files:

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

lib/oauth2.c

@@ -30 +30 @@
 struct oauth2_service oauth2_service_google =
 {
-        "https://accounts.google.com/o/oauth2/",
+        "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",
         "k5_EV4EQ7jEVCEk3WBwEFfuW",
+};
+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 )
 {
-        return g_strconcat( sp->base_url, "auth"
+        return g_strconcat( sp->auth_url,
                             "?scope=", scope,
                             "&response_type=code"
-                            "&redirect_uri=urn:ietf:wg:oauth:2.0:oob",
+                            "&redirect_uri=", sp->redirect_url, 
                             "&client_id=", sp->consumer_key,
                             NULL );
@@ -64 +74 @@
         struct oauth2_access_token_data *cb_data;
         
-        if( !url_set( &url_p, sp->base_url ) )
+        if( !url_set( &url_p, sp->token_url ) )
                 return 0;
         
@@ -72 +82 @@
         if( strcmp( auth_type, OAUTH2_AUTH_CODE ) == 0 )
         {
-                oauth_params_add( &args, "redirect_uri", "urn:ietf:wg:oauth:2.0:oob" );
+                oauth_params_add( &args, "redirect_uri", sp->redirect_url );
                 oauth_params_add( &args, "code", auth );
         }
@@ -82 +92 @@
         oauth_params_free( &args );
         
-        s = g_strdup_printf( "POST %s%s HTTP/1.0\r\n"
+        s = g_strdup_printf( "POST %s HTTP/1.0\r\n"
                              "Host: %s\r\n"
                              "Content-Type: application/x-www-form-urlencoded\r\n"
@@ -88 +98 @@
                              "Connection: close\r\n"
                              "\r\n"
-                             "%s", url_p.file, "token", url_p.host, strlen( args_s ), args_s );
+                             "%s", url_p.file, url_p.host, strlen( args_s ), args_s );
         g_free( args_s );
         

lib/oauth2.h

@@ -29 +29 @@
 struct oauth2_service
 {
-        char *base_url;
+        char *auth_url;
+        char *token_url;
+        char *redirect_url;
         char *consumer_key;
         char *consumer_secret;
@@ -37 +39 @@
    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"