Final Cut

returned condition before enable --now docker

client/amnezia_application.cpp

@@ -279,7 +279,7 @@ void AmneziaApplication::initModels()
 {
     m_containersModel.reset(new ContainersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
-    connect(m_configurator.get(), &VpnConfigurator::newVpnConfigCreated, m_containersModel.get(),
+    connect(m_vpnConnection.get(), &VpnConnection::newVpnConfigurationCreated, m_containersModel.get(),
             &ContainersModel::updateContainersConfig);
 
     m_serversModel.reset(new ServersModel(m_settings, this));
@@ -324,11 +324,6 @@ void AmneziaApplication::initModels()
 
     m_sftpConfigModel.reset(new SftpConfigModel(this));
     m_engine->rootContext()->setContextProperty("SftpConfigModel", m_sftpConfigModel.get());
-
-    m_clientManagementModel.reset(new ClientManagementModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("ClientManagementModel", m_clientManagementModel.get());
-    connect(m_configurator.get(), &VpnConfigurator::newVpnConfigCreated, m_clientManagementModel.get(),
-            &ClientManagementModel::appendClient);
 }
 
 void AmneziaApplication::initControllers()
@@ -354,12 +349,12 @@ void AmneziaApplication::initControllers()
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
 
-    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_clientManagementModel, m_settings, m_configurator));
+    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_settings, m_configurator));
     m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
 
     m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_settings));
     m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
-    if (m_settingsController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
+    if (m_settingsController->isAutoStartEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
         QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); });
     }
 

client/amnezia_application.h

@@ -39,7 +39,6 @@
 #include "ui/models/servers_model.h"
 #include "ui/models/services/sftpConfigModel.h"
 #include "ui/models/sites_model.h"
-#include "ui/models/clientManagementModel.h"
 
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))
 
@@ -95,7 +94,6 @@ private:
     QSharedPointer<LanguageModel> m_languageModel;
     QSharedPointer<ProtocolsModel> m_protocolsModel;
     QSharedPointer<SitesModel> m_sitesModel;
-    QSharedPointer<ClientManagementModel> m_clientManagementModel;
 
     QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
     QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;

client/configurators/awg_configurator.cpp

@@ -10,10 +10,11 @@ AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, QObject *pa
 {
 }
 
-QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials, DockerContainer container,
-                                      const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode)
+QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials,
+                                                                DockerContainer container,
+                                                                const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
-    QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, clientId, errorCode);
+    QString config = WireguardConfigurator::genWireguardConfig(credentials, container, containerConfig, errorCode);
 
     QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
     QString awgConfig = jsonConfig.value(config_key::config).toString();

client/configurators/awg_configurator.h

@@ -12,7 +12,7 @@ public:
     AwgConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
     QString genAwgConfig(const ServerCredentials &credentials, DockerContainer container,
-                         const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);
+                                      const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 };
 
 #endif // AWGCONFIGURATOR_H

client/configurators/openvpn_configurator.cpp

@@ -83,7 +83,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co
 }
 
 QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
-                                              const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode)
+                                              const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     ServerController serverController(m_settings);
     QString config =
@@ -113,8 +113,6 @@ QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentia
     QJsonObject jConfig;
     jConfig[config_key::config] = config;
 
-    clientId = connData.clientId;
-
     return QJsonDocument(jConfig).toJson();
 }
 
@@ -133,13 +131,13 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
         config.append("block-ipv6\n");
     }
     if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
-
+        
         // no redirect-gateway
     }
     if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-#ifndef Q_OS_ANDROID
+#ifndef Q_OS_ANDROID    
         config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
-#endif
+#endif       
         // Prevent ipv6 leak
         config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
         config.append("block-ipv6\n");

client/configurators/openvpn_configurator.h

@@ -24,7 +24,7 @@ public:
     };
 
     QString genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
-        const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);
+        const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     QString processConfigWithLocalSettings(QString jsonConfig);
     QString processConfigWithExportSettings(QString jsonConfig);

client/configurators/vpn_configurator.cpp

@@ -28,11 +28,11 @@ VpnConfigurator::VpnConfigurator(std::shared_ptr<Settings> settings, QObject *pa
 }
 
 QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
-                                              const QJsonObject &containerConfig, Proto proto, QString &clientId, ErrorCode *errorCode)
+                                              const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode)
 {
     switch (proto) {
     case Proto::OpenVpn:
-        return openVpnConfigurator->genOpenVpnConfig(credentials, container, containerConfig, clientId, errorCode);
+        return openVpnConfigurator->genOpenVpnConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::ShadowSocks:
         return shadowSocksConfigurator->genShadowSocksConfig(credentials, container, containerConfig, errorCode);
@@ -40,10 +40,10 @@ QString VpnConfigurator::genVpnProtocolConfig(const ServerCredentials &credentia
     case Proto::Cloak: return cloakConfigurator->genCloakConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::WireGuard:
-        return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, clientId, errorCode);
+        return wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::Awg:
-        return awgConfigurator->genAwgConfig(credentials, container, containerConfig, clientId, errorCode);
+        return awgConfigurator->genAwgConfig(credentials, container, containerConfig, errorCode);
 
     case Proto::Ikev2: return ikev2Configurator->genIkev2Config(credentials, container, containerConfig, errorCode);
 

client/configurators/vpn_configurator.h

@@ -6,6 +6,7 @@
 #include "configurator_base.h"
 #include "core/defs.h"
 
+
 class OpenVpnConfigurator;
 class ShadowSocksConfigurator;
 class CloakConfigurator;
@@ -15,15 +16,14 @@ class SshConfigurator;
 class AwgConfigurator;
 
 // Retrieve connection settings from server
-class VpnConfigurator : public ConfiguratorBase
+class VpnConfigurator : ConfiguratorBase
 {
     Q_OBJECT
 public:
     explicit VpnConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 
     QString genVpnProtocolConfig(const ServerCredentials &credentials, DockerContainer container,
-                                 const QJsonObject &containerConfig, Proto proto, QString &clientId,
-                                 ErrorCode *errorCode = nullptr);
+        const QJsonObject &containerConfig, Proto proto, ErrorCode *errorCode = nullptr);
 
     QPair<QString, QString> getDnsForConfig(int serverIndex);
     QString &processConfigWithDnsSettings(int serverIndex, DockerContainer container, Proto proto, QString &config);
@@ -32,8 +32,8 @@ public:
     QString &processConfigWithExportSettings(int serverIndex, DockerContainer container, Proto proto, QString &config);
 
     // workaround for containers which is not support normal configuration
-    void updateContainerConfigAfterInstallation(DockerContainer container, QJsonObject &containerConfig,
-                                                const QString &stdOut);
+    void updateContainerConfigAfterInstallation(DockerContainer container,
+        QJsonObject &containerConfig, const QString &stdOut);
 
     std::shared_ptr<OpenVpnConfigurator> openVpnConfigurator;
     std::shared_ptr<ShadowSocksConfigurator> shadowSocksConfigurator;
@@ -42,10 +42,6 @@ public:
     std::shared_ptr<Ikev2Configurator> ikev2Configurator;
     std::shared_ptr<SshConfigurator> sshConfigurator;
     std::shared_ptr<AwgConfigurator> awgConfigurator;
-
-signals:
-    void newVpnConfigCreated(const QString &clientId, const QString &clientName, const DockerContainer container,
-                             ServerCredentials credentials);
 };
 
 #endif // VPN_CONFIGURATOR_H

client/configurators/wireguard_configurator.cpp

@@ -177,7 +177,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
 }
 
 QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                  const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode)
+                                                  const QJsonObject &containerConfig, ErrorCode *errorCode)
 {
     ServerController serverController(m_settings);
     QString scriptData = amnezia::scriptData(m_configTemplate, container);
@@ -205,8 +205,6 @@ QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &crede
     jConfig[config_key::psk_key] = connData.pskKey;
     jConfig[config_key::server_pub_key] = connData.serverPubKey;
 
-    clientId = connData.clientPubKey;
-
     return QJsonDocument(jConfig).toJson();
 }
 

client/configurators/wireguard_configurator.h

@@ -26,7 +26,7 @@ public:
     };
 
     QString genWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
