Merge pull request #33 from JinyiSa/develop

A simple workaround for multi-profile authlib-injector servers
This commit is contained in:
Evan Goode 2024-09-19 14:15:40 -04:00 committed by GitHub
commit 441d471a93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -216,10 +216,21 @@ void Yggdrasil::processResponse(QJsonObject responseData)
m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
// Get UUID here since we need it for later
// FIXME: Here is a simple workaround for now,, which uses the first available profile when selectedProfile is not provided
auto profile = responseData.value("selectedProfile");
if (!profile.isObject()) {
changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send a selected profile."));
auto profiles = responseData.value("availableProfiles");
if (!profiles.isArray()) {
changeState(AccountTaskState::STATE_FAILED_HARD, tr("Authentication server didn't send available profiles."));
return;
} else {
if (profiles.toArray().isEmpty()) {
changeState(AccountTaskState::STATE_FAILED_HARD, tr("Account has no available profile."));
return;
} else {
profile = profiles.toArray().first();
}
}
}
auto profileObj = profile.toObject();