citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4138 from FearlessTobi/change-web-links 

web_service: Unify links for web service endpoints
This commit is contained in:
Weiyi Wang 2018-09-12 16:31:59 -04:00 committed by GitHub
parent 54c32647a1 b82bf1ccdb
commit 0a4d338ffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/citra/config.cpp
View File

@ -229,13 +229,8 @@ void Config::ReadValues() {
// Web Service
Settings::values.enable_telemetry =
sdl2_config->GetBoolean("WebService", "enable_telemetry", true);
Settings::values.telemetry_endpoint_url = sdl2_config->Get(
"WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry");
Settings::values.verify_endpoint_url = sdl2_config->Get(
"WebService", "verify_endpoint_url", "https://services.citra-emu.org/api/profile");
Settings::values.announce_multiplayer_room_endpoint_url =
sdl2_config->Get("WebService", "announce_multiplayer_room_endpoint_url",
"https://services.citra-emu.org/api/multiplayer/rooms");
Settings::values.web_api_url =
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_token = sdl2_config->Get("WebService", "citra_token", "");
}

8
src/citra/default_ini.h
View File

@ -245,12 +245,8 @@ gdbstub_port=24689
# Whether or not to enable telemetry
# 0: No, 1 (default): Yes
enable_telemetry =
# Endpoint URL for submitting telemetry data
telemetry_endpoint_url = https://services.citra-emu.org/api/telemetry
# Endpoint URL to verify the username and token
verify_endpoint_url = https://services.citra-emu.org/api/profile
# Endpoint URL for announcing public rooms
announce_multiplayer_room_endpoint_url = https://services.citra-emu.org/api/multiplayer/rooms
# URL for Web API
web_api_url = https://api.citra-emu.org
# Username and token for Citra Web Service
# See https://services.citra-emu.org/ for more info
citra_username =

27
src/citra_qt/configuration/config.cpp
View File