-                               const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);
+                               const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
 
     QString processConfigWithLocalSettings(QString config);
     QString processConfigWithExportSettings(QString config);

client/core/defs.h

@@ -47,6 +47,7 @@ enum ErrorCode
     SshSftpNoMediaError,
 
     // Local errors
+    FailedToSaveConfigData,
     OpenVpnConfigMissing,
     OpenVpnManagementServerError,
     ConfigMissing,
@@ -66,6 +67,7 @@ enum ErrorCode
 
     // 3rd party utils errors
     OpenSslFailed,
+    OpenVpnExecutableCrashed,
     ShadowSocksExecutableCrashed,
     CloakExecutableCrashed,
 

client/core/errorstrings.cpp

@@ -42,6 +42,7 @@ QString errorString(ErrorCode code){
     case(SshSftpNoMediaError): return QObject::tr("Sftp error: No media was in remote drive");
 
     // Local errors
+    case (FailedToSaveConfigData): return QObject::tr("Failed to save config to disk");
     case (OpenVpnConfigMissing): return QObject::tr("OpenVPN config missing");
     case (OpenVpnManagementServerError): return QObject::tr("OpenVPN management server error");
 

client/images/controls/close.svg

@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="x, &#195;&#151;, close">
-<path id="Vector" d="M18 6L6 18" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path id="Vector_2" d="M6 6L18 18" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-</svg>

client/images/controls/search.svg

@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="search">
-<path id="Vector" d="M11 19C15.4183 19 19 15.4183 19 11C19 6.58172 15.4183 3 11 3C6.58172 3 3 6.58172 3 11C3 15.4183 6.58172 19 11 19Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path id="Vector_2" d="M21.0004 20.9984L16.6504 16.6484" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-</svg>

client/resources.qrc

@@ -222,8 +222,5 @@
         <file>server_scripts/awg/configure_container.sh</file>
         <file>server_scripts/awg/run_container.sh</file>
         <file>server_scripts/awg/Dockerfile</file>
-        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
-        <file>images/controls/close.svg</file>
-        <file>images/controls/search.svg</file>
     </qresource>
 </RCC>

client/server_scripts/check_server_is_busy.sh

@@ -1,6 +1,5 @@
 if which apt-get > /dev/null 2>&1; then LOCK_FILE="/var/lib/dpkg/lock-frontend";\
 elif which dnf > /dev/null 2>&1; then LOCK_FILE="/var/run/dnf.pid";\
 elif which yum > /dev/null 2>&1; then LOCK_FILE="/var/run/yum.pid";\
-elif which pacman > /dev/null 2>&1; then LOCK_FILE="/var/lib/pacman/db.lck";\
 else echo "Packet manager not found"; echo "Internal error"; exit 1; fi;\
-if command -v fuser > /dev/null 2>&1; then sudo fuser $LOCK_FILE 2>/dev/null; else echo "fuser not installed"; fi
+if command -v fuser > /dev/null 2>&1; then sudo fuser $LOCK_FILE 2>/dev/null; else  echo "fuser not installed"; fi

client/server_scripts/install_docker.sh

@@ -1,7 +1,6 @@
 if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); silent_inst="-yq install"; check_pkgs="-yq update"; docker_pkg="docker.io"; dist="debian";\
 elif which dnf > /dev/null 2>&1; then pm=$(which dnf); silent_inst="-yq install"; check_pkgs="-yq check-update"; docker_pkg="docker"; dist="fedora";\
 elif which yum > /dev/null 2>&1; then pm=$(which yum); silent_inst="-y -q install"; check_pkgs="-y -q check-update"; docker_pkg="docker"; dist="centos";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="--noconfirm -S"; check_pkgs="> /dev/null 2>&1"; docker_pkg="docker"; dist="archlinux";\
 else echo "Packet manager not found"; exit 1; fi;\
 echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, Check pkgs command: $check_pkgs, Docker pkg: $docker_pkg";\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
@@ -9,12 +8,10 @@ if ! command -v sudo > /dev/null 2>&1; then $pm $check_pkgs; $pm $silent_inst su
 if ! command -v fuser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst psmisc; fi;\
 if ! command -v lsof > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst lsof; fi;\
 if ! command -v docker > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
-  if [ "$dist" = "fedora" ] || [ "$dist" = "centos" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
+  sleep 5 && sudo systemctl enable --now docker && sleep 5;\
 fi;\
-if [ "$dist" = "debian" ]; then \
-  docker_service=$(systemctl list-units --full --all | grep docker.service | grep -v inactive | grep -v dead | grep -v failed);\
-  if [ -z "$docker_service" ]; then sudo $pm $check_pkgs; sudo $pm $silent_inst curl $docker_pkg; fi;\
-  sleep 3 && sudo systemctl start docker && sleep 3;\
+if [ "$(systemctl is-active docker)" != "active" ]; then sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
+  sleep 5 && sudo systemctl start docker && sleep 5;\
 fi;\
 if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker"; exit 1; fi;\
 docker --version

client/ui/controllers/exportController.cpp

@@ -8,9 +8,7 @@
 #include <QImage>
 #include <QStandardPaths>
 
-#include "configurators/cloak_configurator.h"
 #include "configurators/openvpn_configurator.h"
-#include "configurators/shadowsocks_configurator.h"
 #include "configurators/wireguard_configurator.h"
 #include "core/errorstrings.h"
 #include "systemController.h"
@@ -21,13 +19,11 @@
 
 ExportController::ExportController(const QSharedPointer<ServersModel> &serversModel,
                                    const QSharedPointer<ContainersModel> &containersModel,
-                                   const QSharedPointer<ClientManagementModel> &clientManagementModel,
                                    const std::shared_ptr<Settings> &settings,
                                    const std::shared_ptr<VpnConfigurator> &configurator, QObject *parent)
     : QObject(parent),
       m_serversModel(serversModel),
       m_containersModel(containersModel),
-      m_clientManagementModel(clientManagementModel),
       m_settings(settings),
       m_configurator(configurator)
 {
@@ -79,12 +75,13 @@ void ExportController::generateFullAccessConfigAndroid()
 }
 #endif
 
-void ExportController::generateConnectionConfig(const QString &clientName)
+void ExportController::generateConnectionConfig()
 {
     clearPreviousConfig();
 
     int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials credentials = m_serversModel->getCurrentlyProcessedServerCredentials();
+    ServerCredentials credentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
     QModelIndex containerModelIndex = m_containersModel->index(container);
@@ -96,25 +93,17 @@ void ExportController::generateConnectionConfig(const QString &clientName)
     for (Proto protocol : ContainerProps::protocolsForContainer(container)) {
         QJsonObject protocolConfig = m_settings->protocolConfig(serverIndex, container, protocol);
 
-        QString clientId;
-        QString vpnConfig = m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, protocol,
-                                                                 clientId, &errorCode);
+        QString vpnConfig =
+                m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, protocol, &errorCode);
         if (errorCode) {
             emit exportErrorOccurred(errorString(errorCode));
             return;
         }
         protocolConfig.insert(config_key::last_config, vpnConfig);
         containerConfig.insert(ProtocolProps::protoToString(protocol), protocolConfig);
-        if (protocol == Proto::OpenVpn || protocol == Proto::Awg || protocol == Proto::WireGuard) {
-            errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
-            if (errorCode) {
-                emit exportErrorOccurred(errorString(errorCode));
-                return;
-            }
-        }
     }
 
-    QJsonObject config = m_settings->server(serverIndex); // todo change to servers_model
+    QJsonObject config = m_settings->server(serverIndex);
     if (!errorCode) {
         config.remove(config_key::userName);
         config.remove(config_key::password);
@@ -137,127 +126,7 @@ void ExportController::generateConnectionConfig(const QString &clientName)
     emit exportConfigChanged();
 }
 
