Merge branch 'dev' into qt_migration

client/ui/pages_logic/protocols/CloakLogic.h

@@ -28,7 +28,7 @@ public:
     explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~CloakLogic() = default;
 
-    void updateProtocolPage (const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData) override;
+    void updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData) override;
     QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
 
 private:

client/ui/pages_logic/protocols/OpenVpnLogic.cpp

@@ -87,6 +87,17 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
                                     toString(protocols::openvpn::defaultPort));
 
     set_lineEditPortEnabled(container == DockerContainer::OpenVpn);
+
+    auto lastConfig = openvpnConfig.value(config_key::last_config).toString();
+    auto lastConfigJson = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
+    QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
+    QString openVpnLastConfigText;
+    for (const QString &l: lines) {
+            openVpnLastConfigText.append(l + "\n");
+    }
+
+    set_openVpnLastConfigText(openVpnLastConfigText);
+    set_isThirdPartyConfig(openvpnConfig.value(config_key::isThirdPartyConfig).isBool());
 }
 
 void OpenVpnLogic::onPushButtonProtoOpenVpnSaveClicked()

client/ui/pages_logic/protocols/OpenVpnLogic.h

@@ -35,6 +35,9 @@ class OpenVpnLogic : public PageProtocolLogicBase
     AUTO_PROPERTY(int, progressBarResetValue)
     AUTO_PROPERTY(int, progressBarResetMaximium)
 
+    AUTO_PROPERTY(QString, openVpnLastConfigText)
+    AUTO_PROPERTY(bool, isThirdPartyConfig)
+
 public:
     Q_INVOKABLE void onPushButtonProtoOpenVpnSaveClicked();
 

client/ui/pages_logic/protocols/WireGuardLogic.cpp

@@ -0,0 +1,30 @@
+#include "WireGuardLogic.h"
+#include "core/servercontroller.h"
+#include <functional>
+#include "../../uilogic.h"
+
+using namespace amnezia;
+using namespace PageEnumNS;
+
+WireGuardLogic::WireGuardLogic(UiLogic *logic, QObject *parent):
+    PageProtocolLogicBase(logic, parent)
+{
+
+}
+
+void WireGuardLogic::updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData)
+{
+    qDebug() << "WireGuardLogic::updateProtocolPage";
+
+    auto lastConfigJsonDoc = QJsonDocument::fromJson(wireGuardConfig.value(config_key::last_config).toString().toUtf8());
+    auto lastConfigJson = lastConfigJsonDoc.object();
+
+    QString wireGuardLastConfigText;
+    QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
+    for (const QString &l: lines) {
+            wireGuardLastConfigText.append(l + "\n");
+    }
+
+    set_wireGuardLastConfigText(wireGuardLastConfigText);
+    set_isThirdPartyConfig(wireGuardConfig.value(config_key::isThirdPartyConfig).toBool());
+}

client/ui/pages_logic/protocols/WireGuardLogic.h

@@ -0,0 +1,26 @@
+#ifndef WIREGUARDLOGIC_H
+#define WIREGUARDLOGIC_H
+
+#include "PageProtocolLogicBase.h"
+
+class UiLogic;
+
+class WireGuardLogic : public PageProtocolLogicBase
+{
+    Q_OBJECT
+
+    AUTO_PROPERTY(QString, wireGuardLastConfigText)
+    AUTO_PROPERTY(bool, isThirdPartyConfig)
+
+public:
+    explicit WireGuardLogic(UiLogic *uiLogic, QObject *parent = nullptr);
+    ~WireGuardLogic() = default;
+
+    void updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData) override;
+
+private:
+    UiLogic *m_uiLogic;
+
+};
+
+#endif // WIREGUARDLOGIC_H