@ -191,19 +191,8 @@ void Config::ReadValues() {
qt_config->beginGroup("WebService");
Settings::values.enable_telemetry = ReadSetting("enable_telemetry", true).toBool();
Settings::values.telemetry_endpoint_url =
ReadSetting("telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry")
.toString()
.toStdString();
Settings::values.verify_endpoint_url =
ReadSetting("verify_endpoint_url", "https://services.citra-emu.org/api/profile")
.toString()
.toStdString();
Settings::values.announce_multiplayer_room_endpoint_url =
ReadSetting("announce_multiplayer_room_endpoint_url",
"https://services.citra-emu.org/api/multiplayer/rooms")
.toString()
.toStdString();
Settings::values.web_api_url =
ReadSetting("web_api_url", "https://api.citra-emu.org").toString().toStdString();
Settings::values.citra_username = ReadSetting("citra_username").toString().toStdString();
Settings::values.citra_token = ReadSetting("citra_token").toString().toStdString();
qt_config->endGroup();
@ -435,16 +424,8 @@ void Config::SaveValues() {
qt_config->beginGroup("WebService");
WriteSetting("enable_telemetry", Settings::values.enable_telemetry, true);
WriteSetting("telemetry_endpoint_url",
QString::fromStdString(Settings::values.telemetry_endpoint_url),
"https://services.citra-emu.org/api/telemetry");
WriteSetting("verify_endpoint_url",
QString::fromStdString(Settings::values.verify_endpoint_url),
"https://services.citra-emu.org/api/profile");
WriteSetting("announce_multiplayer_room_endpoint_url",
QString::fromStdString(Settings::values.announce_multiplayer_room_endpoint_url),
"https://services.citra-emu.org/"
"api/multiplayer/rooms");
WriteSetting("web_api_url", QString::fromStdString(Settings::values.web_api_url),
"https://api.citra-emu.org");
WriteSetting("citra_username", QString::fromStdString(Settings::values.citra_username));
WriteSetting("citra_token", QString::fromStdString(Settings::values.citra_token));
qt_config->endGroup();

6
src/core/announce_multiplayer_session.cpp
View File

@ -21,9 +21,9 @@ static constexpr std::chrono::seconds announce_time_interval(15);
AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
#ifdef ENABLE_WEB_SERVICE
backend = std::make_unique<WebService::RoomJson>(
Settings::values.announce_multiplayer_room_endpoint_url, Settings::values.citra_username,
Settings::values.citra_token);
backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url + "/lobby",
Settings::values.citra_username,
Settings::values.citra_token);
#else
backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
#endif

4
src/core/settings.h
View File

@ -165,9 +165,7 @@ struct Values {
// WebService
bool enable_telemetry;
std::string telemetry_endpoint_url;
std::string verify_endpoint_url;
std::string announce_multiplayer_room_endpoint_url;
std::string web_api_url;
std::string citra_username;
std::string citra_token;
} extern values;

5
src/core/telemetry_session.cpp
View File

@ -82,7 +82,8 @@ u64 RegenerateTelemetryId() {
std::future<bool> VerifyLogin(std::string username, std::string token, std::function<void()> func) {
#ifdef ENABLE_WEB_SERVICE
return WebService::VerifyLogin(username, token, Settings::values.verify_endpoint_url, func);
return WebService::VerifyLogin(username, token, Settings::values.web_api_url + "/profile",
func);
#else
return std::async(std::launch::async, [func{std::move(func)}]() {
func();
@ -95,7 +96,7 @@ TelemetrySession::TelemetrySession() {
#ifdef ENABLE_WEB_SERVICE
if (Settings::values.enable_telemetry) {
backend = std::make_unique<WebService::TelemetryJson>(
Settings::values.telemetry_endpoint_url, Settings::values.citra_username,
Settings::values.web_api_url + "/telemetry", Settings::values.citra_username,
Settings::values.citra_token);
} else {
backend = std::make_unique<Telemetry::NullVisitor>();

14
src/dedicated_room/citra-room.cpp
View File

@ -42,7 +42,7 @@ static void PrintHelp(const char* argv0) {
"--preferred-game-id The preferred game-id for this room\n"
"--username The username used for announce\n"
"--token The token used for announce\n"
"--announce-url The url to the announce server\n"
"--web-api-url Citra Web API url\n"
"-h, --help Display this help 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 username;
std::string token;
std::string announce_url;
std::string web_api_url;
u64 preferred_game_id = 0;
u32 port = Network::DefaultRoomPort;
u32 max_members = 16;
@ -79,7 +79,7 @@ int main(int argc, char** argv) {
{"preferred-game-id", required_argument, 0, 'i'},
{"username", required_argument, 0, 'u'},
{"token", required_argument, 0, 't'},
{"announce-url", required_argument, 0, 'a'},
{"web-api-url", required_argument, 0, 'a'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
{0, 0, 0, 0},
@ -114,7 +114,7 @@ int main(int argc, char** argv) {
token.assign(optarg);
break;
case 'a':
announce_url.assign(optarg);
web_api_url.assign(optarg);
break;
case 'h':
PrintHelp(argv[0]);
@ -160,13 +160,13 @@ int main(int argc, char** argv) {
announce = false;
std::cout << "token is empty: Hosting a private room\n\n";
}
if (announce_url.empty() && announce) {
if (web_api_url.empty() && announce) {
announce = false;
std::cout << "announce url is empty: Hosting a private room\n\n";
std::cout << "endpoint url is empty: Hosting a private room\n\n";
}
if (announce) {
std::cout << "Hosting a public room\n\n";
Settings::values.announce_multiplayer_room_endpoint_url = announce_url;
Settings::values.web_api_url = web_api_url;
Settings::values.citra_username = username;
Settings::values.citra_token = token;
}

2
src/web_service/web_backend.cpp
View File

@ -26,7 +26,7 @@ std::string UpdateCoreJWT(bool force_new_token, const std::string& username,
if (jwt.empty() || force_new_token) {
if (!username.empty() && !token.empty()) {
std::future<Common::WebResult> future =
PostJson("https://api.citra-emu.org/jwt/internal", username, token);
PostJson(Settings::values.web_api_url + "/jwt/internal", username, token);
jwt = future.get().returned_data;
}
}