Fixed #389 - QRZ auth over POST with form data

foldynl · Jun 9, 2024 · ec4c038 · ec4c038
1 parent 9dc6db6
commit ec4c038
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/core/QRZ.cpp b/core/QRZ.cpp
@@ -57,31 +57,34 @@ void QRZ::queryCallsign(const QString &callsign)
         return;
     }
 
-    QUrlQuery query;
-    query.addQueryItem("s", sessionId);
+    QUrlQuery params;
+    params.addQueryItem("s", sessionId);
 
     const Callsign qCall(callsign);
 
     if (qCall.isValid())
     {
         // currently QRZ.com does not handle correctly prefixes and suffixes.
         // That's why it's better to give it away if possible
-        query.addQueryItem("callsign", qCall.getBase());
+        params.addQueryItem("callsign", qCall.getBase());
     }
     else
     {
-        query.addQueryItem("callsign", callsign);
+        params.addQueryItem("callsign", callsign);
     }
 
     QUrl url(API_URL);
-    url.setQuery(query);
 
     if ( currentReply )
-    {
         qCWarning(runtime) << "processing a new request but the previous one hasn't been completed yet !!!";
-    }
 
-    currentReply = nam->get(QNetworkRequest(url));
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+
+    qCDebug(runtime) << url;
+
+    currentReply = nam->post(request, params.query(QUrl::FullyEncoded).toUtf8());
+
     currentReply->setProperty("queryCallsign", QVariant(callsign));
     currentReply->setProperty("messageType", QVariant("callsignInfoQuery"));
 
@@ -103,7 +106,6 @@ void QRZ::abortQuery()
     }
 }
 
-
 void QRZ::uploadContact(const QSqlRecord &record)
 {
     FCT_IDENTIFICATION;
@@ -137,15 +139,12 @@ void QRZ::actionInsert(QByteArray& data, const QString &insertPolicy)
     QUrl url(API_LOGBOOK_URL);
 
     QNetworkRequest request(url);
-
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
 
     qCDebug(runtime) << url;
 
     if ( currentReply )
-    {
         qCWarning(runtime) << "processing a new request but the previous one hasn't been completed yet !!!";
-    }
 
     currentReply = nam->post(request, params.query(QUrl::FullyEncoded).toUtf8());
 
@@ -266,20 +265,20 @@ void QRZ::authenticate()
 
     if ( !username.isEmpty() && !password.isEmpty() )
     {
-        QUrlQuery query;
-        query.addQueryItem("username", username.toUtf8().toPercentEncoding());
-        query.addQueryItem("password", password.toUtf8().toPercentEncoding());
-        query.addQueryItem("agent", "QLog");
+        QUrlQuery params;
+        params.addQueryItem("username", username.toUtf8().toPercentEncoding());
+        params.addQueryItem("password", password.toUtf8().toPercentEncoding());
+        params.addQueryItem("agent", "QLog");
 
         QUrl url(API_URL);
-        url.setQuery(query);
 
         if ( currentReply )
-        {
             qCWarning(runtime) << "processing a new request but the previous one hasn't been completed yet !!!";
-        }
 
-        currentReply = nam->get(QNetworkRequest(url));
+        QNetworkRequest request(url);
+        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+
+        currentReply = nam->post(request, params.query(QUrl::FullyEncoded).toUtf8());
         currentReply->setProperty("messageType", QVariant("authenticate"));
         lastSeenPassword = password;
     }