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

Merge remote-tracking branch 'BatteredBunny/auth_server_name' into develop

Browse Source
This commit is contained in:
Evan Goode 2024-05-03 17:25:58 -04:00
commit ee040668f0
8 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/minecraft/auth/AccountData.cpp
View File

@ -316,14 +316,14 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
customAccountServerUrl = "https://authserver.ely.by/api/authlib-injector/api";
customSessionServerUrl = "https://authserver.ely.by/api/authlib-injector/sessionserver";
customServicesServerUrl = "https://authserver.ely.by/api/authlib-injector/minecraftservices";
authlibInjectorUrl = "https://authserver.ely.by/api/authlib-injector";
customAuthlibInjectorUrl = "https://authserver.ely.by/api/authlib-injector";
authlibInjectorMetadata = "";
} else {
customAuthServerUrl = data.value("customAuthServerUrl").toString();
customAccountServerUrl = data.value("customAccountServerUrl").toString();
customSessionServerUrl = data.value("customSessionServerUrl").toString();
customServicesServerUrl = data.value("customServicesServerUrl").toString();
authlibInjectorUrl = data.value("authlibInjectorUrl").toString();
customAuthlibInjectorUrl = data.value("authlibInjectorUrl").toString();
authlibInjectorMetadata = data.value("authlibInjectorMetadata").toString();
}
}
@ -383,7 +383,7 @@ QJsonObject AccountData::saveState() const
output["customAccountServerUrl"] = customAccountServerUrl;
output["customSessionServerUrl"] = customSessionServerUrl;
output["customServicesServerUrl"] = customServicesServerUrl;
output["authlibInjectorUrl"] = authlibInjectorUrl;
output["authlibInjectorUrl"] = customAuthlibInjectorUrl;
output["authlibInjectorMetadata"] = authlibInjectorMetadata;
}
@ -425,6 +425,15 @@ QString AccountData::sessionServerUrl() const
}
}
QString AccountData::authlibInjectorUrl() const
{
if (usesCustomApiServers()) {
return customAuthlibInjectorUrl;
} else {
return QString();
}
}
QString AccountData::servicesServerUrl() const
{
if (usesCustomApiServers()) {

3
launcher/minecraft/auth/AccountData.h
View File

@ -84,6 +84,7 @@ struct AccountData {
QString accountServerUrl() const;
QString sessionServerUrl() const;
QString servicesServerUrl() const;
QString authlibInjectorUrl() const;
//! userName for Mojang accounts, gamertag for MSA
QString accountDisplayString() const;
@ -113,7 +114,7 @@ struct AccountData {
QString customAccountServerUrl;
QString customSessionServerUrl;
QString customServicesServerUrl;
QString authlibInjectorUrl;
QString customAuthlibInjectorUrl;
QString authlibInjectorMetadata;
QString msaClientID;

8
launcher/minecraft/auth/AccountList.cpp
View File

@ -333,6 +333,10 @@ QVariant AccountList::data(const QModelIndex& index, int role) const
}
}
case AuthServerColumn: {
return account->authlibInjectorUrl();
}
case MigrationColumn: {
if (!account->isMojang()) {
return tr("N/A", "Can Migrate");
@ -379,6 +383,8 @@ QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation o
return tr("Type");
case StatusColumn:
return tr("Status");
case AuthServerColumn:
return tr("Server");
default:
return QVariant();
}
@ -393,6 +399,8 @@ QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation o
return tr("Type of the account (MSA or Offline)");
case StatusColumn:
return tr("Current status of the account.");
case AuthServerColumn:
return tr("Auth server the account is using.");
default:
return QVariant();
}

1
launcher/minecraft/auth/AccountList.h
View File

@ -58,6 +58,7 @@ class AccountList : public QAbstractListModel {
MigrationColumn,
TypeColumn,
StatusColumn,
AuthServerColumn,
NUM_COLUMNS
};

4
launcher/minecraft/auth/MinecraftAccount.cpp
View File

@ -87,7 +87,7 @@ MinecraftAccountPtr MinecraftAccount::createFromUsernameAuthlibInjector(const QS
account->data.minecraftEntitlement.ownsMinecraft = true;
account->data.minecraftEntitlement.canPlayMinecraft = true;
account->data.authlibInjectorUrl = authlibInjectorUrl;
account->data.customAuthlibInjectorUrl = authlibInjectorUrl;
account->data.customAuthServerUrl = authlibInjectorUrl + "/authserver";
account->data.customAccountServerUrl = authlibInjectorUrl + "/api";
account->data.customSessionServerUrl = authlibInjectorUrl + "/sessionserver";
@ -342,7 +342,7 @@ void MinecraftAccount::fillSession(AuthSessionPtr session)
}
// API URLs
session->authlib_injector_url = data.authlibInjectorUrl;
session->authlib_injector_url = data.authlibInjectorUrl();
session->auth_server_url = data.authServerUrl();
session->account_server_url = data.accountServerUrl();
session->session_server_url = data.sessionServerUrl();

2
launcher/minecraft/auth/MinecraftAccount.h
View File

@ -119,7 +119,7 @@ class MinecraftAccount : public QObject, public Usable {
public: /* queries */
QString internalId() const { return data.internalId; }
QString authlibInjectorUrl() const { return data.authlibInjectorUrl; }
QString authlibInjectorUrl() const { return data.authlibInjectorUrl(); }
QString authServerUrl() const { return data.authServerUrl(); }

4
launcher/minecraft/auth/steps/AuthlibInjectorMetadataStep.cpp
View File

@ -17,11 +17,11 @@ QString AuthlibInjectorMetadataStep::describe()
void AuthlibInjectorMetadataStep::perform()
{
if (m_data->authlibInjectorUrl == "") {
if (m_data->customAuthlibInjectorUrl == "") {
emit finished(AccountTaskState::STATE_WORKING, tr("Account has no authlib-injector URL."));
return;
}
QNetworkRequest request = QNetworkRequest(m_data->authlibInjectorUrl);
QNetworkRequest request = QNetworkRequest(m_data->customAuthlibInjectorUrl);
AuthRequest* requestor = new AuthRequest(this);
connect(requestor, &AuthRequest::finished, this, &AuthlibInjectorMetadataStep::onRequestDone);
requestor->get(request);

1
launcher/ui/pages/global/AccountListPage.cpp
View File

@ -73,6 +73,7 @@ AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new
ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::NameColumn, QHeaderView::Stretch);
ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::TypeColumn, QHeaderView::ResizeToContents);
ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::StatusColumn, QHeaderView::ResizeToContents);
ui->listView->header()->setSectionResizeMode(AccountList::VListColumns::AuthServerColumn, QHeaderView::ResizeToContents);
ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
// Expand the account column