redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 21:07:45 +00:00
Code Activity

Fix compatibility with Kawari again

Browse source
This commit is contained in:
Joshua Goins 2024-05-11 13:24:25 -04:00
parent 6550c8c99e
commit f70682f8a8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
launcher/src/squareenixlogin.cpp
View file

@ -256,7 +256,7 @@ QCoro::Task<bool> SquareEnixLogin::loginOAuth()
postData.addQueryItem(QStringLiteral("otppw"), m_info->oneTimePassword); postData.addQueryItem(QStringLiteral("otppw"), m_info->oneTimePassword);
QUrl url; QUrl url;
url.setScheme(QStringLiteral("https")); url.setScheme(m_launcher.settings()->preferredProtocol());
url.setHost(QStringLiteral("ffxiv-login.%1").arg(m_launcher.settings()->squareEnixLoginServer())); url.setHost(QStringLiteral("ffxiv-login.%1").arg(m_launcher.settings()->squareEnixLoginServer()));
url.setPath(QStringLiteral("/oauth/ffxivarr/login/login.send")); url.setPath(QStringLiteral("/oauth/ffxivarr/login/login.send"));
@ -301,8 +301,12 @@ QCoro::Task<bool> SquareEnixLogin::loginOAuth()
const QRegularExpression errorRe(QStringLiteral(R"lit(window.external.user\("login=auth,ng,err,(?<launchParams>.*)\);)lit")); const QRegularExpression errorRe(QStringLiteral(R"lit(window.external.user\("login=auth,ng,err,(?<launchParams>.*)\);)lit"));
const QRegularExpressionMatch errorMatch = errorRe.match(str); const QRegularExpressionMatch errorMatch = errorRe.match(str);
// there's a stray quote at the end of the error string, so let's remove that if (errorMatch.hasCaptured(1)) {
Q_EMIT m_launcher.loginError(errorMatch.captured(1).chopped(1)); // there's a stray quote at the end of the error string, so let's remove that
Q_EMIT m_launcher.loginError(errorMatch.captured(1).chopped(1));
} else {
Q_EMIT m_launcher.loginError(i18n("Unknown error"));
}
co_return false; co_return false;
} }
@ -313,7 +317,7 @@ QCoro::Task<bool> SquareEnixLogin::registerSession()
qInfo(ASTRA_LOG) << "Registering the session..."; qInfo(ASTRA_LOG) << "Registering the session...";
QUrl url; QUrl url;
url.setScheme(QStringLiteral("https")); url.setScheme(m_launcher.settings()->preferredProtocol());
url.setHost(QStringLiteral("patch-gamever.%1").arg(m_launcher.settings()->squareEnixServer())); url.setHost(QStringLiteral("patch-gamever.%1").arg(m_launcher.settings()->squareEnixServer()));
url.setPath(QStringLiteral("/http/win32/ffxivneo_release_game/%1/%2").arg(m_info->profile->baseGameVersion(), m_SID)); url.setPath(QStringLiteral("/http/win32/ffxivneo_release_game/%1/%2").arg(m_info->profile->baseGameVersion(), m_SID));