Bug fix 13.10.2024

qsosu · Oct 13, 2024 · d10a641 · d10a641
1 parent 3c8f448
commit d10a641
Show file tree

Hide file tree

Showing 7 changed files with 1,279 additions and 5 deletions.
diff --git a/QSOSU-desktop-app.pro.user b/QSOSU-desktop-app.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.1, 2024-10-09T01:46:03. -->
+<!-- Written by QtCreator 14.0.1, 2024-10-12T01:25:27. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug/debug/QSOSU-desktop-app.exe b/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug/debug/QSOSU-desktop-app.exe
diff --git a/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug/debug/httpapi.o b/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug/debug/httpapi.o
diff --git a/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug/debug/log.txt b/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug/debug/log.txt
diff --git a/build/HamDefs.xml b/build/HamDefs.xml
diff --git a/build/data.db b/build/data.db
diff --git a/httpapi.cpp b/httpapi.cpp
@@ -73,7 +73,8 @@ void HttpApi::SendQso(QVariantList data) {
 }
 
 /* TEST */
-void HttpApi::getCallsign() {
+void HttpApi::getCallsign()
+{
   if (accessToken.length() == 0) {
       emit emptyToken();
       return;
@@ -119,7 +120,8 @@ void HttpApi::getCallsign() {
 
 //--------------------------------------------------------------------------------------------------------------------
 
-void HttpApi::addCallsign(QVariantList data) {
+void HttpApi::addCallsign(QVariantList data)
+{
     if (accessToken.length() == 0) {
         emit emptyToken();
         return;
@@ -129,7 +131,7 @@ void HttpApi::addCallsign(QVariantList data) {
         m_reply->deleteLater();
         m_reply = nullptr;
     }
-    QNetworkRequest request((QUrl("https://api.qso.su/method/v1/addCallsign")));
+    QNetworkRequest request(QUrl("https://api.qso.su/method/v1/addCallsign"));
     request.setHeader(QNetworkRequest::UserAgentHeader, "QSO.SU Agent");
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     request.setRawHeader(QByteArrayLiteral("Authorization"), QString("Bearer " + accessToken).toUtf8());
@@ -160,7 +162,7 @@ void HttpApi::addCallsign(QVariantList data) {
     });
 }
 //--------------------------------------------------------------------------------------------------------------------
-
+/*
 void HttpApi::checkStatusCallsign(QString callsign)
 {
     if (accessToken.length() == 0) {
@@ -175,6 +177,7 @@ void HttpApi::checkStatusCallsign(QString callsign)
 
     QNetworkRequest request = QNetworkRequest(QUrl("https://api.qso.su/method/v1/checkStatusCallsign"));
     request.setHeader(QNetworkRequest::UserAgentHeader, "QSO.SU Agent");
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     request.setRawHeader(QByteArrayLiteral("Authorization"), QString("Bearer " + accessToken).toUtf8());
     request.setSslConfiguration(QSslConfiguration::defaultConfiguration());
 
@@ -185,6 +188,7 @@ void HttpApi::checkStatusCallsign(QString callsign)
     QByteArray jsonBA = doc.toJson();
     qDebug().noquote() << "Checking Callsign from service." << jsonBA;
 
+
     QNetworkReply *reply = m_manager.get(request);
     //QNetworkReply *reply = m_manager.get(request, jsonBA);
     connect(reply, &QNetworkReply::finished, this, [=]() {
@@ -205,9 +209,61 @@ void HttpApi::checkStatusCallsign(QString callsign)
         reply->deleteLater();
     });
 }
+*/
+//--------------------------------------------------------------------------------------------------------------------
+
+void HttpApi::checkStatusCallsign(QString callsign)
+{
+    if (accessToken.length() == 0) {
+        emit emptyToken();
+        return;
+    }
+    if (m_reply) {
+        m_reply->abort();
+        m_reply->deleteLater();
+        m_reply = nullptr;
+    }
+
+    QJsonObject body;
+    body["callsign"] = callsign;
+    QJsonDocument doc(body);
+
+    QNetworkRequest request = QNetworkRequest(QUrl("https://api.qso.su/method/v1/checkStatusCallsign"));
+    request.setHeader(QNetworkRequest::UserAgentHeader, "QSO.SU Agent");
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    request.setRawHeader(QByteArrayLiteral("Authorization"), QString("Bearer " + accessToken).toUtf8());
+    request.setSslConfiguration(QSslConfiguration::defaultConfiguration());
+
+    QByteArray postDataByteArray = doc.toJson();
+    QBuffer *buff = new QBuffer;
+    buff->setData(postDataByteArray);
+    buff->open(QIODevice::ReadOnly);
+
+    QNetworkReply *reply = m_manager.sendCustomRequest(request, "GET", buff);
+    buff->setParent(reply);
+
+    connect(reply, &QNetworkReply::finished, this, [=]() {
+        if (reply->error() == QNetworkReply::NoError) {
+            QByteArray data = reply->readAll();
+            qDebug() << data;
+
+            QJsonDocument jsonDocument = QJsonDocument::fromJson(data);
+            if (jsonDocument.object().contains("error")) {
+                QJsonObject errorObject = jsonDocument["error"].toObject();
+                qDebug() << "ERROR:" << errorObject["name"].toString() << errorObject["message"].toString();
+                return;
+            }
+            QJsonObject response = jsonDocument["response"].toObject();
+            QJsonValue callsign_status = response["status"].toInt();
+            emit callsignStatus(callsign_status.toInt());
+        }
+        reply->deleteLater();
+    });
+}
 
 //--------------------------------------------------------------------------------------------------------------------
 
+
 void HttpApi::getListSubmodeDropDown()
 {
     if (accessToken.length() == 0) {