-void ExportController::generateOpenVpnConfig(const QString &clientName)
-{
-    clearPreviousConfig();
-
-    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials credentials = m_serversModel->getCurrentlyProcessedServerCredentials();
-
-    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
-    QModelIndex containerModelIndex = m_containersModel->index(container);
-    QJsonObject containerConfig =
-            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
-    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
-
-    ErrorCode errorCode = ErrorCode::NoError;
-    QString clientId;
-    QString config = m_configurator->openVpnConfigurator->genOpenVpnConfig(credentials, container, containerConfig,
-                                                                           clientId, &errorCode);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::OpenVpn, config);
-
-    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
-    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : lines) {
-        m_config.append(line + "\n");
-    }
-
-    m_qrCodes = generateQrCodeImageSeries(m_config.toUtf8());
-
-    errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-
-    emit exportConfigChanged();
-}
-
-void ExportController::generateWireGuardConfig(const QString &clientName)
-{
-    clearPreviousConfig();
-
-    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials credentials = m_serversModel->getCurrentlyProcessedServerCredentials();
-
-    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
-    QModelIndex containerModelIndex = m_containersModel->index(container);
-    QJsonObject containerConfig =
-            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
-    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
-
-    QString clientId;
-    ErrorCode errorCode = ErrorCode::NoError;
-    QString config = m_configurator->wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig,
-                                                                               clientId, &errorCode);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::WireGuard, config);
-
-    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
-    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : lines) {
-        m_config.append(line + "\n");
-    }
-
-    qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(m_config.toUtf8(), qrcodegen::QrCode::Ecc::LOW);
-    m_qrCodes << svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
-
-    errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-
-    emit exportConfigChanged();
-}
-
-void ExportController::generateShadowSocksConfig()
-{
-    clearPreviousConfig();
-
-    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
-    ServerCredentials credentials =
-            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
-
-    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
-    QModelIndex containerModelIndex = m_containersModel->index(container);
-    QJsonObject containerConfig =
-            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
-    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
-
-    ErrorCode errorCode = ErrorCode::NoError;
-    QString config = m_configurator->shadowSocksConfigurator->genShadowSocksConfig(credentials, container,
-                                                                                   containerConfig, &errorCode);
-
-    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::ShadowSocks, config);
-    QJsonObject configJson = QJsonDocument::fromJson(config.toUtf8()).object();
-
-    QStringList lines = QString(QJsonDocument(configJson).toJson()).replace("\r", "").split("\n");
-    for (const QString &line : lines) {
-        m_config.append(line + "\n");
-    }
-
-    m_nativeConfigString =
-            QString("%1:%2@%3:%4")
-                    .arg(configJson.value("method").toString(), configJson.value("password").toString(),
-                         configJson.value("server").toString(), configJson.value("server_port").toString());
-
-    m_nativeConfigString = "ss://" + m_nativeConfigString.toUtf8().toBase64();
-
-    qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(m_nativeConfigString.toUtf8(), qrcodegen::QrCode::Ecc::LOW);
-    m_qrCodes << svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
-
-    emit exportConfigChanged();
-}
-
-void ExportController::generateCloakConfig()
+void ExportController::generateOpenVpnConfig()
 {
     clearPreviousConfig();
 
@@ -273,19 +142,47 @@ void ExportController::generateCloakConfig()
 
     ErrorCode errorCode = ErrorCode::NoError;
     QString config =
-            m_configurator->cloakConfigurator->genCloakConfig(credentials, container, containerConfig, &errorCode);
-
+            m_configurator->openVpnConfigurator->genOpenVpnConfig(credentials, container, containerConfig, &errorCode);
     if (errorCode) {
         emit exportErrorOccurred(errorString(errorCode));
         return;
     }
-    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::Cloak, config);
-    QJsonObject configJson = QJsonDocument::fromJson(config.toUtf8()).object();
+    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::OpenVpn, config);
 
-    configJson.remove(config_key::transport_proto);
-    configJson.insert("ProxyMethod", "shadowsocks");
+    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
+    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
+    for (const QString &line : lines) {
+        m_config.append(line + "\n");
+    }
 
-    QStringList lines = QString(QJsonDocument(configJson).toJson()).replace("\r", "").split("\n");
+    emit exportConfigChanged();
+}
+
+void ExportController::generateWireGuardConfig()
+{
+    clearPreviousConfig();
+
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
+    ServerCredentials credentials =
+            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
+
+    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
+    QModelIndex containerModelIndex = m_containersModel->index(container);
+    QJsonObject containerConfig =
+            qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, ContainersModel::Roles::ConfigRole));
+    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
+
+    ErrorCode errorCode = ErrorCode::NoError;
+    QString config = m_configurator->wireguardConfigurator->genWireguardConfig(credentials, container, containerConfig,
+                                                                               &errorCode);
+    if (errorCode) {
+        emit exportErrorOccurred(errorString(errorCode));
+        return;
+    }
+    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::WireGuard, config);
+
+    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
+    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
     for (const QString &line : lines) {
         m_config.append(line + "\n");
     }
@@ -298,11 +195,6 @@ QString ExportController::getConfig()
     return m_config;
 }
 
-QString ExportController::getNativeConfigString()
-{
-    return m_nativeConfigString;
-}
-
 QList<QString> ExportController::getQrCodes()
 {
     return m_qrCodes;
@@ -313,30 +205,6 @@ void ExportController::exportConfig(const QString &fileName)
     SystemController::saveFile(fileName, m_config);
 }
 
-void ExportController::updateClientManagementModel(const DockerContainer container, ServerCredentials credentials)
-{
-    ErrorCode errorCode = m_clientManagementModel->updateModel(container, credentials);
-    if (errorCode != ErrorCode::NoError) {
-        emit exportErrorOccurred(errorString(errorCode));
-    }
-}
-
-void ExportController::revokeConfig(const int row, const DockerContainer container, ServerCredentials credentials)
-{
-    ErrorCode errorCode = m_clientManagementModel->revokeClient(row, container, credentials);
-    if (errorCode != ErrorCode::NoError) {
-        emit exportErrorOccurred(errorString(errorCode));
-    }
-}
-
-void ExportController::renameClient(const int row, const QString &clientName, const DockerContainer container, ServerCredentials credentials)
-{
-    ErrorCode errorCode = m_clientManagementModel->renameClient(row, clientName, container, credentials);
-    if (errorCode != ErrorCode::NoError) {
-        emit exportErrorOccurred(errorString(errorCode));
-    }
-}
-
 QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)
 {
     double k = 850;
@@ -351,7 +219,7 @@ QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &dat
         QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
 
         qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(ba, qrcodegen::QrCode::Ecc::LOW);
-        QString svg = QString::fromStdString(toSvgString(qr, 1));
+        QString svg = QString::fromStdString(toSvgString(qr, 0));
         chunks.append(svgToBase64(svg));
     }
 
@@ -371,6 +239,5 @@ int ExportController::getQrCodesCount()
 void ExportController::clearPreviousConfig()
 {
     m_config.clear();
-    m_nativeConfigString.clear();
     m_qrCodes.clear();
 }

client/ui/controllers/exportController.h

@@ -6,7 +6,6 @@
 #include "configurators/vpn_configurator.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/servers_model.h"
-#include "ui/models/clientManagementModel.h"
 #ifdef Q_OS_ANDROID
     #include "platforms/android/authResultReceiver.h"
 #endif
@@ -17,36 +16,27 @@ class ExportController : public QObject
 public:
     explicit ExportController(const QSharedPointer<ServersModel> &serversModel,
                               const QSharedPointer<ContainersModel> &containersModel,
-                              const QSharedPointer<ClientManagementModel> &clientManagementModel,
                               const std::shared_ptr<Settings> &settings,
                               const std::shared_ptr<VpnConfigurator> &configurator, QObject *parent = nullptr);
 
     Q_PROPERTY(QList<QString> qrCodes READ getQrCodes NOTIFY exportConfigChanged)
     Q_PROPERTY(int qrCodesCount READ getQrCodesCount NOTIFY exportConfigChanged)
     Q_PROPERTY(QString config READ getConfig NOTIFY exportConfigChanged)
-    Q_PROPERTY(QString nativeConfigString READ getNativeConfigString NOTIFY exportConfigChanged)
 
 public slots:
     void generateFullAccessConfig();
 #if defined(Q_OS_ANDROID)
     void generateFullAccessConfigAndroid();
 #endif
-    void generateConnectionConfig(const QString &clientName);
-    void generateOpenVpnConfig(const QString &clientName);
-    void generateWireGuardConfig(const QString &clientName);
-    void generateShadowSocksConfig();
-    void generateCloakConfig();
+    void generateConnectionConfig();
+    void generateOpenVpnConfig();
+    void generateWireGuardConfig();
 
     QString getConfig();
