1 files changed, 10 insertions, 33 deletions

diff --git a/src/scenes/add_server_wizard/add_server_wizard.cpp b/src/scenes/add_server_wizard/add_server_wizard.cpp
index d06108c..09db898 100644
--- a/src/scenes/add_server_wizard/add_server_wizard.cpp
+++ b/src/scenes/add_server_wizard/add_server_wizard.cpp
@@ -40,15 +40,17 @@ Add_Server_wizard::Add_Server_wizard(QObject *parent, MainQMLAdaptor *main_gui)
                      SLOT(add_web_app_host_response(QJsonDocument*)));
 }
 
-void Add_Server_wizard::processStep1(QString host_url) {
-    qDebug() << "Processing Step 1 with args: " << host_url;
+void Add_Server_wizard::processStep1(QString host_url, QString host_alias) {
+    qDebug() << "Processing Step 1 with args: " << host_url << host_alias;
 
-    if(host_url == "") {
-        emit step1Failed(tr("This field can't be empty!"));
+    if(host_alias == "" || host_url == "") {
+        QString reason = tr("Both textfields can't be empty!");
+        emit step1Failed(reason);
+        qDebug().noquote() << reason;
         return;
     }
 
-    return add_server(host_url);
+    return add_server(host_url, host_alias);
 }
 
 void Add_Server_wizard::processStep2() {
@@ -58,8 +60,8 @@ void Add_Server_wizard::processStep2() {
     emit step2Success();
 }
 
-void Add_Server_wizard::add_server(QString host_url) {
-    _dbus_api->add_web_app_host_request(host_url);
+void Add_Server_wizard::add_server(QString host_url, QString host_alias) {
+    _dbus_api->add_web_app_host_request(host_url, host_alias);
 }
 
 void Add_Server_wizard::add_web_app_host_response(QJsonDocument *doc) {
@@ -70,32 +72,7 @@ void Add_Server_wizard::add_web_app_host_response(QJsonDocument *doc) {
     // Status of request
     QString request_status = mainMap["status"].toString();
     if (request_status == "success") {
-        // Building host_object
-        QJsonObject host_object = jObject.value(QString("host")).toObject();
-
-        QString host_uuid  = host_object["uuid"].toString();
-        QString host_alias = host_object["alias"].toString();
-        QString host_url   = host_object["url"].toString();
-
-        if (host_url == "" || host_uuid == "") {
-            // This two values are required and can't be omitted.
-            QString reason = tr("Response of D-Bus service lacks necessary host object.");
-            qCritical().noquote() << tr("An error occured while adding a new host:")
-                                  << reason;
-            emit step1Failed(reason);
-
-            return;
-        }
-
-        if (host_alias == "") {
-            qDebug().noquote() << QString("An alias for the host wasn't delivered "
-                                          "so just use '%0' as alias.").arg(host_url);
-            host_alias = host_url;
-        }
-
-        // Now built RWAHost object.
-        QScopedPointer<RWAHost> rwa_host (new RWAHost(host_uuid, host_alias, host_url));
-        _main_gui->addRWAHost(rwa_host.data());
+        _dbus_api->get_web_app_hosts_request();
 
         qInfo() << "Successfully added a new RWAHost.";
         emit step1Success();