#3638 websockettokendialog: fix issue with showing edited token instead of stored token

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 26.6.6
 
+- Fixed the **Security token** dialog for the QOwnNotes Web Companion browser
+  extension to keep generated or edited tokens only when pressing **OK**, so
+  closing the dialog with **Cancel** no longer changes the token for the
+  current application session (for [#3638](https://github.com/pbek/QOwnNotes/issues/3638))
 - There was a new release of the **QOwnNotes Web Companion browser extension**
   [2026.6.0](https://github.com/qownnotes/web-companion/releases/tag/v2026.6.0)
   - The extension build tooling was updated to Quasar App Vite 3 / Rolldown

src/dialogs/websockettokendialog.cpp

@@ -2,6 +2,7 @@
 
 #include <utils/misc.h>
 
+#include <QShowEvent>
 #include <QtGui/QClipboard>
 
 #include "services/settingsservice.h"
@@ -11,31 +12,32 @@ WebSocketTokenDialog::WebSocketTokenDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::WebSocketTokenDialog) {
     ui->setupUi(this);
     afterSetupUI();
+}
+
+QString WebSocketTokenDialog::generateToken() const { return Utils::Misc::generateRandomString(8); }
+
+WebSocketTokenDialog::~WebSocketTokenDialog() { delete ui; }
 
+void WebSocketTokenDialog::loadTokenFromSettings() {
     SettingsService settings;
-    QString token = settings.value(QStringLiteral("webSocketServerService/token")).toString();
+    _initialToken = settings.value(QStringLiteral("webSocketServerService/token")).toString();
 
-    if (token.isEmpty()) {
-        on_generateButton_clicked();
+    if (_initialToken.isEmpty()) {
+        ui->tokenLineEdit->setText(generateToken());
+        on_copyButton_clicked();
     } else {
-        ui->tokenLineEdit->setText(token);
+        ui->tokenLineEdit->setText(_initialToken);
         on_copyButton_clicked();
     }
 }
 
-QString WebSocketTokenDialog::generateToken() const { return Utils::Misc::generateRandomString(8); }
-
-WebSocketTokenDialog::~WebSocketTokenDialog() { delete ui; }
-
 void WebSocketTokenDialog::on_copyButton_clicked() {
     QClipboard *clipboard = QApplication::clipboard();
     clipboard->setText(ui->tokenLineEdit->text());
 }
 
 void WebSocketTokenDialog::on_generateButton_clicked() {
     QString token = generateToken();
-    SettingsService settings;
-    settings.setValue(QStringLiteral("webSocketServerService/token"), token);
     ui->tokenLineEdit->setText(token);
     on_copyButton_clicked();
 }
@@ -44,3 +46,16 @@ void WebSocketTokenDialog::on_buttonBox_accepted() {
     SettingsService settings;
     settings.setValue(QStringLiteral("webSocketServerService/token"), ui->tokenLineEdit->text());
 }
+
+void WebSocketTokenDialog::reject() {
+    SettingsService settings;
+    settings.setValue(QStringLiteral("webSocketServerService/token"), _initialToken);
+    ui->tokenLineEdit->setText(_initialToken.isEmpty() ? generateToken() : _initialToken);
+
+    MasterDialog::reject();
+}
+
+void WebSocketTokenDialog::showEvent(QShowEvent *event) {
+    loadTokenFromSettings();
+    MasterDialog::showEvent(event);
+}

src/dialogs/websockettokendialog.h

@@ -5,6 +5,8 @@
 
 #include "masterdialog.h"
 
+class QShowEvent;
+
 namespace Ui {
 class WebSocketTokenDialog;
 }
@@ -16,6 +18,11 @@ class WebSocketTokenDialog : public MasterDialog {
     explicit WebSocketTokenDialog(QWidget *parent = 0);
     ~WebSocketTokenDialog();
 
+    void reject() override;
+
+   protected:
+    void showEvent(QShowEvent *event) override;
+
    private slots:
     void on_copyButton_clicked();
 
@@ -25,8 +32,10 @@ class WebSocketTokenDialog : public MasterDialog {
 
    private:
     Ui::WebSocketTokenDialog *ui;
+    QString _initialToken;
 
     QString generateToken() const;
+    void loadTokenFromSettings();
 };
 
 #endif    // WEBSOCKETTOKENDIALOG_H