redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 21:07:45 +00:00
Code Activity

Don't load/save credentials from the system keychain in debug builds

Browse source 
This prevents a really annoying workflow on macOS, wherein the system
prompts you each time you rebuild the program.

Closes #9
This commit is contained in:
Joshua Goins 2022-02-24 09:38:41 -05:00
parent c3b331cf7e
commit 3ccd6d3b4d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/launcherwindow.cpp
View file

@ -122,19 +122,23 @@ LauncherWindow::LauncherWindow(LauncherCore& core, QWidget* parent) : QMainWindo
connect(core.assetUpdater, &AssetUpdater::finishedUpdating, [=] { connect(core.assetUpdater, &AssetUpdater::finishedUpdating, [=] {
auto info = LoginInformation{&currentProfile(), usernameEdit->text(), passwordEdit->text(), otpEdit->text()}; auto info = LoginInformation{&currentProfile(), usernameEdit->text(), passwordEdit->text(), otpEdit->text()};
#ifndef QT_DEBUG
if(currentProfile().rememberUsername) { if(currentProfile().rememberUsername) {
auto job = new QKeychain::WritePasswordJob("LauncherWindow"); auto job = new QKeychain::WritePasswordJob("LauncherWindow");
job->setTextData(usernameEdit->text()); job->setTextData(usernameEdit->text());
job->setKey(currentProfile().name + "-username"); job->setKey(currentProfile().name + "-username");
job->start(); job->start();
} }
#endif
#ifndef QT_DEBUG
if(currentProfile().rememberPassword) { if(currentProfile().rememberPassword) {
auto job = new QKeychain::WritePasswordJob("LauncherWindow"); auto job = new QKeychain::WritePasswordJob("LauncherWindow");
job->setTextData(passwordEdit->text()); job->setTextData(passwordEdit->text());
job->setKey(currentProfile().name + "-password"); job->setKey(currentProfile().name + "-password");
job->start(); job->start();
} }
#endif
if(currentProfile().isSapphire) { if(currentProfile().isSapphire) {
this->core.sapphireLauncher->login(currentProfile().lobbyURL, info); this->core.sapphireLauncher->login(currentProfile().lobbyURL, info);
@ -196,6 +200,7 @@ void LauncherWindow::reloadControls() {
} }
rememberUsernameBox->setChecked(currentProfile().rememberUsername); rememberUsernameBox->setChecked(currentProfile().rememberUsername);
#ifndef QT_DEBUG
if(currentProfile().rememberUsername) { if(currentProfile().rememberUsername) {
auto job = new QKeychain::ReadPasswordJob("LauncherWindow"); auto job = new QKeychain::ReadPasswordJob("LauncherWindow");
job->setKey(currentProfile().name + "-username"); job->setKey(currentProfile().name + "-username");
@ -205,8 +210,10 @@ void LauncherWindow::reloadControls() {
usernameEdit->setText(job->textData()); usernameEdit->setText(job->textData());
}); });
} }
#endif
rememberPasswordBox->setChecked(currentProfile().rememberPassword); rememberPasswordBox->setChecked(currentProfile().rememberPassword);
#ifndef QT_DEBUG
if(currentProfile().rememberPassword) { if(currentProfile().rememberPassword) {
auto job = new QKeychain::ReadPasswordJob("LauncherWindow"); auto job = new QKeychain::ReadPasswordJob("LauncherWindow");
job->setKey(currentProfile().name + "-password"); job->setKey(currentProfile().name + "-password");
@ -216,6 +223,7 @@ void LauncherWindow::reloadControls() {
passwordEdit->setText(job->textData()); passwordEdit->setText(job->textData());
}); });
} }
#endif
const bool canLogin = currentProfile().isSapphire || (!currentProfile().isSapphire && core.squareLauncher->isGateOpen); const bool canLogin = currentProfile().isSapphire || (!currentProfile().isSapphire && core.squareLauncher->isGateOpen);