summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorGravatar B3n302017-09-19 03:18:26 +0200
committerGravatar bunnei2017-09-18 21:18:26 -0400
commit28c726f20545744a3052a3e8a0a3bf5ff95a5042 (patch)
tree496b81a9d2cefbdb3ac2ed12c6525ecd72610c14 /src/citra
parentMerge pull request #2906 from Subv/ns_new_framework (diff)
downloadyuzu-28c726f20545744a3052a3e8a0a3bf5ff95a5042.tar.gz
yuzu-28c726f20545744a3052a3e8a0a3bf5ff95a5042.tar.xz
yuzu-28c726f20545744a3052a3e8a0a3bf5ff95a5042.zip
WebService: Verify username and token (#2930)
* WebService: Verify username and token; Log errors in PostJson * Fixup: added docstrings to the functions * Webservice: Added Icons to the verification, imrpved error detection in cpr, fixup nits * fixup: fmt warning
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/config.cpp2
-rw-r--r--src/citra/default_ini.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index a48ef08c7..45c28ad09 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -162,6 +162,8 @@ void Config::ReadValues() {
162 sdl2_config->GetBoolean("WebService", "enable_telemetry", true); 162 sdl2_config->GetBoolean("WebService", "enable_telemetry", true);
163 Settings::values.telemetry_endpoint_url = sdl2_config->Get( 163 Settings::values.telemetry_endpoint_url = sdl2_config->Get(
164 "WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry"); 164 "WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry");
165 Settings::values.verify_endpoint_url = sdl2_config->Get(
166 "WebService", "verify_endpoint_url", "https://services.citra-emu.org/api/profile");
165 Settings::values.citra_username = sdl2_config->Get("WebService", "citra_username", ""); 167 Settings::values.citra_username = sdl2_config->Get("WebService", "citra_username", "");
166 Settings::values.citra_token = sdl2_config->Get("WebService", "citra_token", ""); 168 Settings::values.citra_token = sdl2_config->Get("WebService", "citra_token", "");
167} 169}
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 4b13a2e1b..59faf773f 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -185,6 +185,8 @@ gdbstub_port=24689
185enable_telemetry = 185enable_telemetry =
186# Endpoint URL for submitting telemetry data 186# Endpoint URL for submitting telemetry data
187telemetry_endpoint_url = https://services.citra-emu.org/api/telemetry 187telemetry_endpoint_url = https://services.citra-emu.org/api/telemetry
188# Endpoint URL to verify the username and token
189verify_endpoint_url = https://services.citra-emu.org/api/profile
188# Username and token for Citra Web Service 190# Username and token for Citra Web Service
189# See https://services.citra-emu.org/ for more info 191# See https://services.citra-emu.org/ for more info
190citra_username = 192citra_username =