diff --git a/code/include/playfab/PlayFabClientApi.h b/code/include/playfab/PlayFabClientApi.h index fbdbe375..1a2e0299 100644 --- a/code/include/playfab/PlayFabClientApi.h +++ b/code/include/playfab/PlayFabClientApi.h @@ -112,7 +112,7 @@ namespace PlayFab static void LinkGoogleAccount(ClientModels::LinkGoogleAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LinkIOSDeviceID(ClientModels::LinkIOSDeviceIDRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LinkKongregate(ClientModels::LinkKongregateAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); - static void LinkNintendoSwitchAccount(ClientModels::LinkNintendoSwitchAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); + static void LinkNintendoAccount(ClientModels::LinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LinkNintendoSwitchDeviceId(ClientModels::LinkNintendoSwitchDeviceIdRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LinkOpenIdConnect(ClientModels::LinkOpenIdConnectRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LinkPSNAccount(ClientModels::LinkPSNAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); @@ -130,7 +130,7 @@ namespace PlayFab static void LoginWithGoogleAccount(ClientModels::LoginWithGoogleAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LoginWithIOSDeviceID(ClientModels::LoginWithIOSDeviceIDRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LoginWithKongregate(ClientModels::LoginWithKongregateRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); - static void LoginWithNintendoSwitchAccount(ClientModels::LoginWithNintendoSwitchAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); + static void LoginWithNintendoAccount(ClientModels::LoginWithNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LoginWithNintendoSwitchDeviceId(ClientModels::LoginWithNintendoSwitchDeviceIdRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LoginWithOpenIdConnect(ClientModels::LoginWithOpenIdConnectRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void LoginWithPlayFab(ClientModels::LoginWithPlayFabRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); @@ -172,7 +172,7 @@ namespace PlayFab static void UnlinkGoogleAccount(ClientModels::UnlinkGoogleAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void UnlinkIOSDeviceID(ClientModels::UnlinkIOSDeviceIDRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void UnlinkKongregate(ClientModels::UnlinkKongregateAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); - static void UnlinkNintendoSwitchAccount(ClientModels::UnlinkNintendoSwitchAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); + static void UnlinkNintendoAccount(ClientModels::UnlinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void UnlinkNintendoSwitchDeviceId(ClientModels::UnlinkNintendoSwitchDeviceIdRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void UnlinkOpenIdConnect(ClientModels::UnlinkOpenIdConnectRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); static void UnlinkPSNAccount(ClientModels::UnlinkPSNAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); @@ -283,7 +283,7 @@ namespace PlayFab static void OnLinkGoogleAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLinkIOSDeviceIDResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLinkKongregateResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); - static void OnLinkNintendoSwitchAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); + static void OnLinkNintendoAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLinkNintendoSwitchDeviceIdResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLinkOpenIdConnectResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLinkPSNAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); @@ -301,7 +301,7 @@ namespace PlayFab static void OnLoginWithGoogleAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLoginWithIOSDeviceIDResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLoginWithKongregateResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); - static void OnLoginWithNintendoSwitchAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); + static void OnLoginWithNintendoAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLoginWithNintendoSwitchDeviceIdResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLoginWithOpenIdConnectResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnLoginWithPlayFabResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); @@ -343,7 +343,7 @@ namespace PlayFab static void OnUnlinkGoogleAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnUnlinkIOSDeviceIDResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnUnlinkKongregateResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); - static void OnUnlinkNintendoSwitchAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); + static void OnUnlinkNintendoAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnUnlinkNintendoSwitchDeviceIdResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnUnlinkOpenIdConnectResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); static void OnUnlinkPSNAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); diff --git a/code/include/playfab/PlayFabClientDataModels.h b/code/include/playfab/PlayFabClientDataModels.h index 5d269dd9..8fd5c3ad 100644 --- a/code/include/playfab/PlayFabClientDataModels.h +++ b/code/include/playfab/PlayFabClientDataModels.h @@ -15001,31 +15001,27 @@ namespace PlayFab } }; - struct LinkNintendoSwitchAccountRequest : public PlayFabRequestCommon + struct LinkNintendoAccountRequest : public PlayFabRequestCommon { - std::string EnvironmentId; Boxed ForceLink; std::string IdentityToken; - LinkNintendoSwitchAccountRequest() : + LinkNintendoAccountRequest() : PlayFabRequestCommon(), - EnvironmentId(), ForceLink(), IdentityToken() {} - LinkNintendoSwitchAccountRequest(const LinkNintendoSwitchAccountRequest& src) : + LinkNintendoAccountRequest(const LinkNintendoAccountRequest& src) : PlayFabRequestCommon(), - EnvironmentId(src.EnvironmentId), ForceLink(src.ForceLink), IdentityToken(src.IdentityToken) {} - ~LinkNintendoSwitchAccountRequest() = default; + ~LinkNintendoAccountRequest() = default; void FromJson(const Json::Value& input) override { - FromJsonUtilS(input["EnvironmentId"], EnvironmentId); FromJsonUtilP(input["ForceLink"], ForceLink); FromJsonUtilS(input["IdentityToken"], IdentityToken); } @@ -15033,7 +15029,6 @@ namespace PlayFab Json::Value ToJson() const override { Json::Value output; - Json::Value each_EnvironmentId; ToJsonUtilS(EnvironmentId, each_EnvironmentId); output["EnvironmentId"] = each_EnvironmentId; Json::Value each_ForceLink; ToJsonUtilP(ForceLink, each_ForceLink); output["ForceLink"] = each_ForceLink; Json::Value each_IdentityToken; ToJsonUtilS(IdentityToken, each_IdentityToken); output["IdentityToken"] = each_IdentityToken; return output; @@ -16251,45 +16246,41 @@ namespace PlayFab } }; - struct LoginWithNintendoSwitchAccountRequest : public PlayFabRequestCommon + struct LoginWithNintendoAccountRequest : public PlayFabRequestCommon { Boxed CreateAccount; std::string EncryptedRequest; - std::string EnvironmentId; std::string IdentityToken; Boxed InfoRequestParameters; std::string PlayerSecret; std::string TitleId; - LoginWithNintendoSwitchAccountRequest() : + LoginWithNintendoAccountRequest() : PlayFabRequestCommon(), CreateAccount(), EncryptedRequest(), - EnvironmentId(), IdentityToken(), InfoRequestParameters(), PlayerSecret(), TitleId() {} - LoginWithNintendoSwitchAccountRequest(const LoginWithNintendoSwitchAccountRequest& src) : + LoginWithNintendoAccountRequest(const LoginWithNintendoAccountRequest& src) : PlayFabRequestCommon(), CreateAccount(src.CreateAccount), EncryptedRequest(src.EncryptedRequest), - EnvironmentId(src.EnvironmentId), IdentityToken(src.IdentityToken), InfoRequestParameters(src.InfoRequestParameters), PlayerSecret(src.PlayerSecret), TitleId(src.TitleId) {} - ~LoginWithNintendoSwitchAccountRequest() = default; + ~LoginWithNintendoAccountRequest() = default; void FromJson(const Json::Value& input) override { FromJsonUtilP(input["CreateAccount"], CreateAccount); FromJsonUtilS(input["EncryptedRequest"], EncryptedRequest); - FromJsonUtilS(input["EnvironmentId"], EnvironmentId); FromJsonUtilS(input["IdentityToken"], IdentityToken); FromJsonUtilO(input["InfoRequestParameters"], InfoRequestParameters); FromJsonUtilS(input["PlayerSecret"], PlayerSecret); @@ -16301,7 +16292,6 @@ namespace PlayFab Json::Value output; Json::Value each_CreateAccount; ToJsonUtilP(CreateAccount, each_CreateAccount); output["CreateAccount"] = each_CreateAccount; Json::Value each_EncryptedRequest; ToJsonUtilS(EncryptedRequest, each_EncryptedRequest); output["EncryptedRequest"] = each_EncryptedRequest; - Json::Value each_EnvironmentId; ToJsonUtilS(EnvironmentId, each_EnvironmentId); output["EnvironmentId"] = each_EnvironmentId; Json::Value each_IdentityToken; ToJsonUtilS(IdentityToken, each_IdentityToken); output["IdentityToken"] = each_IdentityToken; Json::Value each_InfoRequestParameters; ToJsonUtilO(InfoRequestParameters, each_InfoRequestParameters); output["InfoRequestParameters"] = each_InfoRequestParameters; Json::Value each_PlayerSecret; ToJsonUtilS(PlayerSecret, each_PlayerSecret); output["PlayerSecret"] = each_PlayerSecret; @@ -18993,18 +18983,18 @@ namespace PlayFab } }; - struct UnlinkNintendoSwitchAccountRequest : public PlayFabRequestCommon + struct UnlinkNintendoAccountRequest : public PlayFabRequestCommon { - UnlinkNintendoSwitchAccountRequest() : + UnlinkNintendoAccountRequest() : PlayFabRequestCommon() {} - UnlinkNintendoSwitchAccountRequest(const UnlinkNintendoSwitchAccountRequest&) : + UnlinkNintendoAccountRequest(const UnlinkNintendoAccountRequest&) : PlayFabRequestCommon() {} - ~UnlinkNintendoSwitchAccountRequest() = default; + ~UnlinkNintendoAccountRequest() = default; void FromJson(const Json::Value&) override { diff --git a/code/include/playfab/PlayFabClientInstanceApi.h b/code/include/playfab/PlayFabClientInstanceApi.h index 5edf612a..bb241f1f 100644 --- a/code/include/playfab/PlayFabClientInstanceApi.h +++ b/code/include/playfab/PlayFabClientInstanceApi.h @@ -130,7 +130,7 @@ namespace PlayFab void LinkGoogleAccount(ClientModels::LinkGoogleAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LinkIOSDeviceID(ClientModels::LinkIOSDeviceIDRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LinkKongregate(ClientModels::LinkKongregateAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); - void LinkNintendoSwitchAccount(ClientModels::LinkNintendoSwitchAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); + void LinkNintendoAccount(ClientModels::LinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LinkNintendoSwitchDeviceId(ClientModels::LinkNintendoSwitchDeviceIdRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LinkOpenIdConnect(ClientModels::LinkOpenIdConnectRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LinkPSNAccount(ClientModels::LinkPSNAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); @@ -148,7 +148,7 @@ namespace PlayFab void LoginWithGoogleAccount(ClientModels::LoginWithGoogleAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LoginWithIOSDeviceID(ClientModels::LoginWithIOSDeviceIDRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LoginWithKongregate(ClientModels::LoginWithKongregateRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); - void LoginWithNintendoSwitchAccount(ClientModels::LoginWithNintendoSwitchAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); + void LoginWithNintendoAccount(ClientModels::LoginWithNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LoginWithNintendoSwitchDeviceId(ClientModels::LoginWithNintendoSwitchDeviceIdRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LoginWithOpenIdConnect(ClientModels::LoginWithOpenIdConnectRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void LoginWithPlayFab(ClientModels::LoginWithPlayFabRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); @@ -190,7 +190,7 @@ namespace PlayFab void UnlinkGoogleAccount(ClientModels::UnlinkGoogleAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void UnlinkIOSDeviceID(ClientModels::UnlinkIOSDeviceIDRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void UnlinkKongregate(ClientModels::UnlinkKongregateAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); - void UnlinkNintendoSwitchAccount(ClientModels::UnlinkNintendoSwitchAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); + void UnlinkNintendoAccount(ClientModels::UnlinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void UnlinkNintendoSwitchDeviceId(ClientModels::UnlinkNintendoSwitchDeviceIdRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void UnlinkOpenIdConnect(ClientModels::UnlinkOpenIdConnectRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); void UnlinkPSNAccount(ClientModels::UnlinkPSNAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback = nullptr, void* customData = nullptr); @@ -297,7 +297,7 @@ namespace PlayFab void OnLinkGoogleAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLinkIOSDeviceIDResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLinkKongregateResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); - void OnLinkNintendoSwitchAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); + void OnLinkNintendoAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLinkNintendoSwitchDeviceIdResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLinkOpenIdConnectResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLinkPSNAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); @@ -315,7 +315,7 @@ namespace PlayFab void OnLoginWithGoogleAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLoginWithIOSDeviceIDResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLoginWithKongregateResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); - void OnLoginWithNintendoSwitchAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); + void OnLoginWithNintendoAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLoginWithNintendoSwitchDeviceIdResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLoginWithOpenIdConnectResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnLoginWithPlayFabResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); @@ -357,7 +357,7 @@ namespace PlayFab void OnUnlinkGoogleAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnUnlinkIOSDeviceIDResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnUnlinkKongregateResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); - void OnUnlinkNintendoSwitchAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); + void OnUnlinkNintendoAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnUnlinkNintendoSwitchDeviceIdResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnUnlinkOpenIdConnectResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); void OnUnlinkPSNAccountResult(int httpCode, const std::string& result, const std::shared_ptr& reqContainer); diff --git a/code/include/playfab/PlayFabMultiplayerDataModels.h b/code/include/playfab/PlayFabMultiplayerDataModels.h index ad5aabd9..7ae1cdae 100644 --- a/code/include/playfab/PlayFabMultiplayerDataModels.h +++ b/code/include/playfab/PlayFabMultiplayerDataModels.h @@ -229,8 +229,10 @@ namespace PlayFab AzureVmFamilyA, AzureVmFamilyAv2, AzureVmFamilyDv2, + AzureVmFamilyDv3, AzureVmFamilyF, - AzureVmFamilyFsv2 + AzureVmFamilyFsv2, + AzureVmFamilyDasv4 }; inline void ToJsonEnum(const AzureVmFamily input, Json::Value& output) @@ -250,6 +252,11 @@ namespace PlayFab output = Json::Value("Dv2"); return; } + if (input == AzureVmFamily::AzureVmFamilyDv3) + { + output = Json::Value("Dv3"); + return; + } if (input == AzureVmFamily::AzureVmFamilyF) { output = Json::Value("F"); @@ -260,6 +267,11 @@ namespace PlayFab output = Json::Value("Fsv2"); return; } + if (input == AzureVmFamily::AzureVmFamilyDasv4) + { + output = Json::Value("Dasv4"); + return; + } } inline void FromJsonEnum(const Json::Value& input, AzureVmFamily& output) { @@ -283,6 +295,11 @@ namespace PlayFab output = AzureVmFamily::AzureVmFamilyDv2; return; } + if (inputStr == "Dv3") + { + output = AzureVmFamily::AzureVmFamilyDv3; + return; + } if (inputStr == "F") { output = AzureVmFamily::AzureVmFamilyF; @@ -293,6 +310,11 @@ namespace PlayFab output = AzureVmFamily::AzureVmFamilyFsv2; return; } + if (inputStr == "Dasv4") + { + output = AzureVmFamily::AzureVmFamilyDasv4; + return; + } } enum class AzureVmSize @@ -322,7 +344,11 @@ namespace PlayFab AzureVmSizeStandard_F2s_v2, AzureVmSizeStandard_F4s_v2, AzureVmSizeStandard_F8s_v2, - AzureVmSizeStandard_F16s_v2 + AzureVmSizeStandard_F16s_v2, + AzureVmSizeStandard_D2as_v4, + AzureVmSizeStandard_D4as_v4, + AzureVmSizeStandard_D8as_v4, + AzureVmSizeStandard_D16as_v4 }; inline void ToJsonEnum(const AzureVmSize input, Json::Value& output) @@ -457,6 +483,26 @@ namespace PlayFab output = Json::Value("Standard_F16s_v2"); return; } + if (input == AzureVmSize::AzureVmSizeStandard_D2as_v4) + { + output = Json::Value("Standard_D2as_v4"); + return; + } + if (input == AzureVmSize::AzureVmSizeStandard_D4as_v4) + { + output = Json::Value("Standard_D4as_v4"); + return; + } + if (input == AzureVmSize::AzureVmSizeStandard_D8as_v4) + { + output = Json::Value("Standard_D8as_v4"); + return; + } + if (input == AzureVmSize::AzureVmSizeStandard_D16as_v4) + { + output = Json::Value("Standard_D16as_v4"); + return; + } } inline void FromJsonEnum(const Json::Value& input, AzureVmSize& output) { @@ -595,6 +641,26 @@ namespace PlayFab output = AzureVmSize::AzureVmSizeStandard_F16s_v2; return; } + if (inputStr == "Standard_D2as_v4") + { + output = AzureVmSize::AzureVmSizeStandard_D2as_v4; + return; + } + if (inputStr == "Standard_D4as_v4") + { + output = AzureVmSize::AzureVmSizeStandard_D4as_v4; + return; + } + if (inputStr == "Standard_D8as_v4") + { + output = AzureVmSize::AzureVmSizeStandard_D8as_v4; + return; + } + if (inputStr == "Standard_D16as_v4") + { + output = AzureVmSize::AzureVmSizeStandard_D16as_v4; + return; + } } enum class CancellationReason diff --git a/code/source/playfab/PlayFabClientApi.cpp b/code/source/playfab/PlayFabClientApi.cpp index f3089a91..c32caa4e 100644 --- a/code/source/playfab/PlayFabClientApi.cpp +++ b/code/source/playfab/PlayFabClientApi.cpp @@ -3948,8 +3948,8 @@ namespace PlayFab } } - void PlayFabClientAPI::LinkNintendoSwitchAccount( - LinkNintendoSwitchAccountRequest& request, + void PlayFabClientAPI::LinkNintendoAccount( + LinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback, void* customData @@ -3966,10 +3966,10 @@ namespace PlayFab headers.emplace("X-Authorization", context->clientSessionTicket); auto reqContainer = std::unique_ptr(new CallRequestContainer( - "/Client/LinkNintendoSwitchAccount", + "/Client/LinkNintendoAccount", headers, jsonAsString, - OnLinkNintendoSwitchAccountResult, + OnLinkNintendoAccountResult, settings, context, customData)); @@ -3980,7 +3980,7 @@ namespace PlayFab http.MakePostRequest(std::unique_ptr(static_cast(reqContainer.release()))); } - void PlayFabClientAPI::OnLinkNintendoSwitchAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) + void PlayFabClientAPI::OnLinkNintendoAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) { CallRequestContainer& container = static_cast(*reqContainer); std::shared_ptr context = container.GetContext(); @@ -4900,8 +4900,8 @@ namespace PlayFab } } - void PlayFabClientAPI::LoginWithNintendoSwitchAccount( - LoginWithNintendoSwitchAccountRequest& request, + void PlayFabClientAPI::LoginWithNintendoAccount( + LoginWithNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback, void* customData @@ -4921,10 +4921,10 @@ namespace PlayFab std::unordered_map headers; auto reqContainer = std::unique_ptr(new CallRequestContainer( - "/Client/LoginWithNintendoSwitchAccount", + "/Client/LoginWithNintendoAccount", headers, jsonAsString, - OnLoginWithNintendoSwitchAccountResult, + OnLoginWithNintendoAccountResult, settings, context, customData)); @@ -4935,7 +4935,7 @@ namespace PlayFab http.MakePostRequest(std::unique_ptr(static_cast(reqContainer.release()))); } - void PlayFabClientAPI::OnLoginWithNintendoSwitchAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) + void PlayFabClientAPI::OnLoginWithNintendoAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) { CallRequestContainer& container = static_cast(*reqContainer); std::shared_ptr context = container.GetContext(); @@ -7032,8 +7032,8 @@ namespace PlayFab } } - void PlayFabClientAPI::UnlinkNintendoSwitchAccount( - UnlinkNintendoSwitchAccountRequest& request, + void PlayFabClientAPI::UnlinkNintendoAccount( + UnlinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback, void* customData @@ -7050,10 +7050,10 @@ namespace PlayFab headers.emplace("X-Authorization", context->clientSessionTicket); auto reqContainer = std::unique_ptr(new CallRequestContainer( - "/Client/UnlinkNintendoSwitchAccount", + "/Client/UnlinkNintendoAccount", headers, jsonAsString, - OnUnlinkNintendoSwitchAccountResult, + OnUnlinkNintendoAccountResult, settings, context, customData)); @@ -7064,7 +7064,7 @@ namespace PlayFab http.MakePostRequest(std::unique_ptr(static_cast(reqContainer.release()))); } - void PlayFabClientAPI::OnUnlinkNintendoSwitchAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) + void PlayFabClientAPI::OnUnlinkNintendoAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) { CallRequestContainer& container = static_cast(*reqContainer); std::shared_ptr context = container.GetContext(); diff --git a/code/source/playfab/PlayFabClientInstanceApi.cpp b/code/source/playfab/PlayFabClientInstanceApi.cpp index 3af85499..05785023 100644 --- a/code/source/playfab/PlayFabClientInstanceApi.cpp +++ b/code/source/playfab/PlayFabClientInstanceApi.cpp @@ -4061,8 +4061,8 @@ namespace PlayFab } } - void PlayFabClientInstanceAPI::LinkNintendoSwitchAccount( - LinkNintendoSwitchAccountRequest& request, + void PlayFabClientInstanceAPI::LinkNintendoAccount( + LinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback, void* customData @@ -4080,10 +4080,10 @@ namespace PlayFab headers.emplace("X-Authorization", context->clientSessionTicket); auto reqContainer = std::unique_ptr(new CallRequestContainer( - "/Client/LinkNintendoSwitchAccount", + "/Client/LinkNintendoAccount", headers, jsonAsString, - std::bind(&PlayFabClientInstanceAPI::OnLinkNintendoSwitchAccountResult, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::bind(&PlayFabClientInstanceAPI::OnLinkNintendoAccountResult, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), settings, context, customData)); @@ -4094,7 +4094,7 @@ namespace PlayFab http.MakePostRequest(std::unique_ptr(static_cast(reqContainer.release()))); } - void PlayFabClientInstanceAPI::OnLinkNintendoSwitchAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) + void PlayFabClientInstanceAPI::OnLinkNintendoAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) { CallRequestContainer& container = static_cast(*reqContainer); std::shared_ptr context = container.GetContext(); @@ -5031,8 +5031,8 @@ namespace PlayFab } } - void PlayFabClientInstanceAPI::LoginWithNintendoSwitchAccount( - LoginWithNintendoSwitchAccountRequest& request, + void PlayFabClientInstanceAPI::LoginWithNintendoAccount( + LoginWithNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback, void* customData @@ -5053,10 +5053,10 @@ namespace PlayFab std::unordered_map headers; auto reqContainer = std::unique_ptr(new CallRequestContainer( - "/Client/LoginWithNintendoSwitchAccount", + "/Client/LoginWithNintendoAccount", headers, jsonAsString, - std::bind(&PlayFabClientInstanceAPI::OnLoginWithNintendoSwitchAccountResult, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::bind(&PlayFabClientInstanceAPI::OnLoginWithNintendoAccountResult, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), settings, context, customData)); @@ -5067,7 +5067,7 @@ namespace PlayFab http.MakePostRequest(std::unique_ptr(static_cast(reqContainer.release()))); } - void PlayFabClientInstanceAPI::OnLoginWithNintendoSwitchAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) + void PlayFabClientInstanceAPI::OnLoginWithNintendoAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) { CallRequestContainer& container = static_cast(*reqContainer); std::shared_ptr context = container.GetContext(); @@ -7205,8 +7205,8 @@ namespace PlayFab } } - void PlayFabClientInstanceAPI::UnlinkNintendoSwitchAccount( - UnlinkNintendoSwitchAccountRequest& request, + void PlayFabClientInstanceAPI::UnlinkNintendoAccount( + UnlinkNintendoAccountRequest& request, const ProcessApiCallback callback, const ErrorCallback errorCallback, void* customData @@ -7224,10 +7224,10 @@ namespace PlayFab headers.emplace("X-Authorization", context->clientSessionTicket); auto reqContainer = std::unique_ptr(new CallRequestContainer( - "/Client/UnlinkNintendoSwitchAccount", + "/Client/UnlinkNintendoAccount", headers, jsonAsString, - std::bind(&PlayFabClientInstanceAPI::OnUnlinkNintendoSwitchAccountResult, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), + std::bind(&PlayFabClientInstanceAPI::OnUnlinkNintendoAccountResult, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), settings, context, customData)); @@ -7238,7 +7238,7 @@ namespace PlayFab http.MakePostRequest(std::unique_ptr(static_cast(reqContainer.release()))); } - void PlayFabClientInstanceAPI::OnUnlinkNintendoSwitchAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) + void PlayFabClientInstanceAPI::OnUnlinkNintendoAccountResult(int /*httpCode*/, const std::string& /*result*/, const std::shared_ptr& reqContainer) { CallRequestContainer& container = static_cast(*reqContainer); std::shared_ptr context = container.GetContext(); diff --git a/code/source/playfab/PlayFabError.cpp b/code/source/playfab/PlayFabError.cpp index 5dece51c..60c621f8 100644 --- a/code/source/playfab/PlayFabError.cpp +++ b/code/source/playfab/PlayFabError.cpp @@ -89,6 +89,12 @@ namespace PlayFab } } } + + if(RequestId != "") + { + output += " \n RequestId: " + RequestId + "\n"; + } + return output; } diff --git a/code/source/playfab/PlayFabMultiplayerApi.cpp b/code/source/playfab/PlayFabMultiplayerApi.cpp index 135264d9..c5a12be4 100644 --- a/code/source/playfab/PlayFabMultiplayerApi.cpp +++ b/code/source/playfab/PlayFabMultiplayerApi.cpp @@ -2151,7 +2151,6 @@ namespace PlayFab std::string jsonAsString = requestJson.toStyledString(); std::unordered_map headers; - headers.emplace("X-EntityToken", context->entityToken); auto reqContainer = std::unique_ptr(new CallRequestContainer( "/MultiplayerServer/ListPartyQosServers", diff --git a/code/source/playfab/PlayFabMultiplayerInstanceApi.cpp b/code/source/playfab/PlayFabMultiplayerInstanceApi.cpp index f061edcc..7107b084 100644 --- a/code/source/playfab/PlayFabMultiplayerInstanceApi.cpp +++ b/code/source/playfab/PlayFabMultiplayerInstanceApi.cpp @@ -2225,7 +2225,6 @@ namespace PlayFab std::shared_ptr authenticationContext = request.authenticationContext == nullptr ? this->m_context : request.authenticationContext; std::unordered_map headers; - headers.emplace("X-EntityToken", context->entityToken); auto reqContainer = std::unique_ptr(new CallRequestContainer( "/MultiplayerServer/ListPartyQosServers", diff --git a/code/source/playfab/PlayFabSettings.cpp b/code/source/playfab/PlayFabSettings.cpp index 64bf49c4..095b0f59 100644 --- a/code/source/playfab/PlayFabSettings.cpp +++ b/code/source/playfab/PlayFabSettings.cpp @@ -7,9 +7,9 @@ namespace PlayFab // Control whether all callbacks are threaded or whether the user manually controls callback timing from their main-thread // Note ANY api call may synchronously throw an exception if the title id is not set bool PlayFabSettings::threadedCallbacks = false; - const std::string PlayFabSettings::sdkVersion = "3.29.200518"; + const std::string PlayFabSettings::sdkVersion = "3.30.200602"; const std::string PlayFabSettings::buildIdentifier = "jbuild_xplatcppsdk__sdk-genericslave-3_0"; - const std::string PlayFabSettings::versionString = "XPlatCppSdk-3.29.200518"; + const std::string PlayFabSettings::versionString = "XPlatCppSdk-3.30.200602"; std::string PlayFabSettings::productionEnvironmentURL = ".playfabapi.com"; ErrorCallback PlayFabSettings::globalErrorHandler = nullptr; diff --git a/com.playfab.xplatcppsdk.v141.autopkg b/com.playfab.xplatcppsdk.v141.autopkg index 1990af75..63e9ebcb 100644 --- a/com.playfab.xplatcppsdk.v141.autopkg +++ b/com.playfab.xplatcppsdk.v141.autopkg @@ -8,7 +8,7 @@ configurations { nuget { nuspec { id = "com.playfab.xplatcppsdk.v141"; - version : 3.29.200518; + version : 3.30.200602; title: "PlayFab Cross Platform C++ Sdk for Visual Studio 2017"; summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience."; authors: "PlayFab"; @@ -18,7 +18,7 @@ nuget { iconUrl: "https://playfab.com/assets/img/playfab-mark.png"; requireLicenseAcceptance: false; description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services."; - releaseNotes: "https://api.playfab.com/releaseNotes/#200518"; + releaseNotes: "https://api.playfab.com/releaseNotes/#200602"; copyright: "Copyright 2020"; language: "C++"; tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native }; diff --git a/com.playfab.xplatxboxsdk.v141.autopkg b/com.playfab.xplatxboxsdk.v141.autopkg index acd887d4..1bd3ae12 100644 --- a/com.playfab.xplatxboxsdk.v141.autopkg +++ b/com.playfab.xplatxboxsdk.v141.autopkg @@ -18,7 +18,7 @@ configurations { nuget { nuspec { id = "com.playfab.xplatxboxsdk.v141"; - version : 3.29.200518; + version : 3.30.200602; title: "PlayFab Xbox Platform C++ Sdk for Visual Studio 2017"; summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience."; authors: "PlayFab"; @@ -28,7 +28,7 @@ nuget { iconUrl: "https://playfab.com/assets/img/playfab-mark.png"; requireLicenseAcceptance: false; description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services."; - releaseNotes: "https://api.playfab.com/releaseNotes/#200518"; + releaseNotes: "https://api.playfab.com/releaseNotes/#200602"; copyright: "Copyright 2020"; language: "C++"; tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native, xbox };