From 340386821c6b9e3c2e7b2cde0ec9e082efebcaec Mon Sep 17 00:00:00 2001 From: Piotr Piastucki Date: Tue, 27 Oct 2015 21:27:58 +0000 Subject: - MSN: Managing and refreshing OAuth tokens with different expiration times. git-svn-id: http://svn.miranda-ng.org/main/trunk@15627 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_proto.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'protocols/MSN/src/msn_proto.h') diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index 528be998a8..2bc9a24bff 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -113,14 +113,13 @@ struct CMsnProto : public PROTO // Security Tokens char *pAuthToken, *tAuthToken; char *oimSendToken; - char *authStrToken, *authSecretToken; - char *authContactToken; - char *authStorageToken; + char *authSecretToken; + OAuthToken authStrToken, authContactToken, authStorageToken, authSSLToken, authSkypeComToken; + SkypeToken authSkypeToken; char *hotSecretToken, *hotAuthToken; - char *authUser, *authUIC, *authCookies, *authSSLToken, *authAccessToken, *authRefreshToken, *authSkypeComToken, *authSkypeToken; + char *authUser, *authUIC, *authCookies, *authRefreshToken; bool bAskingForAuth, bPassportAuth; int authMethod; - time_t authTokenExpiretime; bool bSentBND, bIgnoreATH; char *abCacheKey, *sharingCacheKey, *storageCacheKey; @@ -500,12 +499,11 @@ struct CMsnProto : public PROTO int LoginSkypeOAuth(const char *pRefreshToken); bool RefreshOAuth(const char *pszRefreshToken, const char *pszService, char *pszAccessToken, char *pszOutRefreshToken=NULL, time_t *ptExpires=NULL); int MSN_AuthOAuth(void); - int MSN_RefreshOAuthTokens(void); + int MSN_RefreshOAuthTokens(bool bJustCheck); void MSN_SendATH(ThreadData* info); CMStringA HotmailLogin(const char* url); void FreeAuthTokens(void); int GetMyNetID(void); - const char *GetSkypeToken(bool bAsAuthHeader); LPCSTR GetMyUsername(int netId); ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3