- Clientside login changes to match service side

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Auth.h

@@ -19,6 +19,7 @@ class NGMP_OnlineServices_AuthInterface
 	void GoToDetermineNetworkCaps();
 
 	void BeginLogin();
+	void DoReAuth();
 
 	void Tick();
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Auth.cpp

@@ -161,56 +161,49 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
 
 		NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendPOSTRequest(strLoginURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, strPostData.c_str(), [=](bool bSuccess, int statusCode, std::string strBody, HTTPRequest* pReq)
 			{
-				try
+				// if 4XX, just log in again
+				if (statusCode >= 400 && statusCode < 500)
 				{
-					nlohmann::json jsonObject = nlohmann::json::parse(strBody, nullptr, false, true);
-					AuthResponse authResp = jsonObject.get<AuthResponse>();
-
-					if (authResp.result == EAuthResponseResult::SUCCEEDED)
+					NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: Login failed due to 4XX code, trying to re-auth");
+					DoReAuth();
+				}
+				else
+				{
+					try
 					{
-						ClearGSMessageBoxes();
-						GSMessageBoxNoButtons(UnicodeString(L"Logging In"), UnicodeString(L"Logged in!"), true);
+						nlohmann::json jsonObject = nlohmann::json::parse(strBody, nullptr, false, true);
+						AuthResponse authResp = jsonObject.get<AuthResponse>();
 
-						NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: Logged in");
-						m_bWaitingLogin = false;
+						if (authResp.result == EAuthResponseResult::SUCCEEDED)
+						{
+							ClearGSMessageBoxes();
+							GSMessageBoxNoButtons(UnicodeString(L"Logging In"), UnicodeString(L"Logged in!"), true);
 
-						SaveCredentials(authResp.refresh_token.c_str());
+							NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: Logged in");
+							m_bWaitingLogin = false;
 
-						// store data locally
-						m_strToken = authResp.session_token;
-						m_userID = authResp.user_id;
-						m_strDisplayName = authResp.display_name;
+							SaveCredentials(authResp.refresh_token.c_str());
+
+							// store data locally
+							m_strToken = authResp.session_token;
+							m_userID = authResp.user_id;
+							m_strDisplayName = authResp.display_name;
 
-						// trigger callback
-						OnLoginComplete(true, authResp.ws_uri.c_str());
+							// trigger callback
+							OnLoginComplete(true, authResp.ws_uri.c_str());
+						}
+						else if (authResp.result == EAuthResponseResult::FAILED)
+						{
+							NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: Login failed, trying to re-auth");
+							DoReAuth();
+						}
 					}
-					else if (authResp.result == EAuthResponseResult::FAILED)
+					catch (...)
 					{
-						ClearGSMessageBoxes();
-						GSMessageBoxNoButtons(UnicodeString(L"Logging In"), UnicodeString(L"Please continue in your web browser"), true);
-
-						NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: Login failed, trying to re-auth");
-
-						// do normal login flow, token is bad or expired etc
-						m_bWaitingLogin = true;
-						m_lastCheckCode = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::utc_clock::now().time_since_epoch()).count();
-						m_strCode = GenerateGamecode();
-
-#if defined(USE_TEST_ENV)
-						std::string strURI = std::format("http://www.playgenerals.online/login/?gamecode={}&env=test", m_strCode.c_str());
-#else
-						std::string strURI = std::format("http://www.playgenerals.online/login/?gamecode={}", m_strCode.c_str());
-#endif
-
-#if !_DEBUG
-						ShellExecuteA(NULL, "open", strURI.c_str(), NULL, NULL, SW_SHOWNORMAL);
-#endif
+						NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: Resp parse failed, trying to re-auth");
+						DoReAuth();
 					}
 				}
-				catch (...)
-				{
-
-				}
 
 			}, nullptr);
 	}
@@ -239,6 +232,28 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
 	}
 }
 
+void NGMP_OnlineServices_AuthInterface::DoReAuth()
+{
+	NetworkLog(ELogVerbosity::LOG_RELEASE, "LOGIN: DoReAuth");
+	ClearGSMessageBoxes();
+	GSMessageBoxNoButtons(UnicodeString(L"Logging In"), UnicodeString(L"Please continue in your web browser"), true);
+
+	// do normal login flow, token is bad or expired etc
+	m_bWaitingLogin = true;
+	m_lastCheckCode = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::utc_clock::now().time_since_epoch()).count();
+	m_strCode = GenerateGamecode();
+
+#if defined(USE_TEST_ENV)
+	std::string strURI = std::format("http://www.playgenerals.online/login/?gamecode={}&env=test", m_strCode.c_str());
+#else
+	std::string strURI = std::format("http://www.playgenerals.online/login/?gamecode={}", m_strCode.c_str());
+#endif
+
+#if !_DEBUG
+	ShellExecuteA(NULL, "open", strURI.c_str(), NULL, NULL, SW_SHOWNORMAL);
+#endif
+}
+
 void NGMP_OnlineServices_AuthInterface::Tick()
 {
 	if (m_bWaitingLogin)