diff options
| author | crueter <swurl@swurl.xyz> | 2025-07-01 01:44:12 +0000 |
|---|---|---|
| committer | crueter <crueter@noreply.localhost> | 2025-07-01 01:44:12 +0000 |
| commit | 94c66f98bfa69f71f5d0623cecac8444e383d34d (patch) | |
| tree | 9232cf5aae0a4884afe1822f5b7d0db07d4f573a /src/yuzu/configuration/configure_web.cpp | |
| parent | 2fe728766e1643634e42050a04991f192219864e (diff) | |
[frontend, web] refactor: web service frontend rewrite (#221)
- Automatic verification based on regex
- Token generation button
- Removed unneeded links
- public lobby creation [android]
Signed-off-by: crueter <swurl@swurl.xyz>
Co-authored-by: Aleksandr Popovich <alekpopo@pm.me>
Co-authored-by: Aleksandr Popovich <alekpopo@proton.me>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/221
Co-authored-by: crueter <swurl@swurl.xyz>
Co-committed-by: crueter <swurl@swurl.xyz>
Diffstat (limited to 'src/yuzu/configuration/configure_web.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_web.cpp | 162 |
1 files changed, 72 insertions, 90 deletions
diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp index f7902fb773..d62b5b0853 100644 --- a/src/yuzu/configuration/configure_web.cpp +++ b/src/yuzu/configuration/configure_web.cpp @@ -1,44 +1,52 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "yuzu/configuration/configure_web.h" #include <QIcon> #include <QMessageBox> + +#if QT_VERSION_MAJOR >= 6 +#include <QRegularExpressionValidator> +#else +#include <QRegExpValidator> +#endif + #include <QtConcurrent/QtConcurrentRun> #include "common/settings.h" #include "ui_configure_web.h" -#include "yuzu/configuration/configure_web.h" #include "yuzu/uisettings.h" -// static constexpr char token_delimiter{':'}; +ConfigureWeb::ConfigureWeb(QWidget* parent) + : QWidget(parent) + , ui(std::make_unique<Ui::ConfigureWeb>()) + , m_rng{QRandomGenerator::system()} +{ + ui->setupUi(this); -// static std::string GenerateDisplayToken(const std::string& username, const std::string& token) { -// if (username.empty() || token.empty()) { -// return {}; -// } + QString user_regex = QStringLiteral(".{4,20}"); + QString token_regex = QStringLiteral("[a-z]{48}"); -// const std::string unencoded_display_token{username + token_delimiter + token}; -// QByteArray b{unencoded_display_token.c_str()}; -// QByteArray b64 = b.toBase64(); -// return b64.toStdString(); -// } +#if QT_VERSION_MAJOR >= 6 + QRegularExpressionValidator *username_validator = new QRegularExpressionValidator(this); + QRegularExpressionValidator *token_validator = new QRegularExpressionValidator(this); -// static std::string UsernameFromDisplayToken(const std::string& display_token) { -// const std::string unencoded_display_token{ -// QByteArray::fromBase64(display_token.c_str()).toStdString()}; -// return unencoded_display_token.substr(0, unencoded_display_token.find(token_delimiter)); -// } + username_validator->setRegularExpression(QRegularExpression(user_regex)); + token_validator->setRegularExpression(QRegularExpression(token_regex)); +#else + QRegExpValidator *username_validator = new QRegExpValidator(this); + QRegExpValidator *token_validator = new QRegExpValidator(this); -// static std::string TokenFromDisplayToken(const std::string& display_token) { -// const std::string unencoded_display_token{ -// QByteArray::fromBase64(display_token.c_str()).toStdString()}; -// return unencoded_display_token.substr(unencoded_display_token.find(token_delimiter) + 1); -// } + username_validator->setRegExp(QRegExp(user_regex)); + token_validator->setRegExp(QRegExp(token_regex)); +#endif -ConfigureWeb::ConfigureWeb(QWidget* parent) - : QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) { - ui->setupUi(this); - connect(ui->button_verify_login, &QPushButton::clicked, this, &ConfigureWeb::VerifyLogin); - connect(&verify_watcher, &QFutureWatcher<bool>::finished, this, &ConfigureWeb::OnLoginVerified); + ui->edit_username->setValidator(username_validator); + ui->edit_token->setValidator(token_validator); + + connect(ui->button_generate, &QPushButton::clicked, this, &ConfigureWeb::GenerateToken); #ifndef USE_DISCORD_PRESENCE ui->discord_group->setVisible(false); @@ -60,87 +68,61 @@ void ConfigureWeb::changeEvent(QEvent* event) { void ConfigureWeb::RetranslateUI() { ui->retranslateUi(this); - - ui->web_signup_link->setText( - tr("<a href='https://profile.yuzu-emu.org/'><span style=\"text-decoration: underline; " - "color:#039be5;\">Sign up</span></a>")); - - ui->web_token_info_link->setText( - tr("<a href='https://evilperson1337.notion.site/Hosting-a-Room-Inside-of-Eden-20457c2edaf680108abac6215a79acdb'><span style=\"text-decoration: " - "underline; color:#039be5;\">What is my token?</span></a>")); } void ConfigureWeb::SetConfiguration() { - ui->web_credentials_disclaimer->setWordWrap(true); + connect(ui->edit_username, &QLineEdit::textChanged, this, &ConfigureWeb::VerifyLogin); + connect(ui->edit_token, &QLineEdit::textChanged, this, &ConfigureWeb::VerifyLogin); - ui->web_signup_link->setOpenExternalLinks(true); - ui->web_token_info_link->setOpenExternalLinks(true); + ui->edit_username->setText(QString::fromStdString(Settings::values.eden_username.GetValue())); + ui->edit_token->setText(QString::fromStdString(Settings::values.eden_token.GetValue())); - ui->edit_username->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue())); - ui->edit_token->setText(QString::fromStdString(Settings::values.yuzu_token.GetValue())); - // ui->edit_token->setText(QString::fromStdString(GenerateDisplayToken( - // Settings::values.yuzu_username.GetValue(), Settings::values.yuzu_token.GetValue()))); + VerifyLogin(); - // Connect after setting the values, to avoid calling OnLoginChanged now - connect(ui->edit_token, &QLineEdit::textChanged, this, &ConfigureWeb::OnLoginChanged); + ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue()); +} - user_verified = true; +void ConfigureWeb::GenerateToken() { + constexpr size_t length = 48; + QString set = QStringLiteral("abcdefghijklmnopqrstuvwxyz"); + QString result; - ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue()); + for (size_t i = 0; i < length; ++i) { + size_t idx = m_rng->bounded(set.length()); + result.append(set.at(idx)); + } + + ui->edit_token->setText(result); } void ConfigureWeb::ApplyConfiguration() { UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked(); - Settings::values.yuzu_username = ui->edit_username->text().toStdString(); - Settings::values.yuzu_token = ui->edit_token->text().toStdString(); + Settings::values.eden_username = ui->edit_username->text().toStdString(); + Settings::values.eden_token = ui->edit_token->text().toStdString(); } -void ConfigureWeb::OnLoginChanged() { - if (ui->edit_token->text().isEmpty()) { - user_verified = true; - // Empty = no icon - ui->label_token_verified->setPixmap(QPixmap()); - ui->label_token_verified->setToolTip(QString()); - } else { - user_verified = false; +void ConfigureWeb::VerifyLogin() { + const QPixmap checked = QIcon::fromTheme(QStringLiteral("checked")).pixmap(16); + const QPixmap failed = QIcon::fromTheme(QStringLiteral("failed")).pixmap(16); - // Show an info icon if it's been changed, clearer than showing failure - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("info")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); - ui->label_token_verified->setToolTip( - tr("Unverified, please click Verify before saving configuration", "Tooltip")); - } -} + const bool username_good = ui->edit_username->hasAcceptableInput(); + const bool token_good = ui->edit_token->hasAcceptableInput(); -void ConfigureWeb::VerifyLogin() { - QMessageBox::warning(this, - tr("Warning"), - tr("Verification is currently nonfunctional, instead generate a random " - "48-character string with only lowercase a-z.")); - // ui->button_verify_login->setDisabled(true); - // ui->button_verify_login->setText(tr("Verifying...")); - // ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("sync")).pixmap(16)); - // ui->label_token_verified->setToolTip(tr("Verifying...")); -} + if (username_good) { + ui->label_username_verified->setPixmap(checked); + ui->label_username_verified->setToolTip(tr("All Good", "Tooltip")); + } else { + ui->label_username_verified->setPixmap(failed); + ui->label_username_verified->setToolTip(tr("Must be between 4-20 characters", "Tooltip")); + } -void ConfigureWeb::OnLoginVerified() { - // ui->button_verify_login->setEnabled(true); - // ui->button_verify_login->setText(tr("Verify")); - // if (verify_watcher.result()) { - // user_verified = true; - - // ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("checked")).pixmap(16)); - // ui->label_token_verified->setToolTip(tr("Verified", "Tooltip")); - // ui->username->setText( - // QString::fromStdString(UsernameFromDisplayToken(ui->edit_token->text().toStdString()))); - // } else { - // ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("failed")).pixmap(16)); - // ui->label_token_verified->setToolTip(tr("Verification failed", "Tooltip")); - // ui->username->setText(tr("Unspecified")); - // QMessageBox::critical(this, tr("Verification failed"), - // tr("Verification failed. Check that you have entered your token " - // "correctly, and that your internet connection is working.")); - // } + if (token_good) { + ui->label_token_verified->setPixmap(checked); + ui->label_token_verified->setToolTip(tr("All Good", "Tooltip")); + } else { + ui->label_token_verified->setPixmap(failed); + ui->label_token_verified->setToolTip(tr("Must be 48 characters, and lowercase a-z", "Tooltip")); + } } void ConfigureWeb::SetWebServiceConfigEnabled(bool enabled) { |
