From a237d7b332d0212ddd350c69488c93b846ff76d7 Mon Sep 17 00:00:00 2001
From: ElzorFox <elzorfox@ya.ru>
Date: Fri, 21 Feb 2025 18:02:27 +0500
Subject: VKontakte: remove old token (before 20/02) on update change UA to
 Chrome cleanup version bump

---
 protocols/VKontakte/src/vk_thread.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'protocols/VKontakte/src/vk_thread.cpp')

diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index c527e5d472..d17f542d4f 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -23,11 +23,11 @@ mir_cs CVkProto::m_csTimer;
 char szBlankUrl[] = "https://oauth.vk.com/blank.html";
 char szChallengekUrl[] = "/challenge.html";
 char szScore[] = "friends,photos,audio,docs,video,wall,messages,offline,status,notifications,groups";
-char szVKUserAgent[] = "Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko";
 char szVKTokenBeg[] = "access_token=";
+char szVKCookieDomain[] = ".vk.com";
 
 static char szVKLoginDomain[] = "https://m.vk.com";
-static char szVKCookieDomain[] = ".vk.com";
+
 static char szFieldsName[] = "id, first_name, last_name, photo_100, bdate, sex, timezone, "
 	"contacts, last_seen, online, status, country, city, relation, interests, activities, "
 	"music, movies, tv, books, games, quotes, about,  domain, can_write_private_message";
@@ -206,7 +206,6 @@ void CVkProto::OnLoggedOut()
 
 bool CVkProto::LoadToken(LPCSTR pszUrlSring)
 {
-	m_szAccessToken = nullptr;
 	LPCSTR p = strstr(pszUrlSring, szVKTokenBeg);
 	if (!p)
 		return false;
@@ -221,7 +220,7 @@ bool CVkProto::LoadToken(LPCSTR pszUrlSring)
 	if (m_szAccessToken == nullptr)
 		m_szAccessToken = mir_strdup(p);
 	setString("AccessToken", m_szAccessToken);
-	
+	setDword("LastAccessTokenTime", time(0));
 	return true;
 }
 
@@ -244,7 +243,6 @@ void CVkProto::OnOAuthAuthorize(MHttpResponse *reply, AsyncHttpRequest*)
 		pReq->m_bApiReq = false;
 		pReq->bIsMainConn = true;
 		ApplyCookies(pReq);
-		pReq->AddHeader("User-Agent", szVKUserAgent);
 		Push(pReq);
 		return;
 	}
@@ -271,7 +269,7 @@ void CVkProto::OnOAuthAuthorize(MHttpResponse *reply, AsyncHttpRequest*)
 					VER_API
 				);
 
-				CVkTokenForm dlg(this, szTokenReq);
+				CVkTokenForm dlg(this, szTokenReq.c_str());
 				if (dlg.DoModal() && LoadToken(dlg.Result))
 					RetrieveMyInfo();
 				else
@@ -296,7 +294,6 @@ void CVkProto::OnOAuthAuthorize(MHttpResponse *reply, AsyncHttpRequest*)
 				pRedirectReq->m_bApiReq = false;
 				pRedirectReq->bIsMainConn = true;
 				// Headers
-				pRedirectReq->AddHeader("User-Agent", szVKUserAgent);
 				pRedirectReq->AddHeader("dht", "1");
 				pRedirectReq->AddHeader("sec-ch-ua-platform", "Windows");
 				pRedirectReq->AddHeader("sec-fetch-dest", "document");
@@ -314,6 +311,17 @@ void CVkProto::OnOAuthAuthorize(MHttpResponse *reply, AsyncHttpRequest*)
 		return;
 	}
 
+	if (reply->resultCode == 200 && !IsEmpty(reply->szUrl) && strstr(reply->szUrl, szChallengekUrl)) {
+		debugLogA("CVkProto::OnOAuthAuthorize szChallengekUrl");
+		CVkTokenForm dlg(this, reply->szUrl);
+		if (dlg.DoModal() && LoadToken(dlg.Result))
+			RetrieveMyInfo();
+		else
+			ConnectionFailed(LOGINERR_NOSERVER);
+
+		return;
+	}
+
 	if (reply->resultCode != 200 || reply->body.IsEmpty() || (!(strstr(reply->body, "method=\"post\"") || strstr(reply->body, "method=\"POST\"")) && !strstr(reply->body, "meta http-equiv=\"refresh\""))) { // something went wrong
 		ConnectionFailed(LOGINERR_NOSERVER);
 		return;
@@ -367,7 +375,7 @@ void CVkProto::OnOAuthAuthorize(MHttpResponse *reply, AsyncHttpRequest*)
 	pReq->Redirect(reply);
 	ApplyCookies(pReq);
 	// Headers
-	pReq->AddHeader("User-Agent", szVKUserAgent);
+	
 	pReq->AddHeader("dht", "1");
 	pReq->AddHeader("origin", "https://oauth.vk.com");
 	pReq->AddHeader("referer", "https://oauth.vk.com/");
-- 
cgit v1.2.3