mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-02 00:15:06 +01:00
web_services: Refactor to remove dependency on Core.
This commit is contained in:
parent
9f0da33c33
commit
04bd0c957e
@ -77,7 +77,13 @@ u64 RegenerateTelemetryId() {
|
|||||||
|
|
||||||
TelemetrySession::TelemetrySession() {
|
TelemetrySession::TelemetrySession() {
|
||||||
#ifdef ENABLE_WEB_SERVICE
|
#ifdef ENABLE_WEB_SERVICE
|
||||||
backend = std::make_unique<WebService::TelemetryJson>();
|
if (Settings::values.enable_telemetry) {
|
||||||
|
backend = std::make_unique<WebService::TelemetryJson>(
|
||||||
|
Settings::values.telemetry_endpoint_url, Settings::values.citra_username,
|
||||||
|
Settings::values.citra_token);
|
||||||
|
} else {
|
||||||
|
backend = std::make_unique<Telemetry::NullVisitor>();
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
backend = std::make_unique<Telemetry::NullVisitor>();
|
backend = std::make_unique<Telemetry::NullVisitor>();
|
||||||
#endif
|
#endif
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "core/settings.h"
|
|
||||||
#include "web_service/telemetry_json.h"
|
#include "web_service/telemetry_json.h"
|
||||||
#include "web_service/web_backend.h"
|
#include "web_service/web_backend.h"
|
||||||
|
|
||||||
@ -81,7 +80,7 @@ void TelemetryJson::Complete() {
|
|||||||
SerializeSection(Telemetry::FieldType::UserFeedback, "UserFeedback");
|
SerializeSection(Telemetry::FieldType::UserFeedback, "UserFeedback");
|
||||||
SerializeSection(Telemetry::FieldType::UserConfig, "UserConfig");
|
SerializeSection(Telemetry::FieldType::UserConfig, "UserConfig");
|
||||||
SerializeSection(Telemetry::FieldType::UserSystem, "UserSystem");
|
SerializeSection(Telemetry::FieldType::UserSystem, "UserSystem");
|
||||||
PostJson(Settings::values.telemetry_endpoint_url, TopSection().dump());
|
PostJson(endpoint_url, TopSection().dump(), true, username, token);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace WebService
|
} // namespace WebService
|
||||||
|
@ -17,7 +17,9 @@ namespace WebService {
|
|||||||
*/
|
*/
|
||||||
class TelemetryJson : public Telemetry::VisitorInterface {
|
class TelemetryJson : public Telemetry::VisitorInterface {
|
||||||
public:
|
public:
|
||||||
TelemetryJson() = default;
|
TelemetryJson(const std::string& endpoint_url, const std::string& username,
|
||||||
|
const std::string& token)
|
||||||
|
: endpoint_url(endpoint_url), username(username), token(token) {}
|
||||||
~TelemetryJson() = default;
|
~TelemetryJson() = default;
|
||||||
|
|
||||||
void Visit(const Telemetry::Field<bool>& field) override;
|
void Visit(const Telemetry::Field<bool>& field) override;
|
||||||
@ -49,6 +51,9 @@ private:
|
|||||||
|
|
||||||
nlohmann::json output;
|
nlohmann::json output;
|
||||||
std::array<nlohmann::json, 7> sections;
|
std::array<nlohmann::json, 7> sections;
|
||||||
|
std::string endpoint_url;
|
||||||
|
std::string username;
|
||||||
|
std::string token;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace WebService
|
} // namespace WebService
|
||||||
|
@ -5,36 +5,37 @@
|
|||||||
#include <cpr/cpr.h>
|
#include <cpr/cpr.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "core/settings.h"
|
|
||||||
#include "web_service/web_backend.h"
|
#include "web_service/web_backend.h"
|
||||||
|
|
||||||
namespace WebService {
|
namespace WebService {
|
||||||
|
|
||||||
static constexpr char API_VERSION[]{"1"};
|
static constexpr char API_VERSION[]{"1"};
|
||||||
|
|
||||||
void PostJson(const std::string& url, const std::string& data) {
|
void PostJson(const std::string& url, const std::string& data, bool allow_anonymous,
|
||||||
if (!Settings::values.enable_telemetry) {
|
const std::string& username, const std::string& token) {
|
||||||
// Telemetry disabled by user configuration
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (url.empty()) {
|
if (url.empty()) {
|
||||||
LOG_ERROR(WebService, "URL is invalid");
|
LOG_ERROR(WebService, "URL is invalid");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings::values.citra_token.empty() || Settings::values.citra_username.empty()) {
|
const bool are_credentials_provided{!token.empty() && !username.empty()};
|
||||||
// Anonymous request if citra token or username are empty
|
if (!allow_anonymous && !are_credentials_provided) {
|
||||||
|
LOG_ERROR(WebService, "Credentials must be provided for authenticated requests");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (are_credentials_provided) {
|
||||||
|
// Authenticated request if credentials are provided
|
||||||
|
cpr::PostAsync(cpr::Url{url}, cpr::Body{data},
|
||||||
|
cpr::Header{{"Content-Type", "application/json"},
|
||||||
|
{"x-username", username},
|
||||||
|
{"x-token", token},
|
||||||
|
{"api-version", API_VERSION}});
|
||||||
|
} else {
|
||||||
|
// Otherwise, anonymous request
|
||||||
cpr::PostAsync(
|
cpr::PostAsync(
|
||||||
cpr::Url{url}, cpr::Body{data},
|
cpr::Url{url}, cpr::Body{data},
|
||||||
cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}});
|
cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}});
|
||||||
} else {
|
|
||||||
// We have both, do an authenticated request
|
|
||||||
cpr::PostAsync(cpr::Url{url}, cpr::Body{data},
|
|
||||||
cpr::Header{{"Content-Type", "application/json"},
|
|
||||||
{"x-username", Settings::values.citra_username},
|
|
||||||
{"x-token", Settings::values.citra_token},
|
|
||||||
{"api-version", API_VERSION}});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,11 @@ namespace WebService {
|
|||||||
* Posts JSON to services.citra-emu.org.
|
* Posts JSON to services.citra-emu.org.
|
||||||
* @param url URL of the services.citra-emu.org endpoint to post data to.
|
* @param url URL of the services.citra-emu.org endpoint to post data to.
|
||||||
* @param data String of JSON data to use for the body of the POST request.
|
* @param data String of JSON data to use for the body of the POST request.
|
||||||
|
* @param allow_anonymous If true, allow anonymous unauthenticated requests.
|
||||||
|
* @param username Citra username to use for authentication.
|
||||||
|
* @param token Citra token to use for authentication.
|
||||||
*/
|
*/
|
||||||
void PostJson(const std::string& url, const std::string& data);
|
void PostJson(const std::string& url, const std::string& data, bool allow_anonymous,
|
||||||
|
const std::string& username = {}, const std::string& token = {});
|
||||||
|
|
||||||
} // namespace WebService
|
} // namespace WebService
|
||||||
|
Loading…
Reference in New Issue
Block a user