AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added the OS version and application version to the api request payload (#810)

Browse source 
* added the OS version and application version to the api request payload
* added errorStrings for new api error codes
This commit is contained in:
Nethius 2024-05-17 00:57:51 +07:00 • committed by GitHub
parent b71dcb8dd0
commit 2254bfc128
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/core/controllers/apiController.cpp
View file

@ -7,6 +7,7 @@
#include "amnezia_application.h" #include "amnezia_application.h"
#include "configurators/wireguard_configurator.h" #include "configurators/wireguard_configurator.h"
#include "version.h"
#include "core/errorstrings.h" #include "core/errorstrings.h"
namespace namespace
@ -21,7 +22,10 @@ namespace
constexpr char certificate[] = "certificate"; constexpr char certificate[] = "certificate";
constexpr char publicKey[] = "public_key"; constexpr char publicKey[] = "public_key";
constexpr char protocol[] = "protocol"; constexpr char protocol[] = "protocol";
constexpr char uuid[] = "installation_uuid"; constexpr char uuid[] = "installation_uuid";
constexpr char osVersion[] = "os_version";
constexpr char appVersion[] = "app_version";
} }
} }
@ -62,6 +66,10 @@ QJsonObject ApiController::fillApiPayload(const QString &protocol, const ApiCont
} else if (protocol == configKey::awg) { } else if (protocol == configKey::awg) {
obj[configKey::publicKey] = apiPayloadData.wireGuardClientPubKey; obj[configKey::publicKey] = apiPayloadData.wireGuardClientPubKey;
} }
obj[configKey::osVersion] = QSysInfo::prettyProductName();
obj[configKey::appVersion] = QString(APP_VERSION);
return obj; return obj;
} }

3
client/core/errorstrings.cpp
View file

@ -57,6 +57,9 @@ QString errorString(ErrorCode code) {
// Api errors // Api errors
case (ApiConfigDownloadError): errorMessage = QObject::tr("Error when retrieving configuration from API"); break; case (ApiConfigDownloadError): errorMessage = QObject::tr("Error when retrieving configuration from API"); break;
case (ApiConfigAlreadyAdded): errorMessage = QObject::tr("This config has already been added to the application"); break; case (ApiConfigAlreadyAdded): errorMessage = QObject::tr("This config has already been added to the application"); break;
case (ApiConfigEmptyError): errorMessage = QObject::tr("In the response from the server, an empty config was received"); break;
case (ApiConfigSslError): errorMessage = QObject::tr("SSL error occurred"); break;
case (ApiConfigTimeoutError): errorMessage = QObject::tr("Server response timeout on api request"); break;
// QFile errors // QFile errors
case(OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break; case(OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;