-    QString getNativeConfigString();
     QList<QString> getQrCodes();
 
     void exportConfig(const QString &fileName);
 
-    void updateClientManagementModel(const DockerContainer container, ServerCredentials credentials);
-    void revokeConfig(const int row, const DockerContainer container, ServerCredentials credentials);
-    void renameClient(const int row, const QString &clientName, const DockerContainer container, ServerCredentials credentials);
-
 signals:
     void generateConfig(int type);
     void exportErrorOccurred(const QString &errorMessage);
@@ -65,12 +55,10 @@ private:
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
-    QSharedPointer<ClientManagementModel> m_clientManagementModel;
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;
 
     QString m_config;
-    QString m_nativeConfigString;
     QList<QString> m_qrCodes;
 
 #ifdef Q_OS_ANDROID

client/ui/controllers/pageController.h

@@ -51,9 +51,7 @@ namespace PageLoader
         PageProtocolWireGuardSettings,
         PageProtocolAwgSettings,
         PageProtocolIKev2Settings,
-        PageProtocolRaw,
-
-        PageShareFullAccess
+        PageProtocolRaw
     };
     Q_ENUM_NS(PageEnum)
 

client/ui/models/clientManagementModel.cpp

@@ -1,373 +1,104 @@
 #include "clientManagementModel.h"
 
-#include <QJsonDocument>
 #include <QJsonObject>
 
-#include "core/servercontroller.h"
-#include "logger.h"
-
-namespace
+ClientManagementModel::ClientManagementModel(QObject *parent) : QAbstractListModel(parent)
 {
-    Logger logger("ClientManagementModel");
 
-    namespace configKey {
-        constexpr char clientId[] = "clientId";
-        constexpr char clientName[] = "clientName";
-        constexpr char container[] = "container";
-        constexpr char userData[] = "userData";
-    }
 }
 
-ClientManagementModel::ClientManagementModel(std::shared_ptr<Settings> settings, QObject *parent)
-    : m_settings(settings), QAbstractListModel(parent)
+void ClientManagementModel::clearData()
 {
+    beginResetModel();
+    m_content.clear();
+    endResetModel();
+}
+
+void ClientManagementModel::setContent(const QVector<QVariant> &data)
+{
+    beginResetModel();
+    m_content = data;
+    endResetModel();
+}
+
+QJsonObject ClientManagementModel::getContent(amnezia::Proto protocol)
+{
+    QJsonObject clientsTable;
+    for (const auto &item : m_content) {
+        if (protocol == amnezia::Proto::OpenVpn) {
+            clientsTable[item.toJsonObject()["openvpnCertId"].toString()] = item.toJsonObject();
+        } else if (protocol == amnezia::Proto::WireGuard) {
+            clientsTable[item.toJsonObject()["wireguardPublicKey"].toString()] = item.toJsonObject();
+        }
+    }
+    return clientsTable;
 }
 
 int ClientManagementModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    return static_cast<int>(m_clientsTable.size());
+    return static_cast<int>(m_content.size());
 }
 
 QVariant ClientManagementModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_clientsTable.size())) {
+    if (!index.isValid() || index.row() < 0
+            || index.row() >= static_cast<int>(m_content.size())) {
         return QVariant();
     }
 
-    auto client = m_clientsTable.at(index.row()).toObject();
-    auto userData = client.value(configKey::userData).toObject();
-
-    switch (role) {
-    case ClientNameRole: return userData.value(configKey::clientName).toString();
+    if (role == NameRole) {
+        return m_content[index.row()].toJsonObject()["clientName"].toString();
+    } else if (role == OpenVpnCertIdRole) {
+        return m_content[index.row()].toJsonObject()["openvpnCertId"].toString();
+    } else if (role == OpenVpnCertDataRole) {
+        return m_content[index.row()].toJsonObject()["openvpnCertData"].toString();
+    } else if (role == WireGuardPublicKey) {
+        return m_content[index.row()].toJsonObject()["wireguardPublicKey"].toString();
     }
 
     return QVariant();
 }
 
-ErrorCode ClientManagementModel::updateModel(DockerContainer container, ServerCredentials credentials)
+void ClientManagementModel::setData(const QModelIndex &index, QVariant data, int role)
 {
-    beginResetModel();
-    m_clientsTable = QJsonArray();
-
-    ServerController serverController(m_settings);
-
-    ErrorCode error = ErrorCode::NoError;
-
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
-    const QByteArray clientsTableString =
-            serverController.getTextFileFromContainer(container, credentials, clientsTableFile, &error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the clientsTable file from the server";
-        endResetModel();
-        return error;
+    if (!index.isValid() || index.row() < 0
+            || index.row() >= static_cast<int>(m_content.size())) {
+        return;
     }
 
-    m_clientsTable = QJsonDocument::fromJson(clientsTableString).array();
-
-    if (m_clientsTable.isEmpty()) {
-        int count = 0;
-
-        if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
-            || container == DockerContainer::Cloak) {
-            error = getOpenVpnClients(serverController, container, credentials, count);
-        } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
-            error = getWireGuardClients(serverController, container, credentials, count);
-        }
-        if (error != ErrorCode::NoError) {
-            endResetModel();
-            return error;
-        }
-
-        const QByteArray newClientsTableString = QJsonDocument(m_clientsTable).toJson();
-        if (clientsTableString != newClientsTableString) {
-            error = serverController.uploadTextFileToContainer(container, credentials, newClientsTableString,
-                                                               clientsTableFile);
-            if (error != ErrorCode::NoError) {
-                logger.error() << "Failed to upload the clientsTable file to the server";
-            }
-        }
+    auto client = m_content[index.row()].toJsonObject();
+    if (role == NameRole) {
+        client["clientName"] = data.toString();
+    } else if (role == OpenVpnCertIdRole) {
+        client["openvpnCertId"] = data.toString();
+    } else if (role == OpenVpnCertDataRole) {
+        client["openvpnCertData"] = data.toString();
+    } else if (role == WireGuardPublicKey) {
+        client["wireguardPublicKey"] = data.toString();
+    } else {
+        return;
+    }
+    if (m_content[index.row()] != client) {
+        m_content[index.row()] = client;
+        emit dataChanged(index, index);
     }
-
-    endResetModel();
-    return error;
 }
 
-ErrorCode ClientManagementModel::getOpenVpnClients(ServerController &serverController, DockerContainer container, ServerCredentials credentials, int &count)
+bool ClientManagementModel::removeRows(int row)
 {
-    ErrorCode error = ErrorCode::NoError;
-    QString stdOut;
-    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-        stdOut += data + "\n";
-        return ErrorCode::NoError;
-    };
-
-    const QString getOpenVpnClientsList =
-            "sudo docker exec -i $CONTAINER_NAME bash -c 'ls /opt/amnezia/openvpn/pki/issued'";
-    QString script = serverController.replaceVars(getOpenVpnClientsList,
-                                                  serverController.genVarsForScript(credentials, container));
-    error = serverController.runScript(credentials, script, cbReadStdOut);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to retrieve the list of issued certificates on the server";
-        return error;
-    }
-
-    if (!stdOut.isEmpty()) {
-        QStringList certsIds = stdOut.split("\n", Qt::SkipEmptyParts);
-        certsIds.removeAll("AmneziaReq.crt");
-
-        for (auto &openvpnCertId : certsIds) {
-            openvpnCertId.replace(".crt", "");
-            if (!isClientExists(openvpnCertId)) {
-                QJsonObject client;
-                client[configKey::clientId] = openvpnCertId;
-
-                QJsonObject userData;
-                userData[configKey::clientName] = QString("Client %1").arg(count);
-                client[configKey::userData] = userData;
-
-                m_clientsTable.push_back(client);
-
-                count++;
-            }
-        }
-    }
-    return error;
-}
-
-ErrorCode ClientManagementModel::getWireGuardClients(ServerController &serverController, DockerContainer container, ServerCredentials credentials, int &count)
-{
-    ErrorCode error = ErrorCode::NoError;
-
-    const QString wireGuardConfigFile =
-            QString("opt/amnezia/%1/wg0.conf").arg(container == DockerContainer::WireGuard ? "wireguard" : "awg");
-    const QString wireguardConfigString =
-            serverController.getTextFileFromContainer(container, credentials, wireGuardConfigFile, &error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the wg conf file from the server";
-        return error;
-    }
-
-    auto configLines = wireguardConfigString.split("\n", Qt::SkipEmptyParts);
-    QStringList wireguardKeys;
-    for (const auto &line : configLines) {
-        auto configPair = line.split(" = ", Qt::SkipEmptyParts);
-        if (configPair.front() == "PublicKey") {
-            wireguardKeys.push_back(configPair.back());
-        }
-    }
-
-    for (auto &wireguardKey : wireguardKeys) {
-        if (!isClientExists(wireguardKey)) {
-            QJsonObject client;
-            client[configKey::clientId] = wireguardKey;
-
-            QJsonObject userData;
-            userData[configKey::clientName] = QString("Client %1").arg(count);
-            client[configKey::userData] = userData;
-
-            m_clientsTable.push_back(client);
-
-            count++;
-        }
-    }
-    return error;
-}
-
-bool ClientManagementModel::isClientExists(const QString &clientId)
-{
-    for (const QJsonValue &value : qAsConst(m_clientsTable)) {
-        if (value.isObject()) {
-            QJsonObject obj = value.toObject();
-            if (obj.contains(configKey::clientId) && obj[configKey::clientId].toString() == clientId) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QString &clientName,
-                                              const DockerContainer container, ServerCredentials credentials)
-{
-    ErrorCode error;
-
-    error = updateModel(container, credentials);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    for (int i = 0; i < m_clientsTable.size(); i++) {
-        if (m_clientsTable.at(i).toObject().value(configKey::clientId) == clientId) {
-            return renameClient(i, clientName, container, credentials);
-        }
-    }
-
-    beginResetModel();
-    QJsonObject client;
-    client[configKey::clientId] = clientId;
-
-    QJsonObject userData;
-    userData[configKey::clientName] = clientName;
-    client[configKey::userData] = userData;
-    m_clientsTable.push_back(client);
-    endResetModel();
-
-    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
-
-    ServerController serverController(m_settings);
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
-
-    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-    }
-
-    return error;
-}
-
-ErrorCode ClientManagementModel::renameClient(const int row, const QString &clientName, const DockerContainer container,
-                                              ServerCredentials credentials)
-{
-    auto client = m_clientsTable.at(row).toObject();
-    auto userData = client[configKey::userData].toObject();
-    userData[configKey::clientName] = clientName;
-    client[configKey::userData] = userData;
-
-    m_clientsTable.replace(row, client);
-    emit dataChanged(index(row, 0), index(row, 0));
-
-    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
-
-    ServerController serverController(m_settings);
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
-
-    ErrorCode error =
-            serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-    }
-
-    return error;
-}
-
-ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContainer container,
-                                              ServerCredentials credentials)
-{
-    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
-        || container == DockerContainer::Cloak) {
-        return revokeOpenVpn(row, container, credentials);
-    } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
-        return revokeWireGuard(row, container, credentials);
-    }
-    return ErrorCode::NoError;
-}
-
-ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContainer container,
-                                               ServerCredentials credentials)
-{
-    auto client = m_clientsTable.at(row).toObject();
-    QString clientId = client.value(configKey::clientId).toString();
-
-    const QString getOpenVpnCertData = QString("sudo docker exec -i $CONTAINER_NAME bash -c '"
-                                               "cd /opt/amnezia/openvpn ;\\"
-                                               "easyrsa revoke %1 ;\\"
-                                               "easyrsa gen-crl ;\\"
-                                               "cp pki/crl.pem .'")
-                                               .arg(clientId);
-
-    ServerController serverController(m_settings);
-    const QString script =
-            serverController.replaceVars(getOpenVpnCertData, serverController.genVarsForScript(credentials, container));
-    ErrorCode error = serverController.runScript(credentials, script);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to revoke the certificate";
-        return error;
-    }
-
     beginRemoveRows(QModelIndex(), row, row);
