From a68f19d72f4a1c673b864c0308024a97024f6736 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 24 Dec 2023 12:25:05 +0700
Subject: [PATCH 1/2] added migration from version 3 of client management to
 version 4

---
 client/ui/models/clientManagementModel.cpp | 19 +++++++++++++++++++
 client/ui/models/clientManagementModel.h   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/client/ui/models/clientManagementModel.cpp b/client/ui/models/clientManagementModel.cpp
index 8ec31d02..81237917 100644
--- a/client/ui/models/clientManagementModel.cpp
+++ b/client/ui/models/clientManagementModel.cpp
@@ -45,6 +45,23 @@ QVariant ClientManagementModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+void ClientManagementModel::migration(const QByteArray &clientsTableString)
+{
+    QJsonObject clientsTable = QJsonDocument::fromJson(clientsTableString).object();
+
+    for (auto &clientId : clientsTable.keys()) {
+        QJsonObject client;
+        client[configKey::clientId] = clientId;
+
+        QJsonObject userData;
+        userData[configKey::clientName] = clientsTable.value(clientId).toObject().value(configKey::clientName);
+        client[configKey::userData] = userData;
+
+        m_clientsTable.push_back(client);
+    }
+
+}
+
 ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCredentials credentials)
 {
     beginResetModel();
@@ -67,6 +84,8 @@ ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCr
     m_clientsTable = QJsonDocument::fromJson(clientsTableString).array();
 
     if (m_clientsTable.isEmpty()) {
+        migration(clientsTableString);
+
         int count = 0;
 
         if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
diff --git a/client/ui/models/clientManagementModel.h b/client/ui/models/clientManagementModel.h
index 6b6adf68..4bbe3e27 100644
--- a/client/ui/models/clientManagementModel.h
+++ b/client/ui/models/clientManagementModel.h
@@ -35,6 +35,8 @@ protected:
 private:
     bool isClientExists(const QString &clientId);
 
+    void migration(const QByteArray &clientsTableString);
+
     ErrorCode revokeOpenVpn(const int row, const DockerContainer container, ServerCredentials credentials);
     ErrorCode revokeWireGuard(const int row, const DockerContainer container, ServerCredentials credentials);
 

From 8f53d563a42f616f41f8474f50c931eb108fda2d Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 25 Dec 2023 22:49:24 +0700
Subject: [PATCH 2/2] moved the client table for cloak and ss to the openvpn
 folder

---
 client/ui/models/clientManagementModel.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/ui/models/clientManagementModel.cpp b/client/ui/models/clientManagementModel.cpp
index 81237917..08a95353 100644
--- a/client/ui/models/clientManagementModel.cpp
+++ b/client/ui/models/clientManagementModel.cpp
@@ -71,8 +71,14 @@ ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCr
 
     ErrorCode error = ErrorCode::NoError;
 
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
+    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
+        || container == DockerContainer::Cloak) {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
+    } else {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
+    }
+
     const QByteArray clientsTableString =
             serverController.getTextFileFromContainer(container, credentials, clientsTableFile, &error);
     if (error != ErrorCode::NoError) {