From 1644a0c3de3f33723094f3d910f0d09538f8232c Mon Sep 17 00:00:00 2001 From: Riccardo (C10uD) Date: Thu, 18 Mar 2010 18:28:38 +0100 Subject: [PATCH] papyon: content roaming now works --- /service/ContentRoaming/storage.py | 8 ++++---- /service/__init__.py | 2 +- .../SingleSignOn/RequestMultipleSecurityTokens.py | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/service/ContentRoaming/storage.py b/service/ContentRoaming/storage.py index 7a9a055..48f6cad 100644 --- a/service/ContentRoaming/storage.py +++ b/service/ContentRoaming/storage.py @@ -120,14 +120,14 @@ class Storage(SOAPService): document_name = response.findtext('./st:Name') callback[0](document_rid, document_name, *callback[1:]) - @RequireSecurityTokens(LiveService.CONTACTS) + @RequireSecurityTokens(LiveService.STORAGE) def __soap_request(self, method, scenario, args, callback, errback): - token = str(self._tokens[LiveService.CONTACTS]) + token = str(self._tokens[LiveService.STORAGE]) self._soap_request(method, (scenario, token), args, callback, errback) - @RequireSecurityTokens(LiveService.CONTACTS) + @RequireSecurityTokens(LiveService.STORAGE) def get_display_picture(self, pre_auth_url, callback, errback): - token = str(self._tokens[LiveService.CONTACTS]) + token = str(self._tokens[LiveService.STORAGE]) scheme = 'http' host = 'byfiles.storage.msn.com' diff --git a/service/__init__.py b/service/__init__.py index b6a983c..22f57d5 100644 --- a/service/__init__.py +++ b/service/__init__.py @@ -24,4 +24,4 @@ Contains a set of clients to connect and interact with Windows Live services. # import AddressBook # import OfflineIM -# import ContentRoaming +import ContentRoaming diff --git a/service/description/SingleSignOn/RequestMultipleSecurityTokens.py b/service/description/SingleSignOn/RequestMultipleSecurityTokens.py index fc6bec6..73c1127 100644 --- a/service/description/SingleSignOn/RequestMultipleSecurityTokens.py +++ b/service/description/SingleSignOn/RequestMultipleSecurityTokens.py @@ -26,6 +26,7 @@ class LiveService(object): MESSENGER_CLEAR = ("messengerclear.live.com", "MBI_KEY_OLD") MESSENGER_SECURE = ("messengersecure.live.com", "MBI_SSL") SPACES = ("spaces.live.com", "MBI") + STORAGE = ("storage.msn.com", "MBI") TB = ("http://Passport.NET/tb", None) VOICE = ("voice.messenger.msn.com", "?id=69264") -- 1.6.3.3