-    m_clientsTable.removeAt(row);
+    m_content.removeAt(row);
     endRemoveRows();
-
-    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
-
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
-    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    return ErrorCode::NoError;
-}
-
-ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerContainer container,
-                                                 ServerCredentials credentials)
-{
-    ErrorCode error;
-    ServerController serverController(m_settings);
-
-    const QString wireGuardConfigFile =
-            QString("/opt/amnezia/%1/wg0.conf").arg(container == DockerContainer::WireGuard ? "wireguard" : "awg");
-    const QString wireguardConfigString =
-            serverController.getTextFileFromContainer(container, credentials, wireGuardConfigFile, &error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the wg conf file from the server";
-        return error;
-    }
-
-    auto client = m_clientsTable.at(row).toObject();
-    QString clientId = client.value(configKey::clientId).toString();
-
-    auto configSections = wireguardConfigString.split("[", Qt::SkipEmptyParts);
-    for (auto &section : configSections) {
-        if (section.contains(clientId)) {
-            configSections.removeOne(section);
-            break;
-        }
-    }
-    QString newWireGuardConfig = configSections.join("[");
-    newWireGuardConfig.insert(0, "[");
-    error = serverController.uploadTextFileToContainer(container, credentials, newWireGuardConfig, wireGuardConfigFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the wg conf file to the server";
-        return error;
-    }
-
-    beginRemoveRows(QModelIndex(), row, row);
-    m_clientsTable.removeAt(row);
-    endRemoveRows();
-
-    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
-
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
-    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    const QString script = "sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'";
-    error = serverController.runScript(
-            credentials,
-            serverController.replaceVars(script.arg(wireGuardConfigFile),
-                                         serverController.genVarsForScript(credentials, container)));
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to execute the command 'wg syncconf' on the server";
-        return error;
-    }
-
-    return ErrorCode::NoError;
+    return true;
 }
 
 QHash<int, QByteArray> ClientManagementModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
-    roles[ClientNameRole] = "clientName";
+    roles[NameRole] = "clientName";
+    roles[OpenVpnCertIdRole] = "openvpnCertId";
+    roles[OpenVpnCertDataRole] = "openvpnCertData";
+    roles[WireGuardPublicKey] = "wireguardPublicKey";
     return roles;
 }

client/ui/models/clientManagementModel.h

@@ -2,48 +2,36 @@
 #define CLIENTMANAGEMENTMODEL_H
 
 #include <QAbstractListModel>
-#include <QJsonArray>
 
-#include "core/servercontroller.h"
-#include "settings.h"
+#include "protocols/protocols_defs.h"
 
 class ClientManagementModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
-    enum Roles {
-        ClientNameRole = Qt::UserRole + 1,
+    enum ClientRoles {
+        NameRole = Qt::UserRole + 1,
+        OpenVpnCertIdRole,
+        OpenVpnCertDataRole,
+        WireGuardPublicKey,
     };
 
-    ClientManagementModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
+    ClientManagementModel(QObject *parent = nullptr);
 
+    void clearData();
+    void setContent(const QVector<QVariant> &data);
+    QJsonObject getContent(amnezia::Proto protocol);
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-public slots:
-    ErrorCode updateModel(DockerContainer container, ServerCredentials credentials);
-    ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
-                           ServerCredentials credentials);
-    ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container,
-                           ServerCredentials credentials);
-    ErrorCode revokeClient(const int index, const DockerContainer container, ServerCredentials credentials);
+    void setData(const QModelIndex &index, QVariant data, int role = Qt::DisplayRole);
+    bool removeRows(int row);
 
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    bool isClientExists(const QString &clientId);
-
-    ErrorCode revokeOpenVpn(const int row, const DockerContainer container, ServerCredentials credentials);
-    ErrorCode revokeWireGuard(const int row, const DockerContainer container, ServerCredentials credentials);
-
-    ErrorCode getOpenVpnClients(ServerController &serverController, DockerContainer container, ServerCredentials credentials, int &count);
-    ErrorCode getWireGuardClients(ServerController &serverController, DockerContainer container, ServerCredentials credentials, int &count);
-
-    QJsonArray m_clientsTable;
-
-    std::shared_ptr<Settings> m_settings;
+    QVector<QVariant> m_content;
 };
 
 #endif // CLIENTMANAGEMENTMODEL_H

