Changeset 2c6b0f4 for protocols/msn

Timestamp:

2010-09-05T14:09:43Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

52f5e90

Parents:

975708a

Message:

Fix auth for @msn.com accounts.

Location:

protocols/msn

Files:

• soap.c (modified) (4 diffs)
• soap.h (modified) (1 diff)

protocols/msn/soap.c

@@ -262 +262 @@
         char *secret;
         char *error;
+        char *redirect;
 };
 
 static int msn_soap_passport_sso_build_request( struct msn_soap_req_data *soap_req )
 {
+        struct msn_soap_passport_sso_data *sd = soap_req->data;
         struct im_connection *ic = soap_req->ic;
         struct msn_data *md = ic->proto_data;
         
-        if( g_str_has_suffix( ic->acc->user, "@msn.com" ) )
+        if( sd->redirect )
+        {
+                soap_req->url = sd->redirect;
+                sd->redirect = NULL;
+        }
+        else if( g_str_has_suffix( ic->acc->user, "@msn.com" ) )
                 soap_req->url = g_strdup( SOAP_PASSPORT_SSO_URL_MSN );
         else
@@ -312 +319 @@
         struct xt_node *code = xt_find_node( node->children, "faultcode" );
         struct xt_node *string = xt_find_node( node->children, "faultstring" );
+        struct xt_node *url;
         
         if( code == NULL || code->text_len == 0 )
                 sd->error = g_strdup( "Unknown error" );
+        else if( strcmp( code->text, "psf:Redirect" ) == 0 &&
+                 ( url = xt_find_node( node->children, "psf:redirectUrl" ) ) &&
+                 url->text_len > 0 )
+                sd->redirect = g_strdup( url->text );
         else
                 sd->error = g_strdup_printf( "%s (%s)", code->text, string && string->text_len ?
@@ -378 +390 @@
         };
         
+        if( sd->redirect )
+                return MSN_SOAP_RETRY;
+        
         if( md->soapq )
                 return msn_soapq_flush( ic, TRUE );
@@ -422 +437 @@
         g_free( sd->secret );
         g_free( sd->error );
+        g_free( sd->redirect );
         
         return MSN_SOAP_OK;

protocols/msn/soap.h

@@ -62 +62 @@
 
 #define SOAP_PASSPORT_SSO_URL "https://login.live.com/RST.srf"
-#define SOAP_PASSPORT_SSO_URL_MSN "https://msnia.login.live.com/pp550/RST.srf"
+#define SOAP_PASSPORT_SSO_URL_MSN "https://msnia.login.live.com/pp800/RST.srf"
 
 #define SOAP_PASSPORT_SSO_PAYLOAD \