1 files changed, 22 insertions, 114 deletions

diff --git a/src/citron/configuration/configure_web.cpp b/src/citron/configuration/configure_web.cpp
index b51e993ec..1cdf0f5a9 100644
--- a/src/citron/configuration/configure_web.cpp
+++ b/src/citron/configuration/configure_web.cpp
@@ -5,43 +5,15 @@
 #include <QMessageBox>
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/settings.h"
-#include "core/telemetry_session.h"
+#include "common/uuid.h"
 #include "ui_configure_web.h"
 #include "citron/configuration/configure_web.h"
 #include "citron/uisettings.h"
 
-static constexpr char token_delimiter{':'};
-
-static std::string GenerateDisplayToken(const std::string& username, const std::string& token) {
-    if (username.empty() || token.empty()) {
-        return {};
-    }
-
-    const std::string unencoded_display_token{username + token_delimiter + token};
-    QByteArray b{unencoded_display_token.c_str()};
-    QByteArray b64 = b.toBase64();
-    return b64.toStdString();
-}
-
-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));
-}
-
-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);
-}
-
 ConfigureWeb::ConfigureWeb(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) {
     ui->setupUi(this);
-    connect(ui->button_regenerate_telemetry_id, &QPushButton::clicked, this,
-            &ConfigureWeb::RefreshTelemetryID);
-    connect(ui->button_verify_login, &QPushButton::clicked, this, &ConfigureWeb::VerifyLogin);
-    connect(&verify_watcher, &QFutureWatcher<bool>::finished, this, &ConfigureWeb::OnLoginVerified);
+    connect(ui->button_reset_token, &QPushButton::clicked, this, &ConfigureWeb::ResetToken);
 
 #ifndef USE_DISCORD_PRESENCE
     ui->discord_group->setVisible(false);
@@ -63,115 +35,51 @@ void ConfigureWeb::changeEvent(QEvent* event) {
 
 void ConfigureWeb::RetranslateUI() {
     ui->retranslateUi(this);
-
-    ui->telemetry_learn_more->setText(
-        tr("<a href='https://citron-emu.org/help/feature/telemetry/'><span style=\"text-decoration: "
-           "underline; color:#039be5;\">Learn more</span></a>"));
-
-    ui->web_signup_link->setText(
-        tr("<a href='https://profile.citron-emu.org/'><span style=\"text-decoration: underline; "
-           "color:#039be5;\">Sign up</span></a>"));
-
-    ui->web_token_info_link->setText(
-        tr("<a href='https://citron-emu.org/wiki/citron-web-service/'><span style=\"text-decoration: "
-           "underline; color:#039be5;\">What is my token?</span></a>"));
-
-    ui->label_telemetry_id->setText(
-        tr("Telemetry ID: 0x%1").arg(QString::number(Core::GetTelemetryId(), 16).toUpper()));
 }
 
 void ConfigureWeb::SetConfiguration() {
     ui->web_credentials_disclaimer->setWordWrap(true);
 
-    ui->telemetry_learn_more->setOpenExternalLinks(true);
-    ui->web_signup_link->setOpenExternalLinks(true);
-    ui->web_token_info_link->setOpenExternalLinks(true);
-
     if (Settings::values.citron_username.GetValue().empty()) {
         ui->username->setText(tr("Unspecified"));
     } else {
         ui->username->setText(QString::fromStdString(Settings::values.citron_username.GetValue()));
     }
 
-    ui->toggle_telemetry->setChecked(Settings::values.enable_telemetry.GetValue());
-    ui->edit_token->setText(QString::fromStdString(GenerateDisplayToken(
-        Settings::values.citron_username.GetValue(), Settings::values.citron_token.GetValue())));
-
-    // Connect after setting the values, to avoid calling OnLoginChanged now
-    connect(ui->edit_token, &QLineEdit::textChanged, this, &ConfigureWeb::OnLoginChanged);
-
-    user_verified = true;
+    ui->edit_token->setText(QString::fromStdString(Settings::values.citron_token.GetValue()));
 
     ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue());
 }
 
 void ConfigureWeb::ApplyConfiguration() {
-    Settings::values.enable_telemetry = ui->toggle_telemetry->isChecked();
     UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked();
-    if (user_verified) {
-        Settings::values.citron_username =
-            UsernameFromDisplayToken(ui->edit_token->text().toStdString());
-        Settings::values.citron_token = TokenFromDisplayToken(ui->edit_token->text().toStdString());
+    if (Settings::values.citron_username.GetValue().empty()) {
+        // Backup: default name should already be set by ConfigureProfileManager::UpdateCurrentUser()
+        Settings::values.citron_username = "torzu";
     } else {
-        QMessageBox::warning(
-            this, tr("Token not verified"),
-            tr("Token was not verified. The change to your token has not been saved."));
+        // If a name already exist, reassign it to itself (needed for change set with a profile switch)
+        Settings::values.citron_username = Settings::values.citron_username.GetValue();
     }
-}
 
-void ConfigureWeb::RefreshTelemetryID() {
-    const u64 new_telemetry_id{Core::RegenerateTelemetryId()};
-    ui->label_telemetry_id->setText(
-        tr("Telemetry ID: 0x%1").arg(QString::number(new_telemetry_id, 16).toUpper()));
-}
-
-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());
+        // If no token specified, automatically generate one
+        Settings::values.citron_token = Common::UUID::MakeRandom().FormattedString();
     } else {
-        user_verified = false;
-
-        // 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"));
+        // Otherwise use user-specified value
+        Settings::values.citron_token = ui->edit_token->text().toStdString();
     }
 }
 
-void ConfigureWeb::VerifyLogin() {
-    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..."));
-    verify_watcher.setFuture(QtConcurrent::run(
-        [username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()),
-         token = TokenFromDisplayToken(ui->edit_token->text().toStdString())] {
-            return Core::VerifyLogin(username, token);
-        }));
-}
-
-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."));
-    }
+void ConfigureWeb::ResetToken() {
+    // Generate and set token
+    const auto token = Common::UUID::MakeRandom().FormattedString();
+    Settings::values.citron_token = token;
+    // Just to display the label_token_icon pic and tooltip for visual confirmation
+    ui->label_token_icon->setPixmap(QIcon::fromTheme(QStringLiteral("checked")).pixmap(16));
+    ui->label_token_icon->setToolTip(tr("Token Changed", "Tooltip"));
+    ui->username->setText(QString::fromStdString(token));
+    // Apply the changes
+    SetConfiguration();
 }
 
 void ConfigureWeb::SetWebServiceConfigEnabled(bool enabled) {