Change variable name to web_api_url
This commit is contained in:
parent
d408f89a91
commit
b82bf1ccdb
@ -229,8 +229,8 @@ void Config::ReadValues() {
|
|||||||
// Web Service
|
// Web Service
|
||||||
Settings::values.enable_telemetry =
|
Settings::values.enable_telemetry =
|
||||||
sdl2_config->GetBoolean("WebService", "enable_telemetry", true);
|
sdl2_config->GetBoolean("WebService", "enable_telemetry", true);
|
||||||
Settings::values.web_services_endpoint_url =
|
Settings::values.web_api_url =
|
||||||
sdl2_config->Get("WebService", "web_services_endpoint_url", "https://api.citra-emu.org");
|
sdl2_config->Get("WebService", "web_api_url", "https://api.citra-emu.org");
|
||||||
Settings::values.citra_username = sdl2_config->Get("WebService", "citra_username", "");
|
Settings::values.citra_username = sdl2_config->Get("WebService", "citra_username", "");
|
||||||
Settings::values.citra_token = sdl2_config->Get("WebService", "citra_token", "");
|
Settings::values.citra_token = sdl2_config->Get("WebService", "citra_token", "");
|
||||||
}
|
}
|
||||||
|
@ -245,8 +245,8 @@ gdbstub_port=24689
|
|||||||
# Whether or not to enable telemetry
|
# Whether or not to enable telemetry
|
||||||
# 0: No, 1 (default): Yes
|
# 0: No, 1 (default): Yes
|
||||||
enable_telemetry =
|
enable_telemetry =
|
||||||
# Endpoint URL for web services
|
# URL for Web API
|
||||||
web_services_endpoint_url = https://api.citra-emu.org
|
web_api_url = https://api.citra-emu.org
|
||||||
# Username and token for Citra Web Service
|
# Username and token for Citra Web Service
|
||||||
# See https://services.citra-emu.org/ for more info
|
# See https://services.citra-emu.org/ for more info
|
||||||
citra_username =
|
citra_username =
|
||||||
|
@ -191,10 +191,8 @@ void Config::ReadValues() {
|
|||||||
|
|
||||||
qt_config->beginGroup("WebService");
|
qt_config->beginGroup("WebService");
|
||||||
Settings::values.enable_telemetry = ReadSetting("enable_telemetry", true).toBool();
|
Settings::values.enable_telemetry = ReadSetting("enable_telemetry", true).toBool();
|
||||||
Settings::values.web_services_endpoint_url =
|
Settings::values.web_api_url =
|
||||||
ReadSetting("web_services_endpoint_url", "https://api.citra-emu.org")
|
ReadSetting("web_api_url", "https://api.citra-emu.org").toString().toStdString();
|
||||||
.toString()
|
|
||||||
.toStdString();
|
|
||||||
Settings::values.citra_username = ReadSetting("citra_username").toString().toStdString();
|
Settings::values.citra_username = ReadSetting("citra_username").toString().toStdString();
|
||||||
Settings::values.citra_token = ReadSetting("citra_token").toString().toStdString();
|
Settings::values.citra_token = ReadSetting("citra_token").toString().toStdString();
|
||||||
qt_config->endGroup();
|
qt_config->endGroup();
|
||||||
@ -426,8 +424,7 @@ void Config::SaveValues() {
|
|||||||
|
|
||||||
qt_config->beginGroup("WebService");
|
qt_config->beginGroup("WebService");
|
||||||
WriteSetting("enable_telemetry", Settings::values.enable_telemetry, true);
|
WriteSetting("enable_telemetry", Settings::values.enable_telemetry, true);
|
||||||
WriteSetting("web_services_endpoint_url",
|
WriteSetting("web_api_url", QString::fromStdString(Settings::values.web_api_url),
|
||||||
QString::fromStdString(Settings::values.web_services_endpoint_url),
|
|
||||||
"https://api.citra-emu.org");
|
"https://api.citra-emu.org");
|
||||||
WriteSetting("citra_username", QString::fromStdString(Settings::values.citra_username));
|
WriteSetting("citra_username", QString::fromStdString(Settings::values.citra_username));
|
||||||
WriteSetting("citra_token", QString::fromStdString(Settings::values.citra_token));
|
WriteSetting("citra_token", QString::fromStdString(Settings::values.citra_token));
|
||||||
|
@ -21,9 +21,9 @@ static constexpr std::chrono::seconds announce_time_interval(15);
|
|||||||
|
|
||||||
AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
|
AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
|
||||||
#ifdef ENABLE_WEB_SERVICE
|
#ifdef ENABLE_WEB_SERVICE
|
||||||
backend = std::make_unique<WebService::RoomJson>(
|
backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url + "/lobby",
|
||||||
Settings::values.web_services_endpoint_url + "/lobby", Settings::values.citra_username,
|
Settings::values.citra_username,
|
||||||
Settings::values.citra_token);
|
Settings::values.citra_token);
|
||||||
#else
|
#else
|
||||||
backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
|
backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
|
||||||
#endif
|
#endif
|
||||||
|
@ -165,7 +165,7 @@ struct Values {
|
|||||||
|
|
||||||
// WebService
|
// WebService
|
||||||
bool enable_telemetry;
|
bool enable_telemetry;
|
||||||
std::string web_services_endpoint_url;
|
std::string web_api_url;
|
||||||
std::string citra_username;
|
std::string citra_username;
|
||||||
std::string citra_token;
|
std::string citra_token;
|
||||||
} extern values;
|
} extern values;
|
||||||
|
@ -82,8 +82,8 @@ u64 RegenerateTelemetryId() {
|
|||||||
|
|
||||||
std::future<bool> VerifyLogin(std::string username, std::string token, std::function<void()> func) {
|
std::future<bool> VerifyLogin(std::string username, std::string token, std::function<void()> func) {
|
||||||
#ifdef ENABLE_WEB_SERVICE
|
#ifdef ENABLE_WEB_SERVICE
|
||||||
return WebService::VerifyLogin(username, token,
|
return WebService::VerifyLogin(username, token, Settings::values.web_api_url + "/profile",
|
||||||
Settings::values.web_services_endpoint_url + "/profile", func);
|
func);
|
||||||
#else
|
#else
|
||||||
return std::async(std::launch::async, [func{std::move(func)}]() {
|
return std::async(std::launch::async, [func{std::move(func)}]() {
|
||||||
func();
|
func();
|
||||||
@ -96,8 +96,8 @@ TelemetrySession::TelemetrySession() {
|
|||||||
#ifdef ENABLE_WEB_SERVICE
|
#ifdef ENABLE_WEB_SERVICE
|
||||||
if (Settings::values.enable_telemetry) {
|
if (Settings::values.enable_telemetry) {
|
||||||
backend = std::make_unique<WebService::TelemetryJson>(
|
backend = std::make_unique<WebService::TelemetryJson>(
|
||||||
Settings::values.web_services_endpoint_url + "/telemetry",
|
Settings::values.web_api_url + "/telemetry", Settings::values.citra_username,
|
||||||
Settings::values.citra_username, Settings::values.citra_token);
|
Settings::values.citra_token);
|
||||||
} else {
|
} else {
|
||||||
backend = std::make_unique<Telemetry::NullVisitor>();
|
backend = std::make_unique<Telemetry::NullVisitor>();
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ static void PrintHelp(const char* argv0) {
|
|||||||
"--preferred-game-id The preferred game-id for this room\n"
|
"--preferred-game-id The preferred game-id for this room\n"
|
||||||
"--username The username used for announce\n"
|
"--username The username used for announce\n"
|
||||||
"--token The token used for announce\n"
|
"--token The token used for announce\n"
|
||||||
"--endpoint-url The endpoint url to the announce server\n"
|
"--web-api-url Citra Web API url\n"
|
||||||
"-h, --help Display this help and exit\n"
|
"-h, --help Display this help and exit\n"
|
||||||
"-v, --version Output version information and exit\n";
|
"-v, --version Output version information and exit\n";
|
||||||
}
|
}
|
||||||
@ -65,7 +65,7 @@ int main(int argc, char** argv) {
|
|||||||
std::string preferred_game;
|
std::string preferred_game;
|
||||||
std::string username;
|
std::string username;
|
||||||
std::string token;
|
std::string token;
|
||||||
std::string endpoint_url;
|
std::string web_api_url;
|
||||||
u64 preferred_game_id = 0;
|
u64 preferred_game_id = 0;
|
||||||
u32 port = Network::DefaultRoomPort;
|
u32 port = Network::DefaultRoomPort;
|
||||||
u32 max_members = 16;
|
u32 max_members = 16;
|
||||||
@ -79,7 +79,7 @@ int main(int argc, char** argv) {
|
|||||||
{"preferred-game-id", required_argument, 0, 'i'},
|
{"preferred-game-id", required_argument, 0, 'i'},
|
||||||
{"username", required_argument, 0, 'u'},
|
{"username", required_argument, 0, 'u'},
|
||||||
{"token", required_argument, 0, 't'},
|
{"token", required_argument, 0, 't'},
|
||||||
{"endpoint-url", required_argument, 0, 'a'},
|
{"web-api-url", required_argument, 0, 'a'},
|
||||||
{"help", no_argument, 0, 'h'},
|
{"help", no_argument, 0, 'h'},
|
||||||
{"version", no_argument, 0, 'v'},
|
{"version", no_argument, 0, 'v'},
|
||||||
{0, 0, 0, 0},
|
{0, 0, 0, 0},
|
||||||
@ -114,7 +114,7 @@ int main(int argc, char** argv) {
|
|||||||
token.assign(optarg);
|
token.assign(optarg);
|
||||||
break;
|
break;
|
||||||
case 'a':
|
case 'a':
|
||||||
endpoint_url.assign(optarg);
|
web_api_url.assign(optarg);
|
||||||
break;
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
PrintHelp(argv[0]);
|
PrintHelp(argv[0]);
|
||||||
@ -160,13 +160,13 @@ int main(int argc, char** argv) {
|
|||||||
announce = false;
|
announce = false;
|
||||||
std::cout << "token is empty: Hosting a private room\n\n";
|
std::cout << "token is empty: Hosting a private room\n\n";
|
||||||
}
|
}
|
||||||
if (endpoint_url.empty() && announce) {
|
if (web_api_url.empty() && announce) {
|
||||||
announce = false;
|
announce = false;
|
||||||
std::cout << "endpoint url is empty: Hosting a private room\n\n";
|
std::cout << "endpoint url is empty: Hosting a private room\n\n";
|
||||||
}
|
}
|
||||||
if (announce) {
|
if (announce) {
|
||||||
std::cout << "Hosting a public room\n\n";
|
std::cout << "Hosting a public room\n\n";
|
||||||
Settings::values.web_services_endpoint_url = endpoint_url;
|
Settings::values.web_api_url = web_api_url;
|
||||||
Settings::values.citra_username = username;
|
Settings::values.citra_username = username;
|
||||||
Settings::values.citra_token = token;
|
Settings::values.citra_token = token;
|
||||||
}
|
}
|
||||||
|
@ -25,8 +25,8 @@ std::string UpdateCoreJWT(bool force_new_token, const std::string& username,
|
|||||||
static std::string jwt;
|
static std::string jwt;
|
||||||
if (jwt.empty() || force_new_token) {
|
if (jwt.empty() || force_new_token) {
|
||||||
if (!username.empty() && !token.empty()) {
|
if (!username.empty() && !token.empty()) {
|
||||||
std::future<Common::WebResult> future = PostJson(
|
std::future<Common::WebResult> future =
|
||||||
Settings::values.web_services_endpoint_url + "/jwt/internal", username, token);
|
PostJson(Settings::values.web_api_url + "/jwt/internal", username, token);
|
||||||
jwt = future.get().returned_data;
|
jwt = future.get().returned_data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user