External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-03 08:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4998 from arthomnix/feature/account-expired-login-button

Browse Source 
GH-4978 Add button to log back in when account expired
This commit is contained in:
Petr Mrázek
2022-12-01 23:48:36 +01:00
committed by GitHub
parent e044744faf 73e1d15ab9
commit aba63c8f00
1 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
launcher/LaunchController.cpp
View File

@@ -9,6 +9,8 @@
#include "ui/dialogs/ProgressDialog.h" #include "ui/dialogs/ProgressDialog.h"
#include "ui/dialogs/EditAccountDialog.h" #include "ui/dialogs/EditAccountDialog.h"
#include "ui/dialogs/ProfileSetupDialog.h" #include "ui/dialogs/ProfileSetupDialog.h"
#include "ui/dialogs/LoginDialog.h"
#include "ui/dialogs/MSALoginDialog.h"
#include <QLineEdit> #include <QLineEdit>
#include <QInputDialog> #include <QInputDialog>
@@ -223,16 +225,59 @@ void LaunchController::login() {
} }
*/ */
case AccountState::Expired: { case AccountState::Expired: {
auto errorString = tr("The account has expired and needs to be logged into manually again."); auto errorString = tr("The account has expired and needs to be logged into manually. Press OK to log in again.");
QMessageBox::warning( auto button = QMessageBox::warning(
m_parentWidget, m_parentWidget,
tr("Account refresh failed"), tr("Account refresh failed"),
errorString, errorString,
QMessageBox::StandardButton::Ok, QMessageBox::StandardButton::Ok | QMessageBox::StandardButton::Cancel,
QMessageBox::StandardButton::Ok QMessageBox::StandardButton::Ok
); );
emitFailed(errorString); if (button == QMessageBox::StandardButton::Ok) {
return; auto accounts = APPLICATION->accounts();
bool isDefault = accounts->defaultAccount() == m_accountToUse;
bool msa = m_accountToUse->isMSA();
accounts->removeAccount(accounts->index(accounts->findAccountByProfileId(m_accountToUse->profileId())));
MinecraftAccountPtr newAccount = nullptr;
if (msa) {
if(BuildConfig.BUILD_PLATFORM == "osx64") {
CustomMessageBox::selectable(
m_parentWidget,
tr("Microsoft Accounts not available"),
tr(
"Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated MultiMC.\n\n"
"Please update both your operating system and MultiMC."
),
QMessageBox::Warning
)->exec();
emitFailed(tr("Attempted to re-login to a Microsoft account on an unsupported platform"));
return;
}
newAccount = MSALoginDialog::newAccount(
m_parentWidget,
tr("Please enter your Mojang account email and password to add your account.")
);
} else {
newAccount = LoginDialog::newAccount(
m_parentWidget,
tr("Please enter your Mojang account email and password to add your account.")
);
}
if (newAccount) {
accounts->addAccount(newAccount);
if (isDefault) {
accounts->setDefaultAccount(newAccount);
}
decideAccount();
continue;
} else {
emitFailed(tr("Account expired and re-login attempt failed"));
return;
}
} else {
emitFailed(errorString);
return;
}
} }
case AccountState::Gone: { case AccountState::Gone: {
auto errorString = tr("The account no longer exists on the servers. It may have been migrated, in which case please add the new account you migrated this one to."); auto errorString = tr("The account no longer exists on the servers. It may have been migrated, in which case please add the new account you migrated this one to.");