1 files changed, 16 insertions, 15 deletions
diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp
index 96ddf6c3c..e50c3a301 100644
--- a/src/web_service/web_backend.cpp
+++ b/src/web_service/web_backend.cpp
@@ -5,36 +5,37 @@
 #include <cpr/cpr.h>
 #include <stdlib.h>
 #include "common/logging/log.h"
-#include "core/settings.h"
 #include "web_service/web_backend.h"
 
 namespace WebService {
 
 static constexpr char API_VERSION[]{"1"};
 
-void PostJson(const std::string& url, const std::string& data) {
-    if (!Settings::values.enable_telemetry) {
-        // Telemetry disabled by user configuration
+void PostJson(const std::string& url, const std::string& data, bool allow_anonymous,
+              const std::string& username, const std::string& token) {
+    if (url.empty()) {
+        LOG_ERROR(WebService, "URL is invalid");
         return;
     }
 
-    if (url.empty()) {
-        LOG_ERROR(WebService, "URL is invalid");
+    const bool are_credentials_provided{!token.empty() && !username.empty()};
+    if (!allow_anonymous && !are_credentials_provided) {
+        LOG_ERROR(WebService, "Credentials must be provided for authenticated requests");
         return;
     }
 
-    if (Settings::values.citra_token.empty() || Settings::values.citra_username.empty()) {
-        // Anonymous request if citra token or username are empty
-        cpr::PostAsync(
-            cpr::Url{url}, cpr::Body{data},
-            cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}});
-    } else {
-        // We have both, do an authenticated request
+    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", Settings::values.citra_username},
-                                   {"x-token", Settings::values.citra_token},
+                                   {"x-username", username},
+                                   {"x-token", token},
                                    {"api-version", API_VERSION}});
+    } else {
+        // Otherwise, anonymous request
+        cpr::PostAsync(
+            cpr::Url{url}, cpr::Body{data},
+            cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}});
     }
 }