Skip to content

Commit

Permalink
https://api.playfab.com/releaseNotes/#181220
Browse files Browse the repository at this point in the history
  • Loading branch information
PlayFabJenkinsBot committed Dec 20, 2018
1 parent f24128e commit aceb8a0
Show file tree
Hide file tree
Showing 15 changed files with 150 additions and 139 deletions.
1 change: 0 additions & 1 deletion build/Linux/makefile
Expand Up @@ -39,7 +39,6 @@ OBJS = stdafx.o \
PlayFabProfilesApi.o \
PlayFabServerApi.o \
PlayFabSettings.o \
PlayFabTelemetryEventsApi.o \
PlayFabEvent.o \
PlayFabEventApi.o \
PlayFabEventBuffer.o \
Expand Down
4 changes: 1 addition & 3 deletions build/Windows/XPlatCppWindows.vcxproj
Expand Up @@ -140,8 +140,7 @@
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabMultiplayerDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabProfilesApi.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabProfilesDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsApi.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\OneDSEventsDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEvent.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEventApi.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEventBuffer.h" />
Expand Down Expand Up @@ -182,7 +181,6 @@
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabLocalizationApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabMultiplayerApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabProfilesApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabTelemetryEventsApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEvent.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEventApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEventBuffer.cpp" />
Expand Down
8 changes: 1 addition & 7 deletions build/Windows/XPlatCppWindows.vcxproj.filters
Expand Up @@ -128,10 +128,7 @@
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabPluginManager.h">
<Filter>Header Files\playfab</Filter>
</ClInclude>
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsApi.h">
<Filter>Header Files\playfab</Filter>
</ClInclude>
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsDataModels.h">
<ClInclude Include="$(SdkSourceDir)\include\playfab\OneDSEventsDataModels.h">
<Filter>Header Files\playfab</Filter>
</ClInclude>
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEvent.h">
Expand Down Expand Up @@ -247,9 +244,6 @@
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabPluginManager.cpp">
<Filter>Source Files\playfab</Filter>
</ClCompile>
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabTelemetryEventsApi.cpp">
<Filter>Source Files\playfab</Filter>
</ClCompile>
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEvent.cpp">
<Filter>Source Files\playfab</Filter>
</ClCompile>
Expand Down
5 changes: 2 additions & 3 deletions build/Xbox/TestXboxApp/TestCode.cpp
Expand Up @@ -15,8 +15,7 @@
#include <playfab/PlayFabProfilesApi.h>
#include <playfab/PlayFabProfilesDataModels.h>
#include <playfab/PlayFabSettings.h>
#include <playfab/PlayFabTelemetryEventsApi.h>
#include <playfab/PlayFabTelemetryEventsDataModels.h>
#include <playfab/OneDSEventsDataModels.h>
#include <playfab/PlayFabEventsApi.h>
#include <playfab/PlayFabEventsDataModels.h>
#include <playfab/PlayFabEventApi.h>
Expand Down Expand Up @@ -273,7 +272,7 @@ void TestOneDSEventsApi()
std::string oneDSHeaderJwtTicketKey;
std::string oneDSHeaderJwtTicketPrefix;
PlayFab::EventsModels::TelemetryIngestionConfigRequest configRequest;
PlayFab::PlayFabTelemetryEventsAPI::GetTelemetryIngestionConfig(configRequest,
PlayFab::OneDSEventsAPI::GetTelemetryIngestionConfig(configRequest,
[&](const PlayFab::EventsModels::TelemetryIngestionConfigResponse& result, void* relayedCustomData)
{
oneDSProjectIdIkey = "o:" + result.TenantId;
Expand Down
4 changes: 1 addition & 3 deletions build/Xbox/XPlatXbox.vcxproj
Expand Up @@ -198,8 +198,7 @@
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabMultiplayerDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabProfilesApi.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabProfilesDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsApi.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\OneDSEventsDataModels.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEvent.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEventApi.h" />
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabEventBuffer.h" />
Expand Down Expand Up @@ -241,7 +240,6 @@
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabLocalizationApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabMultiplayerApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabProfilesApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabTelemetryEventsApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEvent.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEventApi.cpp" />
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEventBuffer.cpp" />
Expand Down
8 changes: 1 addition & 7 deletions build/Xbox/XPlatXbox.vcxproj.filters
Expand Up @@ -131,10 +131,7 @@
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabPluginManager.h">
<Filter>Header Files\playfab</Filter>
</ClInclude>
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsApi.h">
<Filter>Header Files\playfab</Filter>
</ClInclude>
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTelemetryEventsDataModels.h">
<ClInclude Include="$(SdkSourceDir)\include\playfab\OneDSEventsDataModels.h">
<Filter>Header Files\playfab</Filter>
</ClInclude>
<ClInclude Include="$(SdkSourceDir)\include\playfab\PlayFabTransportHeaders.h">
Expand Down Expand Up @@ -253,9 +250,6 @@
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabPluginManager.cpp">
<Filter>Source Files\playfab</Filter>
</ClCompile>
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabTelemetryEventsApi.cpp">
<Filter>Source Files\playfab</Filter>
</ClCompile>
<ClCompile Include="$(SdkSourceDir)\source\playfab\PlayFabEvent.cpp">
<Filter>Source Files\playfab</Filter>
</ClCompile>
Expand Down
3 changes: 3 additions & 0 deletions code/include/playfab/OneDSEventsApi.h
Expand Up @@ -5,6 +5,7 @@
#include <playfab/PlayFabCallRequestContainer.h>
#include <playfab/PlayFabEventsDataModels.h>
#include <playfab/PlayFabEvent.h>
#include <playfab/OneDSEventsDataModels.h>
#include <string>

namespace PlayFab
Expand Down Expand Up @@ -34,9 +35,11 @@ namespace PlayFab
void ForgetAllCredentials();
bool GetIsOneDSAuthenticated() const;

static void GetTelemetryIngestionConfig(EventsModels::TelemetryIngestionConfigRequest& request, ProcessApiCallback<EventsModels::TelemetryIngestionConfigResponse> callback, ErrorCallback errorCallback = nullptr, void* customData = nullptr);
void WriteTelemetryEvents(EventsModels::WriteEventsRequest& request, ProcessApiCallback<EventsModels::OneDSWriteEventsResponse> callback, ErrorCallback errorCallback = nullptr, void* customData = nullptr);

private:
static void OnGetTelemetryIngestionConfigResult(int httpCode, std::string result, std::unique_ptr<CallRequestContainerBase> reqContainer);
static void OnWriteTelemetryEventsResult(int httpCode, std::string result, std::unique_ptr<CallRequestContainerBase> reqContainer);
static bool ValidateResult(PlayFabResultCommon& resultCommon, CallRequestContainer& container);

Expand Down
87 changes: 87 additions & 0 deletions code/include/playfab/OneDSEventsDataModels.h
@@ -0,0 +1,87 @@
#pragma once

#ifndef DISABLE_PLAYFABENTITY_API

#include <playfab/PlayFabBaseModel.h>
#include <playfab/PlayFabJsonHeaders.h>

namespace PlayFab
{
namespace EventsModels
{
struct TelemetryIngestionConfigRequest : public PlayFabRequestCommon
{

TelemetryIngestionConfigRequest() :
PlayFabRequestCommon()
{}

TelemetryIngestionConfigRequest(const TelemetryIngestionConfigRequest&) :
PlayFabRequestCommon()
{}

~TelemetryIngestionConfigRequest() = default;

void FromJson(Json::Value&) override
{
}

Json::Value ToJson() const override
{
Json::Value output;
return output;
}
};

struct TelemetryIngestionConfigResponse : public PlayFabResultCommon
{
std::string IngestionKey;
std::string TelemetryJwtHeaderKey;
std::string TelemetryJwtHeaderPrefix;
std::string TelemetryJwtToken;
std::string TenantId;

TelemetryIngestionConfigResponse() :
PlayFabResultCommon(),
IngestionKey(),
TelemetryJwtHeaderKey(),
TelemetryJwtHeaderPrefix(),
TelemetryJwtToken(),
TenantId()
{}

TelemetryIngestionConfigResponse(const TelemetryIngestionConfigResponse& src) :
PlayFabResultCommon(),
IngestionKey(src.IngestionKey),
TelemetryJwtHeaderKey(src.TelemetryJwtHeaderKey),
TelemetryJwtHeaderPrefix(src.TelemetryJwtHeaderPrefix),
TelemetryJwtToken(src.TelemetryJwtToken),
TenantId(src.TenantId)
{}

~TelemetryIngestionConfigResponse() = default;

void FromJson(Json::Value& input) override
{
FromJsonUtilS(input["IngestionKey"], IngestionKey);
FromJsonUtilS(input["TelemetryJwtHeaderKey"], TelemetryJwtHeaderKey);
FromJsonUtilS(input["TelemetryJwtHeaderPrefix"], TelemetryJwtHeaderPrefix);
FromJsonUtilS(input["TelemetryJwtToken"], TelemetryJwtToken);
FromJsonUtilS(input["TenantId"], TenantId);
}

Json::Value ToJson() const override
{
Json::Value output;
Json::Value each_IngestionKey; ToJsonUtilS(IngestionKey, each_IngestionKey); output["IngestionKey"] = each_IngestionKey;
Json::Value each_TelemetryJwtHeaderKey; ToJsonUtilS(TelemetryJwtHeaderKey, each_TelemetryJwtHeaderKey); output["TelemetryJwtHeaderKey"] = each_TelemetryJwtHeaderKey;
Json::Value each_TelemetryJwtHeaderPrefix; ToJsonUtilS(TelemetryJwtHeaderPrefix, each_TelemetryJwtHeaderPrefix); output["TelemetryJwtHeaderPrefix"] = each_TelemetryJwtHeaderPrefix;
Json::Value each_TelemetryJwtToken; ToJsonUtilS(TelemetryJwtToken, each_TelemetryJwtToken); output["TelemetryJwtToken"] = each_TelemetryJwtToken;
Json::Value each_TenantId; ToJsonUtilS(TenantId, each_TenantId); output["TenantId"] = each_TenantId;
return output;
}
};
}
}

#endif

0 comments on commit aceb8a0

Please sign in to comment.