Changeset 644b808

Timestamp:

2011-12-26T10:50:34Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5f40da7

Parents:

9a1c14d

Message:

A few more minor cleanups before merging this into mainline.

Files:

• lib/oauth2.c (modified) (2 diffs)
• protocols/jabber/sasl.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

lib/oauth2.c

@@ -117 +117 @@
                 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 );
         }
         else
@@ -130 +128 @@
                 oauth_params_free( &p_in );
         }
+        if( getenv( "BITLBEE_DEBUG" ) )
+                printf( "Extracted atoken=%s rtoken=%s\n", atoken, rtoken );
+        
         cb_data->func( cb_data->data, atoken, rtoken );
         g_free( atoken );

protocols/jabber/sasl.c

@@ -105 +105 @@
         }
         
-        if( !sup_plain && !sup_digest && !sup_gtalk && !sup_fb && !sup_ms )
-        {
-                imcb_error( ic, "BitlBee does not support any of the offered SASL "
-                                "authentication schemes:%s", mechs->str );
+        if( !sup_plain && !sup_digest )
+        {
+                if( !sup_gtalk && !sup_fb && !sup_ms )
+                        imcb_error( ic, "This server requires OAuth "
+                                        "(supported schemes:%s)", mechs->str );
+                else
+                        imcb_error( ic, "BitlBee does not support any of the offered SASL "
+                                        "authentication schemes:%s", mechs->str );
                 imc_logout( ic, FALSE );
                 g_string_free( mechs, TRUE );
@@ -294 +298 @@
         if( jd->flags & JFLAG_SASL_FB )
         {
-                /* Facebook proprietary authentication. Not as useful as it seemed, but
-                   the code's written now, may as well keep it..
-                   
-                   Mechanism is described on http://developers.facebook.com/docs/chat/
-                   and in their Python module. It's all mostly useless because the tokens
-                   expire after 24h. */
+                /* New-style Facebook OAauth2 support. Instead of sending a refresh
+                   token, they just send an access token that should never expire. */
                 GSList *p_in = NULL, *p_out = NULL;
                 char time[33];

root_commands.c

@@ -459 +459 @@
                                              "enter the password" );
                                 if( oauth )
-                                        irc_rootmsg( irc, "Alternatively, enable oauth if "
+                                        irc_rootmsg( irc, "Alternatively, enable OAuth if "
                                                      "the account supports it: account %s "
                                                      "set oauth on", a->tag );