Changeset 64b6635 for protocols/jabber/jabber.c

Timestamp:

2011-12-18T21:56:44Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9b0ad7e

Parents:

18c6d36

Message:

Restructured and updated code a little bit to support new-style (much better
and "proper" OAuth2) Facebook OAuth support. (And, add wl.offline scope to get
tokens that don't expire after an hour.)

File:

• protocols/jabber/jabber.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -152 +152 @@
                         jd->oauth2_service = &oauth2_service_google;
                 
-                /* For the first login with OAuth, we have to authenticate via the browser.
-                   For subsequent logins, exchange the refresh token for a valid access
-                   token (even though the last one maybe didn't expire yet). */
-                if( strncmp( acc->pass, "refresh_token=", 14 ) != 0 )
+                /* First see if we have a refresh token, in which case any
+                   access token we *might* have has probably expired already
+                   anyway. */
+                if( strstr( acc->pass, "refresh_token=" ) )
+                {
+                        sasl_oauth2_refresh( ic, acc->pass + 14 );
+                }
+                /* If we don't have a refresh token, let's hope the access
+                   token is still usable. */
+                else if( strstr( acc->pass, "access_token=" ) )
+                {
+                        sasl_oauth2_load_access_token( ic );
+                        jabber_connect( ic );
+                }
+                /* If we don't have any, start the OAuth process now. Don't
+                   even open an XMPP connection yet. */
+                else
                 {
                         sasl_oauth2_init( ic );
                         ic->flags |= OPT_SLOW_LOGIN;
                 }
-                else
-                        sasl_oauth2_refresh( ic, acc->pass + 14 );
         }
         else