The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-22 17:19:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix online for NA console logins (#147)

Browse Source 
This is just a quick fix. In the future we can look into avoiding hardcoded firmware version numbers. On the console it gets read from some system file
This commit is contained in:
Exzap 2022-09-02 09:14:55 +02:00 committed by GitHub
parent d3a7b3b5a6
commit b1844a8753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Cemu/napi/napi_act.cpp
View File

@ -61,7 +61,7 @@ namespace NAPI
return true; return true;
} }
void _ACTSetCommonHeaderParameters(CurlRequestHelper& req) void _ACTSetCommonHeaderParameters(CurlRequestHelper& req, AuthInfo& authInfo)
{ {
req.addHeaderField("X-Nintendo-Platform-ID", "1"); req.addHeaderField("X-Nintendo-Platform-ID", "1");
req.addHeaderField("X-Nintendo-Device-Type", "2"); req.addHeaderField("X-Nintendo-Device-Type", "2");
@ -71,7 +71,10 @@ namespace NAPI
req.addHeaderField("Accept", "*/*"); req.addHeaderField("Accept", "*/*");
req.addHeaderField("X-Nintendo-System-Version", "0260"); if(authInfo.region == CafeConsoleRegion::USA)
req.addHeaderField("X-Nintendo-System-Version", "0270");
else
req.addHeaderField("X-Nintendo-System-Version", "0260");
} }
void _ACTSetDeviceParameters(CurlRequestHelper& req, AuthInfo& authInfo) void _ACTSetDeviceParameters(CurlRequestHelper& req, AuthInfo& authInfo)
@ -143,7 +146,7 @@ namespace NAPI
CurlRequestHelper req; CurlRequestHelper req;
req.initate(fmt::format("{}/v1/api/oauth20/access_token/generate", LaunchSettings::GetActURLPrefix()), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT); req.initate(fmt::format("{}/v1/api/oauth20/access_token/generate", LaunchSettings::GetActURLPrefix()), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT);
_ACTSetCommonHeaderParameters(req); _ACTSetCommonHeaderParameters(req, authInfo);
_ACTSetDeviceParameters(req, authInfo); _ACTSetDeviceParameters(req, authInfo);
_ACTSetRegionAndCountryParameters(req, authInfo); _ACTSetRegionAndCountryParameters(req, authInfo);
req.addHeaderField("X-Nintendo-Device-Cert", authInfo.deviceCertBase64); req.addHeaderField("X-Nintendo-Device-Cert", authInfo.deviceCertBase64);
@ -229,7 +232,7 @@ namespace NAPI
req.initate(fmt::format("{}/v1/api/people/@me/profile", LaunchSettings::GetActURLPrefix()), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT); req.initate(fmt::format("{}/v1/api/people/@me/profile", LaunchSettings::GetActURLPrefix()), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT);
_ACTSetCommonHeaderParameters(req); _ACTSetCommonHeaderParameters(req, authInfo);
_ACTSetDeviceParameters(req, authInfo); _ACTSetDeviceParameters(req, authInfo);
// get oauth2 token // get oauth2 token
@ -295,7 +298,7 @@ namespace NAPI
// do request // do request
CurlRequestHelper req; CurlRequestHelper req;
req.initate(fmt::format("{}/v1/api/provider/nex_token/@me?game_server_id={:08X}", LaunchSettings::GetActURLPrefix(), serverId), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT); req.initate(fmt::format("{}/v1/api/provider/nex_token/@me?game_server_id={:08X}", LaunchSettings::GetActURLPrefix(), serverId), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT);
_ACTSetCommonHeaderParameters(req); _ACTSetCommonHeaderParameters(req, authInfo);
_ACTSetDeviceParameters(req, authInfo); _ACTSetDeviceParameters(req, authInfo);
_ACTSetRegionAndCountryParameters(req, authInfo); _ACTSetRegionAndCountryParameters(req, authInfo);
req.addHeaderField("X-Nintendo-FPD-Version", "0000"); req.addHeaderField("X-Nintendo-FPD-Version", "0000");
@ -448,7 +451,7 @@ namespace NAPI
// do request // do request
CurlRequestHelper req; CurlRequestHelper req;
req.initate(fmt::format("{}/v1/api/provider/service_token/@me?client_id={}", LaunchSettings::GetActURLPrefix(), clientId), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT); req.initate(fmt::format("{}/v1/api/provider/service_token/@me?client_id={}", LaunchSettings::GetActURLPrefix(), clientId), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT);
_ACTSetCommonHeaderParameters(req); _ACTSetCommonHeaderParameters(req, authInfo);
_ACTSetDeviceParameters(req, authInfo); _ACTSetDeviceParameters(req, authInfo);
_ACTSetRegionAndCountryParameters(req, authInfo); _ACTSetRegionAndCountryParameters(req, authInfo);
req.addHeaderField("X-Nintendo-FPD-Version", "0000"); req.addHeaderField("X-Nintendo-FPD-Version", "0000");
@ -519,7 +522,7 @@ namespace NAPI
// do request // do request
CurlRequestHelper req; CurlRequestHelper req;
req.initate(fmt::format("{}/v1/api/admin/mapped_ids?input_type=user_id&output_type=pid&input={}", LaunchSettings::GetActURLPrefix(), nnid), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT); req.initate(fmt::format("{}/v1/api/admin/mapped_ids?input_type=user_id&output_type=pid&input={}", LaunchSettings::GetActURLPrefix(), nnid), CurlRequestHelper::SERVER_SSL_CONTEXT::ACT);
_ACTSetCommonHeaderParameters(req); _ACTSetCommonHeaderParameters(req, authInfo);
_ACTSetDeviceParameters(req, authInfo); _ACTSetDeviceParameters(req, authInfo);
_ACTSetRegionAndCountryParameters(req, authInfo); _ACTSetRegionAndCountryParameters(req, authInfo);
req.addHeaderField("X-Nintendo-FPD-Version", "0000"); req.addHeaderField("X-Nintendo-FPD-Version", "0000");