ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Merge pull request #51 from unmojang/evan-goode/fix-selectedProfile

Browse Source 
Only send `selectedProfile` when selecting a profile
This commit is contained in:
Evan Goode 2025-01-13 11:52:09 -05:00 committed by GitHub
commit d931e8fa49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
launcher/minecraft/auth/steps/YggdrasilStep.cpp
View File

@ -88,14 +88,17 @@ void YggdrasilStep::refresh()
* "requestUser": true/false // request the user structure * "requestUser": true/false // request the user structure
* } * }
*/ */
QJsonObject selectedProfile;
selectedProfile.insert("id", m_data->profileId());
selectedProfile.insert("name", m_data->profileName());
QJsonObject req; QJsonObject req;
req.insert("clientToken", m_data->clientToken()); req.insert("clientToken", m_data->clientToken());
req.insert("accessToken", m_data->accessToken()); req.insert("accessToken", m_data->accessToken());
req.insert("selectedProfile", selectedProfile);
if (m_didSelectProfile) {
QJsonObject selectedProfile;
selectedProfile.insert("id", m_data->profileId());
selectedProfile.insert("name", m_data->profileName());
req.insert("selectedProfile", selectedProfile);
}
req.insert("requestUser", false); req.insert("requestUser", false);
QJsonDocument doc(req); QJsonDocument doc(req);
@ -239,8 +242,7 @@ void YggdrasilStep::processResponse(QJsonObject responseData)
m_data->yggdrasilToken.validity = Validity::Certain; m_data->yggdrasilToken.validity = Validity::Certain;
m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc(); m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
// Get UUID here since we need it for later // Select a profile
// FIXME: Here is a simple workaround for now,, which uses the first available profile when selectedProfile is not provided
auto profile = responseData.value("selectedProfile"); auto profile = responseData.value("selectedProfile");
if (profile.isObject()) { if (profile.isObject()) {
m_didSelectProfile = false; m_didSelectProfile = false;