Skip to content

fix(auth): treat MSA accounts that do not own the game as invalid #220

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

Draft
so5iso4ka wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

fix(auth): treat MSA accounts that do not own the game as invalid #220

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
3 changes: 1 addition & 2 deletions launcher/LaunchController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ void LaunchController::decideAccount()
if (!accounts->anyAccountIsValid()) {
// Tell the user they need to log in at least one account in order to play.
auto reply = CustomMessageBox::selectable(m_parentWidget, tr("No Accounts"),
tr("In order to play Minecraft, you must have at least one Microsoft "
"account which owns Minecraft logged in. "
tr("In order to play Minecraft, you must have at least one account logged in. "
"Would you like to open the account manager to add an account now?"),
QMessageBox::Information, QMessageBox::Yes | QMessageBox::No)
->exec();
Expand Down
2 changes: 1 addition & 1 deletion launcher/minecraft/auth/MinecraftAccount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class MinecraftAccount : public QObject, public Usable {

AccountType accountType() const noexcept { return data.type; }

bool ownsMinecraft() const { return true; }
bool ownsMinecraft() const { return data.type != AccountType::MSA || data.minecraftEntitlement.ownsMinecraft; }

bool hasProfile() const { return data.profileId().size() != 0; }

Expand Down
9 changes: 0 additions & 9 deletions launcher/ui/pages/instance/VersionPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,6 @@ void VersionPage::on_actionChange_version_triggered()

void VersionPage::on_actionDownload_All_triggered()
{
if (!APPLICATION->accounts()->anyAccountIsValid()) {
CustomMessageBox::selectable(this, tr("Error"),
tr("Cannot download Minecraft or update instances unless you have at least "
"one account added.\nPlease add a Microsoft account."),
QMessageBox::Warning)
->show();
return;
}

auto updateTasks = m_inst->createUpdateTask();
if (updateTasks.isEmpty()) {
return;
Expand Down
Loading