Skip to content

fix(auth): fix unmojang/drasl auth #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
so5iso4ka merged 1 commit into from
Mar 17, 2026
Merged

fix(auth): fix unmojang/drasl auth #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions launcher/ui/dialogs/CustomLoginDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ void CustomLoginDialog::accept()
return;
}

m_loginUrl = url;

setUserInputsEnabled(false);
ui->progressBar->setVisible(true);

Expand All @@ -73,31 +75,28 @@ void CustomLoginDialog::onUrlResolving()
{
disconnect(m_requestTask.get(), &Task::finished, this, &CustomLoginDialog::onUrlResolving);

if (m_requestTask->error() != QNetworkReply::NoError) {
if (m_requestTask->error() != QNetworkReply::NoError && m_requestTask->replyStatusCode() != 405) {
emit onTaskFailed(m_requestTask->errorString());
return;
}

// modify url if header say so
QUrl url;
auto headers = m_requestTask->getRawHeaders();
if (const auto it =
std::find_if(headers.begin(), headers.end(),
[](const auto& pair) { return QString::fromUtf8(pair.first).toLower() == "x-authlib-injector-api-location"; });
it != headers.end()) {
const QUrl location = QString::fromUtf8(it->second);
if (location.isRelative()) {
url = m_requestTask->url().resolved(location);
m_loginUrl = m_requestTask->url().resolved(location);
} else {
url = location;
m_loginUrl = location;
}
} else {
url = m_requestTask->url();
}

// Setup the login task and start it
m_account = CustomAccount::createCustom(ui->userTextBox->text(), url.toString(QUrl::StripTrailingSlash), ui->loginUrlTextBox->text(),
ui->refreshUrlTextBox->text());
m_account = CustomAccount::createCustom(ui->userTextBox->text(), m_loginUrl.toString(QUrl::StripTrailingSlash),
ui->loginUrlTextBox->text(), ui->refreshUrlTextBox->text());
m_loginTask = m_account->login(ui->passTextBox->text());
connect(m_loginTask.get(), &Task::failed, this, &CustomLoginDialog::onTaskFailed);
connect(m_loginTask.get(), &Task::succeeded, this, &CustomLoginDialog::onTaskSucceeded);
Expand Down
1 change: 1 addition & 0 deletions launcher/ui/dialogs/CustomLoginDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@ class CustomLoginDialog : public QDialog {
CustomAccountPtr m_account;
Task::Ptr m_loginTask;
Net::Head::Ptr m_requestTask;
QUrl m_loginUrl;
};
Loading