Launch KeePassXC password generator popup from the extension

src/browser/BrowserAction.cpp

@@ -23,6 +23,7 @@
 #include "config-keepassx.h"
 #include "core/Global.h"
 #include "core/Tools.h"
+#include "gui/PasswordGeneratorWidget.h"
 
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -59,6 +60,20 @@ namespace
 
 const int BrowserAction::MaxUrlLength = 256;
 
+BrowserAction::BrowserAction()
+{
+    QObject::connect(browserService(),
+                     &BrowserService::passwordGenerated,
+                     browserService(),
+                     [=](const QString& password, const QString& nonce) {
+                         auto newNonce = incrementNonce(nonce);
+                         QJsonObject message = buildMessage(newNonce);
+                         message["password"] = password;
+
+                         browserService()->sendPassword(buildResponse("generate-password", message, newNonce));
+                     });
+}
+
 QJsonObject BrowserAction::processClientMessage(const QJsonObject& json)
 {
     if (json.isEmpty()) {
@@ -315,25 +330,11 @@ QJsonObject BrowserAction::handleGetLogins(const QJsonObject& json, const QStrin
 
 QJsonObject BrowserAction::handleGeneratePassword(const QJsonObject& json, const QString& action)
 {
+    auto errorMessage = getErrorReply(action, ERROR_KEEPASS_ACTION_CANCELLED_OR_DENIED);
     auto nonce = json.value("nonce").toString();
-    auto password = browserSettings()->generatePassword();
-
-    if (nonce.isEmpty() || password.isEmpty()) {
-        return QJsonObject();
-    }
-
-    // For backwards compatibility
-    password["login"] = password["entropy"];
 
-    QJsonArray arr;
-    arr.append(password);
-
-    const QString newNonce = incrementNonce(nonce);
-
-    QJsonObject message = buildMessage(newNonce);
-    message["entries"] = arr;
-
-    return buildResponse(action, message, newNonce);
+    browserService()->showPasswordGenerator(errorMessage, nonce);
+    return QJsonObject();
 }
 
 QJsonObject BrowserAction::handleSetLogin(const QJsonObject& json, const QString& action)

src/browser/BrowserAction.h

@@ -25,7 +25,7 @@ class QJsonObject;
 class BrowserAction
 {
 public:
-    explicit BrowserAction() = default;
+    explicit BrowserAction();
     ~BrowserAction() = default;
 
     QJsonObject processClientMessage(const QJsonObject& json);

src/browser/BrowserService.cpp

@@ -311,6 +311,34 @@ QString BrowserService::getCurrentTotp(const QString& uuid)
     return {};
 }
 
+void BrowserService::showPasswordGenerator(const QJsonObject& errorMessage, const QString& nonce)
+{
+    if (!m_passwordGenerator) {
+        m_passwordGenerator.reset(PasswordGeneratorWidget::popupGenerator());
+
+        connect(m_passwordGenerator.data(), &PasswordGeneratorWidget::closed, m_passwordGenerator.data(), [=] {
+            m_passwordGenerator.reset();
+            m_browserHost->sendClientMessage(errorMessage);
+            hideWindow();
+        });
+
+        connect(m_passwordGenerator.data(),
+                &PasswordGeneratorWidget::appliedPassword,
+                m_passwordGenerator.data(),
+                [=](const QString& password) { emit passwordGenerated(password, nonce); });
+    }
+
+    raiseWindow();
+    m_passwordGenerator->raise();
+    m_passwordGenerator->activateWindow();
+}
+
+void BrowserService::sendPassword(const QJsonObject& message)
+{
+    m_browserHost->sendClientMessage(message);
+    hideWindow();
+}
+
 QString BrowserService::storeKey(const QString& key)
 {
     auto db = getDatabase();

src/browser/BrowserService.h

@@ -21,6 +21,7 @@
 #define BROWSERSERVICE_H
 
 #include "core/Entry.h"
+#include "gui/PasswordGeneratorWidget.h"
 
 typedef QPair<QString, QString> StringPair;
 typedef QList<StringPair> StringPairList;
@@ -55,6 +56,8 @@ class BrowserService : public QObject
     QJsonObject getDatabaseGroups();
     QJsonObject createNewGroup(const QString& groupName);
     QString getCurrentTotp(const QString& uuid);
+    void showPasswordGenerator(const QJsonObject& errorMessage, const QString& nonce);
+    void sendPassword(const QJsonObject& message);
 
     void addEntry(const QString& dbid,
                   const QString& login,
@@ -93,6 +96,7 @@ class BrowserService : public QObject
 
 signals:
     void requestUnlock();
+    void passwordGenerated(const QString& password, const QString& nonce);
 
 public slots:
     void databaseLocked(DatabaseWidget* dbWidget);
@@ -145,9 +149,9 @@ private slots:
     QString getDatabaseRecycleBinUuid();
     bool checkLegacySettings(QSharedPointer<Database> db);
     QStringList getEntryURLs(const Entry* entry);
-
     void hideWindow() const;
     void raiseWindow(const bool force = false);
+
     void updateWindowState();
 
     static bool moveSettingsToCustomData(Entry* entry, const QString& name);
@@ -162,6 +166,7 @@ private slots:
     QUuid m_keepassBrowserUUID;
 
     QPointer<DatabaseWidget> m_currentDatabaseWidget;
+    QScopedPointer<PasswordGeneratorWidget> m_passwordGenerator;
 
     Q_DISABLE_COPY(BrowserService);