client/ui/models/servers_model.cpp

@@ -145,11 +145,6 @@ QString ServersModel::getCurrentlyProcessedServerHostName()
     return qvariant_cast<QString>(data(m_currentlyProcessedServerIndex, HostNameRole));
 }
 
-const ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
-{
-    return serverCredentials(m_currentlyProcessedServerIndex);
-}
-
 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
     return m_defaultServerIndex == m_currentlyProcessedServerIndex;

client/ui/models/servers_model.h

@@ -53,7 +53,6 @@ public slots:
     int getCurrentlyProcessedServerIndex();
 
     QString getCurrentlyProcessedServerHostName();
-    const ServerCredentials getCurrentlyProcessedServerCredentials();
 
     void addServer(const QJsonObject &server);
     void removeServer();

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -112,30 +112,6 @@ DrawerType {
                     }
                 }
 
-                BasicButtonType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 8
-
-                    visible: nativeConfigString.text !== ""
-
-                    defaultColor: "transparent"
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                    disabledColor: "#878B91"
-                    textColor: "#D7D8DB"
-                    borderWidth: 1
-
-                    text: qsTr("Copy config string")
-                    imageSource: "qrc:/images/controls/copy.svg"
-
-                    onClicked: {
-                        nativeConfigString.selectAll()
-                        nativeConfigString.copy()
-                        nativeConfigString.select(0, 0)
-                        PageController.showNotificationMessage(qsTr("Copied"))
-                    }
-                }
-
                 BasicButtonType {
                     Layout.fillWidth: true
                     Layout.topMargin: 24
@@ -194,12 +170,6 @@ DrawerType {
                             }
 
                             TextField {
-                                id: nativeConfigString
-                                visible: false
-                                text: ExportController.nativeConfigString
-                            }
-
-                            TextArea {
                                 id: configText
 
                                 Layout.fillWidth: true
@@ -243,6 +213,7 @@ DrawerType {
 
                     Image {
                         anchors.fill: parent
+                        anchors.margins: 2
                         smooth: false
 
                         source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""

client/ui/qml/Controls2/SwitcherType.qml

@@ -87,7 +87,6 @@ Switch {
         id: content
 
         anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
 
         ListItemTitleType {
             Layout.fillWidth: true

client/ui/qml/Pages2/PageSetupWizardCredentials.qml

@@ -54,7 +54,7 @@ PageType {
                     regularExpression: InstallController.ipAddressPortRegExp()
                 }
 
-                onFocusChanged: {
+                onTextFieldTextChanged: {
                     textField.text = textField.text.replace(/^\s+|\s+$/g, '');
                 }
             }
@@ -81,10 +81,6 @@ PageType {
                 clickedFunc: function() {
                     hidePassword = !hidePassword
                 }
-
-                onFocusChanged: {
-                    textField.text = textField.text.replace(/^\s+|\s+$/g, '');
-                }
             }
 
             BasicButtonType {
@@ -94,7 +90,6 @@ PageType {
                 text: qsTr("Continue")
 
                 onClicked: function() {
-                    forceActiveFocus()
                     if (!isCredentialsFilled()) {
                         return
                     }
@@ -117,7 +112,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 12
 
-                text: qsTr("All data you enter will remain strictly confidential and will not be shared or disclosed to the Amnezia or any third parties")
+                text: qsTr("All data you enter will remain strictly confidential
+and will not be shared or disclosed to the Amnezia or any third parties")
             }
         }
     }

client/ui/qml/Pages2/PageSetupWizardViewConfig.qml

@@ -24,7 +24,7 @@ PageType {
         }
 
         function onImportFinished() {
-            if (!ConnectionController.isConnected) {
+            if (ConnectionController.isConnected) {
                 ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
             }
 

client/ui/qml/Pages2/PageShare.qml

@@ -18,28 +18,15 @@ PageType {
 
     enum ConfigType {
         AmneziaConnection,
+        AmneziaFullAccess,
         OpenVpn,
-        WireGuard,
-        ShadowSocks,
-        Cloak
-    }
-
-    signal revokeConfig(int index)
-    onRevokeConfig: function(index) {
-        PageController.showBusyIndicator(true)
-        ExportController.revokeConfig(index,
-                                      ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                      ServersModel.getCurrentlyProcessedServerCredentials())
-        PageController.showBusyIndicator(false)
+        WireGuard
     }
 
     Connections {
         target: ExportController
 
         function onGenerateConfig(type) {
-            shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
-            shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
-
             shareConnectionDrawer.needCloseButton = false
 
             shareConnectionDrawer.open()
@@ -47,34 +34,28 @@ PageType {
             PageController.showBusyIndicator(true)
 
             switch (type) {
-            case PageShare.ConfigType.AmneziaConnection: ExportController.generateConnectionConfig(clientNameTextField.textFieldText); break;
+            case PageShare.ConfigType.AmneziaConnection: ExportController.generateConnectionConfig(); break;
+            case PageShare.ConfigType.AmneziaFullAccess: {
+                if (Qt.platform.os === "android") {
+                    ExportController.generateFullAccessConfigAndroid();
+                } else {
+                    ExportController.generateFullAccessConfig();
+                }
+                break;
+            }
             case PageShare.ConfigType.OpenVpn: {
-                ExportController.generateOpenVpnConfig(clientNameTextField.textFieldText)
+                ExportController.generateOpenVpnConfig();
                 shareConnectionDrawer.configCaption = qsTr("Save OpenVPN config")
                 shareConnectionDrawer.configExtension = ".ovpn"
                 shareConnectionDrawer.configFileName = "amnezia_for_openvpn"
-                break
+                break;
             }
             case PageShare.ConfigType.WireGuard: {
-                ExportController.generateWireGuardConfig(clientNameTextField.textFieldText)
+                ExportController.generateWireGuardConfig();
                 shareConnectionDrawer.configCaption = qsTr("Save WireGuard config")
                 shareConnectionDrawer.configExtension = ".conf"
                 shareConnectionDrawer.configFileName = "amnezia_for_wireguard"
-                break
-            }
-            case PageShare.ConfigType.ShadowSocks: {
-                ExportController.generateShadowSocksConfig()
-                shareConnectionDrawer.configCaption = qsTr("Save ShadowSocks config")
-                shareConnectionDrawer.configExtension = ".json"
-                shareConnectionDrawer.configFileName = "amnezia_for_shadowsocks"
-                break
-            }
-            case PageShare.ConfigType.Cloak: {
-                ExportController.generateCloakConfig()
-                shareConnectionDrawer.configCaption = qsTr("Save Cloak config")
-                shareConnectionDrawer.configExtension = ".json"
-                shareConnectionDrawer.configFileName = "amnezia_for_cloak"
-                break
+                break;
             }
             }
 
@@ -92,7 +73,8 @@ PageType {
         }
     }
 
-    property bool isSearchBarVisible: false
+    property string fullConfigServerSelectorText
+    property string connectionServerSelectorText
     property bool showContent: false
     property bool shareButtonEnabled: true
     property list<QtObject> connectionTypesModel: [
@@ -114,16 +96,6 @@ PageType {
         property string name: qsTr("WireGuard native format")
         property var type: PageShare.ConfigType.WireGuard
     }
-    QtObject {
-        id: shadowSocksConnectionFormat
-        property string name: qsTr("ShadowSocks native format")
-        property var type: PageShare.ConfigType.ShadowSocks
-    }
-    QtObject {
-        id: cloakConnectionFormat
-        property string name: qsTr("Cloak native format")
-        property var type: PageShare.ConfigType.Cloak
-    }
 
     FlickableType {
         anchors.top: parent.top
@@ -147,51 +119,6 @@ PageType {
                 Layout.topMargin: 24
 
                 headerText: qsTr("Share VPN Access")
-
-                actionButtonImage: "qrc:/images/controls/more-vertical.svg"
-                actionButtonFunction: function() {
-                    shareFullAccessDrawer.open()
-                }
-
-                DrawerType {
-                    id: shareFullAccessDrawer
-
-                    width: root.width
-                    height: root.height * 0.45
-
-
-                    ColumnLayout {
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.topMargin: 16
-
-                        spacing: 0
-
-                        Header2Type {
-                            Layout.fillWidth: true
-                            Layout.bottomMargin: 16
-                            Layout.leftMargin: 16
-                            Layout.rightMargin: 16
-
-                            headerText: qsTr("Share full access to the server and VPN")
-                            descriptionText: qsTr("Use for your own devices, or share with those you trust to manage the server.")
-                        }
-
-
-                        LabelWithButtonType {
-                            Layout.fillWidth: true
-
-                            text: qsTr("Share")
-                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                            clickedFunction: function() {
-                                PageController.goToPage(PageEnum.PageShareFullAccess)
-                                shareFullAccessDrawer.close()
-                            }
-                        }
-                    }
-                }
             }
 
             Rectangle {
@@ -220,21 +147,20 @@ PageType {
 
                         onClicked: {
                             accessTypeSelector.currentIndex = 0
+                            serverSelector.text = root.connectionServerSelectorText
                         }
                     }
 
                     HorizontalRadioButton {
-                        checked: accessTypeSelector.currentIndex === 1
+                        checked: root.currentIndex === 1
 
                         implicitWidth: (root.width - 32) / 2
-                        text: qsTr("Users")
+                        text: qsTr("Full access")
 
                         onClicked: {
                             accessTypeSelector.currentIndex = 1
-                            PageController.showBusyIndicator(true)
-                            ExportController.updateClientManagementModel(ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                                                         ServersModel.getCurrentlyProcessedServerCredentials())
-                            PageController.showBusyIndicator(false)
+                            serverSelector.text = root.fullConfigServerSelectorText
+                            root.shareButtonEnabled = true
                         }
                     }
                 }
@@ -245,30 +171,16 @@ PageType {
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
 
-                visible: accessTypeSelector.currentIndex === 0
-
-                text: qsTr("Share VPN access without the ability to manage the server")
+                text: accessTypeSelector.currentIndex === 0 ? qsTr("Share VPN access without the ability to manage the server") :
+                                                              qsTr("Share access to server management. The user with whom you share full access to the server will be able to add and remove any protocols and services to the server, as well as change settings.")
                 color: "#878B91"
             }
 
-            TextFieldWithHeaderType {
-                id: clientNameTextField
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-
-                visible: accessTypeSelector.currentIndex === 0
-
-                headerText: qsTr("User name")
-                textFieldText: "New client"
-
-                checkEmptyText: true
-            }
-
             DropDownType {
                 id: serverSelector
 
                 signal severSelectorIndexChanged
-                property int currentIndex: -1
+                property int currentIndex: 0
 
                 Layout.fillWidth: true
                 Layout.topMargin: 16
@@ -295,6 +207,8 @@ PageType {
                         ]
                     }
 
+                    currentIndex: 0
+
                     clickedFunction: function() {
                         handler()
 
@@ -303,17 +217,22 @@ PageType {
                             serverSelector.severSelectorIndexChanged()
                         }
 
+                        if (accessTypeSelector.currentIndex !== 0) {
+                            shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
+                            shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
+                        }
                         serverSelector.menuVisible = false
                     }
 
                     Component.onCompleted: {
-                        serverSelectorListView.currentIndex = ServersModel.isDefaultServerHasWriteAccess() ?
-                                    proxyServersModel.mapFromSource(ServersModel.defaultIndex) : 0
-                        serverSelectorListView.triggerCurrentItem()
+                        handler()
+                        serverSelector.severSelectorIndexChanged()
                     }
 
                     function handler() {
                         serverSelector.text = selectedText
+                        root.fullConfigServerSelectorText = selectedText
+                        root.connectionServerSelectorText = selectedText
                         ServersModel.currentlyProcessedIndex = proxyServersModel.mapToSource(currentIndex)
                     }
                 }
@@ -322,6 +241,8 @@ PageType {
             DropDownType {
                 id: protocolSelector
 
+                visible: accessTypeSelector.currentIndex === 0
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
 
@@ -354,18 +275,22 @@ PageType {
                     currentIndex: 0
 
                     clickedFunction: function() {
-                        protocolSelectorListView.currentItem.y
-
                         handler()
 
                         protocolSelector.menuVisible = false
                     }
 
+                    Component.onCompleted: {
+                        if (accessTypeSelector.currentIndex === 0) {
+                            handler()
+                        }
+                    }
+
                     Connections {
                         target: serverSelector
 
                         function onSeverSelectorIndexChanged() {
-                            protocolSelectorListView.currentIndex = proxyContainersModel.mapFromSource(ContainersModel.getDefaultContainer())
+                            protocolSelectorListView.currentIndex = 0
                             protocolSelectorListView.triggerCurrentItem()
                         }
                     }
@@ -379,17 +304,13 @@ PageType {
                         }
 
                         protocolSelector.text = selectedText
+                        root.connectionServerSelectorText = serverSelector.text
 
+                        shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                        shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
                         ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
 
                         fillConnectionTypeModel()
-
-                        if (accessTypeSelector.currentIndex === 1) {
-                            PageController.showBusyIndicator(true)
-                            ExportController.updateClientManagementModel(ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                                                         ServersModel.getCurrentlyProcessedServerCredentials())
-                            PageController.showBusyIndicator(false)
-                        }
                     }
 
                     function fillConnectionTypeModel() {
@@ -401,13 +322,6 @@ PageType {
                             root.connectionTypesModel.push(openVpnConnectionFormat)
                         } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
                             root.connectionTypesModel.push(wireGuardConnectionFormat)
-                        } else if (index === ContainerProps.containerFromString("amnezia-shadowsocks")) {
-                            root.connectionTypesModel.push(openVpnConnectionFormat)
-                            root.connectionTypesModel.push(shadowSocksConnectionFormat)
-                        } else if (index === ContainerProps.containerFromString("amnezia-openvpn-cloak")) {
-                            root.connectionTypesModel.push(openVpnConnectionFormat)
-                            root.connectionTypesModel.push(shadowSocksConnectionFormat)
-                            root.connectionTypesModel.push(cloakConnectionFormat)
                         }
                     }
                 }
@@ -464,235 +378,18 @@ PageType {
                 Layout.topMargin: 40
 
                 enabled: shareButtonEnabled
-                visible: accessTypeSelector.currentIndex === 0
 
                 text: qsTr("Share")
                 imageSource: "qrc:/images/controls/share-2.svg"
 
                 onClicked: {
-                    ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
-                }
-            }
-
-            Header2Type {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.bottomMargin: 16
-
-                visible: accessTypeSelector.currentIndex === 1 && !root.isSearchBarVisible
-
-                headerText: qsTr("Users")
-                actionButtonImage: "qrc:/images/controls/search.svg"
-                actionButtonFunction: function() {
-                    root.isSearchBarVisible = true
-                }
-            }
-
-            RowLayout {
-                Layout.topMargin: 24
-                Layout.bottomMargin: 16
-                visible: accessTypeSelector.currentIndex === 1 && root.isSearchBarVisible
-
-                TextFieldWithHeaderType {
-                    id: searchTextField
-                    Layout.fillWidth: true
-
-                    textFieldPlaceholderText: qsTr("Search")
-                }
-
-                ImageButtonType {
-                    image: "qrc:/images/controls/close.svg"
-                    imageColor: "#D7D8DB"
-
-                    onClicked: function() {
-                        root.isSearchBarVisible = false
-                        searchTextField.textFieldText = ""
+                    if (accessTypeSelector.currentIndex === 0) {
+                        ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
+                    } else {
+                        ExportController.generateConfig(PageShare.ConfigType.AmneziaFullAccess)
                     }
                 }
             }
-
-            ListView {
-                id: clientsListView
-                Layout.fillWidth: true
-                Layout.preferredHeight: childrenRect.height
-
-                visible: accessTypeSelector.currentIndex === 1
-
-                model: SortFilterProxyModel {
-                    id: proxyClientManagementModel
-                    sourceModel: ClientManagementModel
-                    filters: RegExpFilter {
-                        roleName: "clientName"
-                        pattern: ".*" + searchTextField.textFieldText + ".*"
-                        caseSensitivity: Qt.CaseInsensitive
-                    }
-                }
-
-                clip: true
-                interactive: false
-
-                delegate: Item {
-                    implicitWidth: clientsListView.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.rightMargin: -16
-                        anchors.leftMargin: -16
-
-                        LabelWithButtonType {
-                            Layout.fillWidth: true
-
-                            text: clientName
-                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                            clickedFunction: function() {
-                                clientInfoDrawer.open()
-                            }
-                        }
-
-                        DividerType {}
-
-                        DrawerType {
-                            id: clientInfoDrawer
-
-                            width: root.width
-                            height: root.height * 0.5
-
-                            ColumnLayout {
-                                anchors.top: parent.top
-                                anchors.left: parent.left
-                                anchors.right: parent.right
-                                anchors.topMargin: 16
-                                anchors.leftMargin: 16
-                                anchors.rightMargin: 16
-
-                                spacing: 8
-
-                                Header2Type {
-                                    Layout.fillWidth: true
-                                    Layout.bottomMargin: 24
-
-                                    headerText: clientName
-                                    descriptionText: serverSelector.text
-                                }
-
-                                BasicButtonType {
-                                    Layout.fillWidth: true
-                                    Layout.topMargin: 24
-
-                                    defaultColor: "transparent"
-                                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                                    disabledColor: "#878B91"
-                                    textColor: "#D7D8DB"
-                                    borderWidth: 1
-
-                                    text: qsTr("Rename")
-
-                                    onClicked: function() {
-                                        clientNameEditDrawer.open()
-                                    }
-
-                                    DrawerType {
-                                        id: clientNameEditDrawer
-
-                                        width: root.width
-                                        height: root.height * 0.35
-
-                                        onVisibleChanged: {
-                                            if (clientNameEditDrawer.visible) {
-                                                clientNameEditor.textField.forceActiveFocus()
-                                            }
-                                        }
-
-                                        ColumnLayout {
-                                            anchors.top: parent.top
-                                            anchors.left: parent.left
-                                            anchors.right: parent.right
-                                            anchors.topMargin: 16
-                                            anchors.leftMargin: 16
-                                            anchors.rightMargin: 16
-
-                                            TextFieldWithHeaderType {
-                                                id: clientNameEditor
-                                                Layout.fillWidth: true
-                                                headerText: qsTr("Client name")
-                                                textFieldText: clientName
-                                                textField.maximumLength: 30
-                                            }
-
-                                            BasicButtonType {
-                                                Layout.fillWidth: true
-
-                                                text: qsTr("Save")
-
-                                                onClicked: {
-                                                    if (clientNameEditor.textFieldText !== clientName) {
-                                                        PageController.showBusyIndicator(true)
-                                                        ExportController.renameClient(index,
-                                                                                      clientNameEditor.textFieldText,
-                                                                                      ContainersModel.getCurrentlyProcessedContainerIndex(),
-                                                                                      ServersModel.getCurrentlyProcessedServerCredentials())
-                                                        PageController.showBusyIndicator(false)
-                                                        clientNameEditDrawer.close()
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-
-                                BasicButtonType {
-                                    Layout.fillWidth: true
-
-                                    defaultColor: "transparent"
-                                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-                                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
-                                    disabledColor: "#878B91"
-                                    textColor: "#D7D8DB"
-                                    borderWidth: 1
-
-                                    text: qsTr("Revoke")
-
-                                    onClicked: function() {
-                                        questionDrawer.headerText = qsTr("Revoke the config for a user - ") + clientName + "?"
-                                        questionDrawer.descriptionText = qsTr("The user will no longer be able to connect to your server.")
-                                        questionDrawer.yesButtonText = qsTr("Continue")
-                                        questionDrawer.noButtonText = qsTr("Cancel")
-
-                                        questionDrawer.yesButtonFunction = function() {
-                                            questionDrawer.close()
-                                            clientInfoDrawer.close()
-                                            root.revokeConfig(index)
-                                        }
-                                        questionDrawer.noButtonFunction = function() {
-                                            questionDrawer.close()
-                                        }
-                                        questionDrawer.open()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            QuestionDrawer {
-                id: questionDrawer
-            }
-        }
-    }
-    MouseArea {
-        anchors.fill: parent
-        onPressed: function(mouse) {
-            forceActiveFocus()
-            mouse.accepted = false
         }
     }
 }

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -1,155 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Dialogs
-
-import SortFilterProxyModel 0.2
-
-import PageEnum 1.0
-import ContainerProps 1.0
-
-import "./"
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Components"
-
-PageType {
-    id: root
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20
-    }
-
-    FlickableType {
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
-
-            spacing: 0
-
-            HeaderType {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-
-                headerText: qsTr("Full access to the server and VPN")
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.bottomMargin: 24
-
-                text: qsTr("We recommend that you use full access to the server only for your own additional devices.\n") +
-                      qsTr("If you share full access with other people, they can remove and add protocols and services to the server, which will cause the VPN to work incorrectly for all users. ")
-                color: "#878B91"
-            }
-
-            DropDownType {
-                id: serverSelector
-
-                signal severSelectorIndexChanged
-                property int currentIndex: 0
-
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-
-                drawerHeight: 0.4375
-
-                descriptionText: qsTr("Server")
-                headerText: qsTr("Server")
-
-                listView: ListViewWithRadioButtonType {
-                    id: serverSelectorListView
-
-                    rootWidth: root.width
-                    imageSource: "qrc:/images/controls/check.svg"
-
-                    model: SortFilterProxyModel {
-                        id: proxyServersModel
-                        sourceModel: ServersModel
-                        filters: [
-                            ValueFilter {
-                                roleName: "hasWriteAccess"
-                                value: true
-                            }
-                        ]
-                    }
-
-                    currentIndex: 0
-
-                    clickedFunction: function() {
-                        handler()
-
-                        if (serverSelector.currentIndex !== serverSelectorListView.currentIndex) {
-                            serverSelector.currentIndex = serverSelectorListView.currentIndex
-                        }
-
-                        shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
-                        shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
-                        serverSelector.menuVisible = false
-                    }
-
-                    Component.onCompleted: {
-                        handler()
-                    }
-
-                    function handler() {
-                        serverSelector.text = selectedText
-                        ServersModel.currentlyProcessedIndex = proxyServersModel.mapToSource(currentIndex)
-                    }
-                }
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 40
-
-                text: qsTr("Share")
-                imageSource: "qrc:/images/controls/share-2.svg"
-
-                onClicked: function() {
-                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
-                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
-
-                    shareConnectionDrawer.needCloseButton = false
-
-                    shareConnectionDrawer.open()
-                    shareConnectionDrawer.contentVisible = false
-                    PageController.showBusyIndicator(true)
-
-                    if (Qt.platform.os === "android") {
-                        ExportController.generateFullAccessConfigAndroid();
-                    } else {
-                        ExportController.generateFullAccessConfig();
-                    }
-
-                    PageController.showBusyIndicator(false)
-
-                    shareConnectionDrawer.needCloseButton = true
-                    PageController.showTopCloseButton(true)
-
-                    shareConnectionDrawer.contentVisible = true
-                }
-            }
-
-            ShareConnectionDrawer {
-                id: shareConnectionDrawer
-            }
-        }
-    }
-}

client/vpnconnection.cpp

@@ -227,15 +227,12 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex, const Ser
         configData = lastVpnConfig.value(proto);
         configData = m_configurator->processConfigWithLocalSettings(serverIndex, container, proto, configData);
     } else {
-        QString clientId;
-        configData = m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, proto, clientId, errorCode);
+        configData = m_configurator->genVpnProtocolConfig(credentials, container, containerConfig, proto, errorCode);
 
         if (errorCode && *errorCode) {
             return "";
         }
 
-        emit m_configurator->newVpnConfigCreated(clientId, "unnamed client", container, credentials);
-
         QString configDataBeforeLocalProcessing = configData;
 
         configData = m_configurator->processConfigWithLocalSettings(serverIndex, container, proto, configData);
@@ -326,7 +323,7 @@ void VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &crede
     ErrorCode e = ErrorCode::NoError;
 
     m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig, &e);
-
+    emit newVpnConfigurationCreated();
     if (e) {
         emit connectionStateChanged(Vpn::ConnectionState::Error);
         return;

client/vpnconnection.h

@@ -79,6 +79,8 @@ signals:
 
     void serviceIsNotReady();
 
+    void newVpnConfigurationCreated();
+
 protected slots:
     void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
     void onConnectionStateChanged(Vpn::ConnectionState state);