cleanup ConnectionController

pglab/ConnectionController.cpp

@@ -83,14 +83,14 @@ void ConnectionController::createConnection()
 {
 	ConnectionConfig cc;
 	cc.setUuid(QUuid::createUuid());
-    ConnectionConfigurationWidget::editExistingInWindow(this, cc, [this] (ConnectionConfigurationWidget &w) -> void { saveConnection(w); });
+    editConfig(cc);
 }
 
 void ConnectionController::editConnection(QModelIndex index)
 {
 	auto config = ConnectionTreeModel::getConfigFromModelIndex(index);
 	if (config) {
-        ConnectionConfigurationWidget::editExistingInWindow(this, *config, [this] (ConnectionConfigurationWidget &w) -> void { saveConnection(w); });
+        editConfig(*config);
     }
 }
 
@@ -100,10 +100,16 @@ void ConnectionController::editCopy(QModelIndex index)
     if (config) {
         auto cc = *config;
         cc.setUuid(QUuid::createUuid());
-        ConnectionConfigurationWidget::editExistingInWindow(this, cc, [this] (ConnectionConfigurationWidget &w) -> void { saveConnection(w); });
+        editConfig(cc);
     }
 }
 
+void ConnectionController::editConfig(ConnectionConfig &cc)
+{
+    ConnectionConfigurationWidget::editExistingInWindow(this, cc,
+            [this] (ConnectionConfigurationWidget &w) -> void { saveConnection(w); });
+}
+
 void ConnectionController::saveConnection(ConnectionConfigurationWidget &w)
 {
     auto cc = w.data();
@@ -219,28 +225,50 @@ bool ConnectionController::UnlockPasswordManagerIfNeeded()
 
 		while (true) {
 			//   ask user for passphrase
+            PassphraseResult pp_result = PassphrasePrompt();
+            if (!pp_result.success)
+                break; // leave this retry loop
+
+			// user gave OK, if succeeds return true otherwise loop a prompt for password again.
+            if (m_passwordManager->openDatabase(user_cfg_db, pp_result.passphrase)) {
+                setRelockTimer(pp_result.rememberForMinutes);
+				return true;
+			}
+		}
+	}
+	else {
+        InitializePasswordManager();
+	}
+    return false;
+}
+
+void ConnectionController::setRelockTimer(int rem_minutes)
+{
+    if (rem_minutes >= 0) {
+        int timeout = rem_minutes * 60 * 1000; /// rem is in minutes, timeout in millisec
+        m_relockTimer->start(timeout);
+    }
+}
+
+PassphraseResult ConnectionController::PassphrasePrompt()
+{
     auto dlg = std::make_unique<PasswordPromptDialog>(PasswordPromptDialog::RememberPassword, nullptr);
     dlg->setCaption(tr("Unlock password manager"));
     dlg->setDescription(tr("Enter password for password manager"));
     int exec_result = dlg->exec();
     bool ok = (exec_result == QDialog::Accepted);
 
-			if (!ok) {
+    PassphraseResult result;
-				// leave this retry loop
+    result.success = ok;
-				break;
+    if (ok) {
+        result.passphrase = dlg->password();
+        result.rememberForMinutes = dlg->remember();
     }
-			// user gave OK, if succeeds return true otherwise loop a prompt for password again.
+    return result;
-			if (m_passwordManager->openDatabase(user_cfg_db, dlg->password())) {
-				int rem = dlg->remember();
-				if (rem >= 0) {
-					int timeout = rem * 60 * 1000; /// rem is in minutes, timeout in millisec
-					m_relockTimer->start(timeout);
 }
-				return true;
+
-			}
+bool ConnectionController::InitializePasswordManager()
-		}
+{
-	}
-	else {
     // Ask user for passphrase + confirmation, clearly instruct this is first setup
     // create
     auto dlg = std::make_unique<PasswordPromptDialog>(PasswordPromptDialog::ConfirmPassword, nullptr);
@@ -251,10 +279,10 @@ bool ConnectionController::UnlockPasswordManagerIfNeeded()
     int exec_result = dlg->exec();
     if (exec_result == QDialog::Accepted) {
         QString passphrase = dlg->password();
+        auto&& user_cfg_db = m_masterController->userConfigDatabase();
         if (m_passwordManager->createDatabase(user_cfg_db, passphrase))
             return true;
     }
-	}
     return false;
 }
 

pglab/ConnectionController.h

@@ -13,6 +13,15 @@ class ConnectionManagerWindow;
 class PasswordManager;
 class QTimer;
 
+
+class PassphraseResult {
+public:
+    bool success;
+    QString passphrase;
+    int rememberForMinutes;
+};
+
+
 class ConnectionController : public QObject {
 	Q_OBJECT
 public:
@@ -69,7 +78,12 @@ private:
 
     static std::string getPskId(QUuid connectionid);
 
+    void editConfig(ConnectionConfig &cc);
     void saveConnection(ConnectionConfigurationWidget &w);
+    void setRelockTimer(int rem_minutes);
+    PassphraseResult PassphrasePrompt();
+    /// Asks user for new passphares and initialize the password manager.
+    bool InitializePasswordManager();
 private slots:
 	void relock();
 };