SkypeWeb:

- fixes #2002 (Skype caches wrong server data);
- unused structure removed;
- version bump

14 files changed, 106 insertions, 106 deletions

diff --git a/protocols/SkypeWeb/src/requests/asm/files.h b/protocols/SkypeWeb/src/requests/asm/files.h
index 9f2fff89c9..89d42274d3 100644
--- a/protocols/SkypeWeb/src/requests/asm/files.h
+++ b/protocols/SkypeWeb/src/requests/asm/files.h
@@ -3,12 +3,12 @@
 class ASMObjectCreateRequest : public HttpRequest

 {

 public:

-	ASMObjectCreateRequest(LoginInfo &li, const char *szContact, const char *szFileName) :

+	ASMObjectCreateRequest(CSkypeProto *ppro, const char *szContact, const char *szFileName) :

 		HttpRequest(REQUEST_POST, "api.asm.skype.com/v1/objects")

 	{

 		flags &= (~NLHRF_DUMPASTEXT);

 		Headers

-			<< FORMAT_VALUE("Authorization", "skype_token %s", li.api.szToken)

+			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken)

 			<< CHAR_VALUE("Content-Type", "text/json");

 

 		JSONNode node, jPermissions, jPermission(JSON_ARRAY);

@@ -26,11 +26,11 @@ public:
 class ASMObjectUploadRequest : public HttpRequest

 {

 public:

-	ASMObjectUploadRequest(LoginInfo &li, const char *szObject, const PBYTE data, const size_t size) :

+	ASMObjectUploadRequest(CSkypeProto *ppro, const char *szObject, const PBYTE data, const size_t size) :

 		HttpRequest(REQUEST_PUT, FORMAT, "api.asm.skype.com/v1/objects/%s/content/original", szObject)

 	{

 		Headers

-			<< FORMAT_VALUE("Authorization", "skype_token %s", li.api.szToken)

+			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken)

 			<< CHAR_VALUE("Content-Type", "application/octet-stream");

 

 		pData = (char*)mir_alloc(size);

diff --git a/protocols/SkypeWeb/src/requests/avatars.h b/protocols/SkypeWeb/src/requests/avatars.h
index 8257874caa..01332d3bad 100644
--- a/protocols/SkypeWeb/src/requests/avatars.h
+++ b/protocols/SkypeWeb/src/requests/avatars.h
@@ -30,11 +30,11 @@ public:
 class SetAvatarRequest : public HttpRequest

 {

 public:

-	SetAvatarRequest(const PBYTE data, size_t dataSize, const char *szMime, LoginInfo &li) :

-		HttpRequest(REQUEST_PUT, FORMAT, "api.skype.com/users/%s/profile/avatar", li.szSkypename.MakeLower().c_str())

+	SetAvatarRequest(const PBYTE data, size_t dataSize, const char *szMime, CSkypeProto *ppro) :

+		HttpRequest(REQUEST_PUT, FORMAT, "api.skype.com/users/%s/profile/avatar", ppro->m_szSkypename.MakeLower().c_str())

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Content-Type", szMime);

 

 		pData = (char*)mir_alloc(dataSize);

diff --git a/protocols/SkypeWeb/src/requests/capabilities.h b/protocols/SkypeWeb/src/requests/capabilities.h
index 174b486ed7..70ca5f7311 100644
--- a/protocols/SkypeWeb/src/requests/capabilities.h
+++ b/protocols/SkypeWeb/src/requests/capabilities.h
@@ -21,13 +21,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class SendCapabilitiesRequest : public HttpRequest

 {

 public:

-	SendCapabilitiesRequest(const char *hostname, LoginInfo &li) :

-	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/endpoints/%s/presenceDocs/messagingService", li.endpoint.szServer, mir_urlEncode(li.endpoint.szId).c_str())

+	SendCapabilitiesRequest(const char *hostname, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/endpoints/%s/presenceDocs/messagingService", ppro->m_szServer, mir_urlEncode(ppro->m_szId).c_str())

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 

 		JSONNode privateInfo; privateInfo.set_name("privateInfo");

 		privateInfo << JSONNode("epname", hostname);

diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h
index dc00b3d0ae..1b6b352411 100644
--- a/protocols/SkypeWeb/src/requests/chatrooms.h
+++ b/protocols/SkypeWeb/src/requests/chatrooms.h
@@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class LoadChatsRequest : public HttpRequest

 {

 public:

-	LoadChatsRequest(LoginInfo &li) :

-	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations", li.endpoint.szServer)

+	LoadChatsRequest(CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations", ppro->m_szServer)

 	{

 		Url

 			<< INT_VALUE("startTime", 0)

@@ -32,7 +32,7 @@ public:
 

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");

 	}

 };

@@ -40,12 +40,12 @@ public:
 class SendChatMessageRequest : public HttpRequest

 {

 public:

-	SendChatMessageRequest(const char *to, time_t timestamp, const char *message, LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", li.endpoint.szServer, to)

+	SendChatMessageRequest(const char *to, time_t timestamp, const char *message, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", ppro->m_szServer, to)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 		JSONNode node;

 		node 

@@ -61,12 +61,12 @@ public:
 class SendChatActionRequest : public HttpRequest

 {

 public:

-	SendChatActionRequest(const char *to, time_t timestamp, const char *message, LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", li.endpoint.szServer, to)

+	SendChatActionRequest(const char *to, time_t timestamp, const char *message, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/19:%s/messages", ppro->m_szServer, to)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		JSONNode node(JSON_NODE);

@@ -84,15 +84,15 @@ public:
 class CreateChatroomRequest : public HttpRequest

 {

 public:

-	CreateChatroomRequest(const LIST<char> &skypenames, LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/threads", li.endpoint.szServer)

+	CreateChatroomRequest(const LIST<char> &skypenames, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/threads", ppro->m_szServer)

 	{

 		//{"members":[{"id":"8:user3","role":"User"},{"id":"8:user2","role":"User"},{"id":"8:user1","role":"Admin"}]}

 

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 

 		JSONNode node;

 		JSONNode members(JSON_ARRAY); members.set_name("members");

@@ -102,7 +102,7 @@ public:
 			JSONNode member;

 			member 

 				<< JSONNode("id", CMStringA(::FORMAT, "8:%s", it).GetBuffer())

-				<< JSONNode("role", !mir_strcmpi(it, li.szSkypename) ? "Admin" : "User");

+				<< JSONNode("role", !mir_strcmpi(it, ppro->m_szSkypename) ? "Admin" : "User");

 			members << member;

 		}

 		node << members;

@@ -114,28 +114,28 @@ public:
 class GetChatInfoRequest : public HttpRequest

 {

 public:

-	GetChatInfoRequest(const char *chatId, LoginInfo &li) :

-	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/threads/%s%s", li.endpoint.szServer, strstr(chatId, "19:") == chatId ? "" : "19:", chatId)

+	GetChatInfoRequest(const char *chatId, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/threads/%s%s", ppro->m_szServer, strstr(chatId, "19:") == chatId ? "" : "19:", chatId)

 	{

 		Url << CHAR_VALUE("view", "msnp24Equivalent");

 

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 	}

 };

 

 class InviteUserToChatRequest : public HttpRequest

 {

 public:

-	InviteUserToChatRequest(const char *chatId, const char *skypename, const char* role, LoginInfo &li) :

-	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/threads/19:%s/members/8:%s", li.endpoint.szServer, chatId, skypename)

+	InviteUserToChatRequest(const char *chatId, const char *skypename, const char* role, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/threads/19:%s/members/8:%s", ppro->m_szServer, chatId, skypename)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 

 		JSONNode node;

 

@@ -148,26 +148,26 @@ public:
 class KickUserRequest : public HttpRequest

 {

 public:

-	KickUserRequest(const char *chatId, const char *skypename, LoginInfo &li) :

-	  HttpRequest(REQUEST_DELETE, FORMAT, "%s/v1/threads/19:%s/members/8:%s", li.endpoint.szServer, chatId, skypename)

+	KickUserRequest(const char *chatId, const char *skypename, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_DELETE, FORMAT, "%s/v1/threads/19:%s/members/8:%s", ppro->m_szServer, chatId, skypename)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 	}

 };

 

 class SetChatPropertiesRequest : public HttpRequest

 {

 public:

-	SetChatPropertiesRequest(const char *chatId, const char *propname, const char *value, LoginInfo &li) :

-		HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/threads/19:%s/properties?name=%s", li.endpoint.szServer, chatId, propname)

+	SetChatPropertiesRequest(const char *chatId, const char *propname, const char *value, CSkypeProto *ppro) :

+		HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/threads/19:%s/properties?name=%s", ppro->m_szServer, chatId, propname)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 

 		JSONNode node;

 		node << JSONNode(propname, value);

diff --git a/protocols/SkypeWeb/src/requests/contacts.h b/protocols/SkypeWeb/src/requests/contacts.h
index cbe66faca9..bfdf10a749 100644
--- a/protocols/SkypeWeb/src/requests/contacts.h
+++ b/protocols/SkypeWeb/src/requests/contacts.h
@@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class GetContactListRequest : public HttpRequest

 {

 public:

-	GetContactListRequest(LoginInfo &li, const char *filter) :

-	  HttpRequest(REQUEST_GET, FORMAT, "contacts.skype.com/contacts/v1/users/%s/contacts", li.szSkypename.MakeLower().GetBuffer())

+	GetContactListRequest(CSkypeProto *ppro, const char *filter) :

+	  HttpRequest(REQUEST_GET, FORMAT, "contacts.skype.com/contacts/v1/users/%s/contacts", ppro->m_szSkypename.MakeLower().GetBuffer())

 	{

 		if (filter != NULL)

 		{

@@ -31,18 +31,18 @@ public:
 		}

 

 		Headers 

-			<< CHAR_VALUE("X-SkypeToken", li.api.szToken);

+			<< CHAR_VALUE("X-SkypeToken", ppro->m_szApiToken);

 	}

 };

 

 class GetContactsInfoRequest : public HttpRequest

 {

 public:

-	GetContactsInfoRequest(LoginInfo &li, const LIST<char> &skypenames, const char *skypename = "self") :

+	GetContactsInfoRequest(CSkypeProto *ppro, const LIST<char> &skypenames, const char *skypename = "self") :

 		HttpRequest(REQUEST_POST, FORMAT, "api.skype.com/users/%s/contacts/profiles", skypename)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json");

 

 		for (auto &it : skypenames)

@@ -53,11 +53,11 @@ public:
 class GetContactsAuthRequest : public HttpRequest

 {

 public:

-	GetContactsAuthRequest(LoginInfo &li) :

+	GetContactsAuthRequest(CSkypeProto *ppro) :

 		HttpRequest(REQUEST_GET, FORMAT, "contacts.skype.com/contacts/v2/users/SELF/invites")

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json");

 	}

 };

@@ -65,11 +65,11 @@ public:
 class AddContactRequest : public HttpRequest

 {

 public:

-	AddContactRequest(LoginInfo &li, const char *who, const char *greeting = "") :

+	AddContactRequest(CSkypeProto *ppro, const char *who, const char *greeting = "") :

 		HttpRequest(REQUEST_PUT, "contacts.skype.com/contacts/v2/users/SELF/contacts")

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json")

 			<< CHAR_VALUE("Content-type", "application/x-www-form-urlencoded");

 

@@ -85,11 +85,11 @@ public:
 class DeleteContactRequest : public HttpRequest

 {

 public:

-	DeleteContactRequest(LoginInfo &li, const char *who) :

+	DeleteContactRequest(CSkypeProto *ppro, const char *who) :

 		HttpRequest(REQUEST_DELETE, FORMAT, "contacts.skype.com/contacts/v2/users/SELF/contacts/8:%s", who)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json")

 			<< CHAR_VALUE("Content-type", "application/x-www-form-urlencoded");

 	}

@@ -98,11 +98,11 @@ public:
 class AuthAcceptRequest : public HttpRequest

 {

 public:

-	AuthAcceptRequest(LoginInfo &li, const char *who) :

+	AuthAcceptRequest(CSkypeProto *ppro, const char *who) :

 		HttpRequest(REQUEST_PUT, FORMAT, "contacts.skype.com/contacts/v2/users/SELF/invites/8:%s/accept", who)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json");

 	}

 };

@@ -110,11 +110,11 @@ public:
 class AuthDeclineRequest : public HttpRequest

 {

 public:

-	AuthDeclineRequest(LoginInfo &li, const char *who) :

+	AuthDeclineRequest(CSkypeProto *ppro, const char *who) :

 		HttpRequest(REQUEST_PUT, FORMAT, "contacts.skype.com/contacts/v2/users/SELF/invites/8:%s/decline", who)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json");

 	}

 };

@@ -122,11 +122,11 @@ public:
 class BlockContactRequest : public HttpRequest

 {

 public:

-	BlockContactRequest(LoginInfo &li, const char *who) :

+	BlockContactRequest(CSkypeProto *ppro, const char *who) :

 		HttpRequest(REQUEST_PUT, FORMAT, "contacts.skype.com/contacts/v2/users/SELF/contacts/blocklist/8:%s", who)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json")

 			<< CHAR_VALUE("Content-type", "application/x-www-form-urlencoded");

 

@@ -137,11 +137,11 @@ public:
 class UnblockContactRequest : public HttpRequest

 {

 public:

-	UnblockContactRequest(LoginInfo &li, const char *who) :

+	UnblockContactRequest(CSkypeProto *ppro, const char *who) :

 		HttpRequest(REQUEST_DELETE, FORMAT, "contacts.skype.com/contacts/v2/users/SELF/contacts/blocklist/8:%s", who)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json")

 			<< CHAR_VALUE("Content-type", "application/x-www-form-urlencoded");

 

diff --git a/protocols/SkypeWeb/src/requests/endpoint.h b/protocols/SkypeWeb/src/requests/endpoint.h
index 70cc922fcd..fe9c3c6a3e 100644
--- a/protocols/SkypeWeb/src/requests/endpoint.h
+++ b/protocols/SkypeWeb/src/requests/endpoint.h
@@ -21,13 +21,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class CreateEndpointRequest : public HttpRequest

 {

 public:

-	CreateEndpointRequest(LoginInfo &li) :

-		HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/endpoints", li.endpoint.szServer)

+	CreateEndpointRequest(CSkypeProto *ppro) :

+		HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/endpoints", ppro->m_szServer)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("Authentication", "skypetoken=%s", li.api.szToken);

+			<< FORMAT_VALUE("Authentication", "skypetoken=%s", ppro->m_szApiToken);

 

 		Body << VALUE("{}");

 	}

@@ -36,12 +36,12 @@ public:
 class DeleteEndpointRequest : public HttpRequest

 {

 public:

-	DeleteEndpointRequest(LoginInfo &li) :

-	  HttpRequest(REQUEST_DELETE, FORMAT, "%s/v1/users/ME/endpoints/%s", li.endpoint.szServer, mir_urlEncode(li.endpoint.szId).c_str())

+	DeleteEndpointRequest(CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_DELETE, FORMAT, "%s/v1/users/ME/endpoints/%s", ppro->m_szServer, mir_urlEncode(ppro->m_szId).c_str())

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 	}

 };

 

diff --git a/protocols/SkypeWeb/src/requests/history.h b/protocols/SkypeWeb/src/requests/history.h
index 2f82821b31..30294dff30 100644
--- a/protocols/SkypeWeb/src/requests/history.h
+++ b/protocols/SkypeWeb/src/requests/history.h
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class SyncHistoryFirstRequest : public HttpRequest

 {

 public:

-	SyncHistoryFirstRequest(int pageSize, LoginInfo &li) :

-	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations", li.endpoint.szServer)

+	SyncHistoryFirstRequest(int pageSize, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations", ppro->m_szServer)

 	{

 		Url

 			<< INT_VALUE("startTime", 0)

@@ -31,17 +31,17 @@ public:
 

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");

 	}

 

-	SyncHistoryFirstRequest(const char *url, LoginInfo &li) :

+	SyncHistoryFirstRequest(const char *url, CSkypeProto *ppro) :

 		HttpRequest(REQUEST_GET, url)

 	{

 

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");

 	}

 };

@@ -49,8 +49,8 @@ public:
 class GetHistoryRequest : public HttpRequest

 {

 public:

-	GetHistoryRequest(const char *username, int pageSize, bool isChat, LONGLONG timestamp, LoginInfo &li) :

-	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations/%d:%s/messages", li.endpoint.szServer, isChat ? 19 : 8, mir_urlEncode(username).c_str())

+	GetHistoryRequest(const char *username, int pageSize, bool isChat, LONGLONG timestamp, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_GET, FORMAT, "%s/v1/users/ME/conversations/%d:%s/messages", ppro->m_szServer, isChat ? 19 : 8, mir_urlEncode(username).c_str())

 	{

 		Url

 			<< LONG_VALUE("startTime", timestamp)

@@ -60,7 +60,7 @@ public:
 

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");

 	}

 };

@@ -68,12 +68,12 @@ public:
 class GetHistoryOnUrlRequest : public HttpRequest

 {

 public:

-	GetHistoryOnUrlRequest(const char *url, LoginInfo &li) :

+	GetHistoryOnUrlRequest(const char *url, CSkypeProto *ppro) :

 		HttpRequest(REQUEST_GET, url)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");

 	}

 };

diff --git a/protocols/SkypeWeb/src/requests/messages.h b/protocols/SkypeWeb/src/requests/messages.h
index d2cf5d69dc..949704cbea 100644
--- a/protocols/SkypeWeb/src/requests/messages.h
+++ b/protocols/SkypeWeb/src/requests/messages.h
@@ -21,12 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class SendMessageRequest : public HttpRequest

 {

 public:

-	SendMessageRequest(const char *username, time_t timestamp, const char *message, LoginInfo &li, const char *MessageType = nullptr) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", li.endpoint.szServer, username)

+	SendMessageRequest(const char *username, time_t timestamp, const char *message, CSkypeProto *ppro, const char *MessageType = nullptr) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", ppro->m_szServer, username)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		JSONNode node;

@@ -43,16 +43,16 @@ public:
 class SendActionRequest : public HttpRequest

 {

 public:

-	SendActionRequest(const char *username, time_t timestamp, const char *message, LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", li.endpoint.szServer, username)

+	SendActionRequest(const char *username, time_t timestamp, const char *message, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", ppro->m_szServer, username)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		CMStringA content;

-		content.AppendFormat("%s %s", li.szSkypename.c_str(), message);

+		content.AppendFormat("%s %s", ppro->m_szSkypename.c_str(), message);

 

 		JSONNode node;

 		node 

@@ -60,7 +60,7 @@ public:
 			<< JSONNode("messagetype", "RichText")

 			<< JSONNode("contenttype", "text")

 			<< JSONNode("content", content)

-			<< JSONNode("skypeemoteoffset", li.szSkypename.GetLength() + 1);

+			<< JSONNode("skypeemoteoffset", ppro->m_szSkypename.GetLength() + 1);

 

 		Body << VALUE(node.write().c_str());

 	}

@@ -69,12 +69,12 @@ public:
 class SendTypingRequest : public HttpRequest

 {

 public:

-	SendTypingRequest(const char *username, int iState, LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", li.endpoint.szServer, mir_urlEncode(username).c_str())

+	SendTypingRequest(const char *username, int iState, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", ppro->m_szServer, mir_urlEncode(username).c_str())

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		const char *state = (iState == PROTOTYPE_SELFTYPING_ON) ? "Control/Typing" : "Control/ClearTyping";

@@ -93,12 +93,12 @@ public:
 class MarkMessageReadRequest : public HttpRequest

 {

 public:

-	MarkMessageReadRequest(const char *username, LONGLONG /*msgId*/, LONGLONG msgTimestamp, bool isChat, LoginInfo &li) :

-	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/conversations/%d:%s/properties?name=consumptionhorizon", li.endpoint.szServer, !isChat ? 8 : 19, username)

+	MarkMessageReadRequest(const char *username, LONGLONG /*msgId*/, LONGLONG msgTimestamp, bool isChat, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/conversations/%d:%s/properties?name=consumptionhorizon", ppro->m_szServer, !isChat ? 8 : 19, username)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		//"lastReadMessageTimestamp;modificationTime;lastReadMessageId"

diff --git a/protocols/SkypeWeb/src/requests/poll.h b/protocols/SkypeWeb/src/requests/poll.h
index 5caf2321ed..2c306ff958 100644
--- a/protocols/SkypeWeb/src/requests/poll.h
+++ b/protocols/SkypeWeb/src/requests/poll.h
@@ -21,14 +21,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class PollRequest : public HttpRequest

 {

 public:

-	PollRequest(LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/endpoints/SELF/subscriptions/0/poll", li.endpoint.szServer)

+	PollRequest(CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/endpoints/SELF/subscriptions/0/poll", ppro->m_szServer)

 	{

 		timeout = 60000;

 		flags |= NLHRF_PERSISTENT;

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 	}

 };

 #endif //_SKYPE_POLL_H_
\ No newline at end of file
diff --git a/protocols/SkypeWeb/src/requests/profile.h b/protocols/SkypeWeb/src/requests/profile.h
index 626896c30d..b6006b669f 100644
--- a/protocols/SkypeWeb/src/requests/profile.h
+++ b/protocols/SkypeWeb/src/requests/profile.h
@@ -21,11 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class GetProfileRequest : public HttpRequest

 {

 public:

-	GetProfileRequest(LoginInfo &li, const char *skypename = "self") :

+	GetProfileRequest(CSkypeProto *ppro, const char *skypename = "self") :

 		HttpRequest(REQUEST_GET, FORMAT, "api.skype.com/users/%s/profile", skypename)

 	{

 		Headers

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Accept", "application/json");

 	}

 };

diff --git a/protocols/SkypeWeb/src/requests/search.h b/protocols/SkypeWeb/src/requests/search.h
index 244ba54838..da2fd1d501 100644
--- a/protocols/SkypeWeb/src/requests/search.h
+++ b/protocols/SkypeWeb/src/requests/search.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class GetSearchRequest : public HttpRequest

 {

 public:

-	GetSearchRequest(const char *string, LoginInfo &li) :

+	GetSearchRequest(const char *string, CSkypeProto *ppro) :

 		HttpRequest(REQUEST_GET, "skypegraph.skype.com/search/v1.1/namesearch/swx/")

 	{

 

@@ -34,7 +34,7 @@ public:
 			<< CHAR_VALUE("searchstring", string);

 		Headers

 			<< CHAR_VALUE("Accept", "application/json")

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken);

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken);

 	}

 };

 

diff --git a/protocols/SkypeWeb/src/requests/status.h b/protocols/SkypeWeb/src/requests/status.h
index db29fcf503..c66cbd8ec2 100644
--- a/protocols/SkypeWeb/src/requests/status.h
+++ b/protocols/SkypeWeb/src/requests/status.h
@@ -21,12 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class SetStatusRequest : public HttpRequest

 {

 public:

-	SetStatusRequest(const char *status, LoginInfo &li) :

-	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/presenceDocs/messagingService", li.endpoint.szServer)

+	SetStatusRequest(const char *status, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_PUT, FORMAT, "%s/v1/users/ME/presenceDocs/messagingService", ppro->m_szServer)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		JSONNode node(JSON_NODE);

@@ -39,12 +39,12 @@ public:
 class SetStatusMsgRequest : public HttpRequest

 {

 public:

-	SetStatusMsgRequest(const char *status, LoginInfo &li) :

+	SetStatusMsgRequest(const char *status, CSkypeProto *ppro) :

 		HttpRequest(REQUEST_POST, "api.skype.com/users/self/profile/partial")

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken)

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		JSONNode node, payload;

diff --git a/protocols/SkypeWeb/src/requests/subscriptions.h b/protocols/SkypeWeb/src/requests/subscriptions.h
index 82c4eaaa0c..979c472639 100644
--- a/protocols/SkypeWeb/src/requests/subscriptions.h
+++ b/protocols/SkypeWeb/src/requests/subscriptions.h
@@ -21,12 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class CreateSubscriptionsRequest : public HttpRequest

 {

 public:

-	CreateSubscriptionsRequest(LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/endpoints/SELF/subscriptions", li.endpoint.szServer)

+	CreateSubscriptionsRequest(CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/endpoints/SELF/subscriptions", ppro->m_szServer)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken)

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");

 

 		JSONNode interestedResources(JSON_ARRAY); interestedResources.set_name("interestedResources");

@@ -49,13 +49,13 @@ public:
 class CreateContactsSubscriptionRequest : public HttpRequest

 {

 public:

-	CreateContactsSubscriptionRequest(const LIST<char> &skypenames, LoginInfo &li) :

-	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/contacts", li.endpoint.szServer)

+	CreateContactsSubscriptionRequest(const LIST<char> &skypenames, CSkypeProto *ppro) :

+	  HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/contacts", ppro->m_szServer)

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", li.endpoint.szToken);

+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);

 

 

 		JSONNode node;

diff --git a/protocols/SkypeWeb/src/requests/trouter.h b/protocols/SkypeWeb/src/requests/trouter.h
index 7373a4ec57..cca90d1ed7 100644
--- a/protocols/SkypeWeb/src/requests/trouter.h
+++ b/protocols/SkypeWeb/src/requests/trouter.h
@@ -30,13 +30,13 @@ public:
 class CreateTrouterPoliciesRequest : public HttpRequest

 {

 public:

-	CreateTrouterPoliciesRequest(LoginInfo &li, const char *sr) :

+	CreateTrouterPoliciesRequest(CSkypeProto *ppro, const char *sr) :

 		HttpRequest(REQUEST_POST, FORMAT, "prod.tpc.skype.com/v1/policies")

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript")

 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken);

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken);

 

 		JSONNode node;

 		node << JSONNode("sr", sr);

@@ -48,12 +48,12 @@ public:
 class RegisterTrouterRequest : public HttpRequest

 {

 public:

-	RegisterTrouterRequest(LoginInfo &li, const char *trouterUrl, const char *id) :

+	RegisterTrouterRequest(CSkypeProto *ppro, const char *trouterUrl, const char *id) :

 		HttpRequest(REQUEST_POST, "prod.registrar.skype.com/v2/registrations")

 	{

 		Headers

 			<< CHAR_VALUE("Accept", "application/json, text/javascript, text/html,application/xhtml+xml, application/xml")

-			<< CHAR_VALUE("X-Skypetoken", li.api.szToken);

+			<< CHAR_VALUE("X-Skypetoken", ppro->m_szApiToken);

 

 		JSONNode clientDescription; clientDescription.set_name("clientDescription");

 		clientDescription