[*] fixed key activation and connection

vpn/client/DapCmdHandlers/DapCmdConnect.cpp

@@ -80,17 +80,15 @@ void DapCmdConnect::handle(const QJsonObject* params)
     }
 
     bool updateRouteTable = mandatoryConnParams[UPDATE_ROUTE_TABLE].toBool(true);
-    QString serialKey;
+    QString serialKey = "";
 
     if (params->contains("serial")) {
         serialKey = params->value("serial").toString().remove('-');
-        if (serialKey.isEmpty()) {
-            serialKey = DapServiceDataLocal::instance()->serialKeyData()->serialKey().remove('-');
-        }
-    } else {
+    }
+
+    if (serialKey.isEmpty()) {
         serialKey = DapServiceDataLocal::instance()->serialKeyData()->serialKey().remove('-');
     }
-    serialKey = QString(DapServiceDataLocal::instance()->serialKeyData()->serialKey()).remove('-');
 
     uint16_t port = uint16_t(mandatoryConnParams[PORT_KEY].toInt());
     QString address = mandatoryConnParams[ADDRESS_KEY].toString();
@@ -101,7 +99,7 @@ void DapCmdConnect::handle(const QJsonObject* params)
     if (!serialKey.isEmpty()) {
         emit sigConnect(serialKey, "", "", address, port, updateRouteTable);
     } else {
-        emit sigConnectNoAuth(address, port);
+        sendCmdError("No serial key provided");
     }
 }
 

vpn/client/DapCmdHandlers/DapCmdResetSerialKey.cpp

@@ -7,14 +7,17 @@ DapCmdResetSerialKey::DapCmdResetSerialKey(QObject *parent)
 
 void DapCmdResetSerialKey::handle(const QJsonObject *params)
 {
+    qDebug() << "Handling reset serial key command...";
     DapCmdServiceAbstract::handle(params);
 
     connect(this, &DapCmdResetSerialKey::sigResetSerialKeyReplied, [&] (const QString& reply) {
+        qDebug() << "Received signal: sigResetSerialKeyReplied with reply:" << reply;
         QJsonObject l_obj;
         l_obj["reset_reply"] = reply;
         sendCmd(&l_obj);
     });
 
+    qDebug() << "Emitting sigResetRequestSent signal...";
     emit sigResetRequestSent();
 }