Skip to content

Commit fa7abe2

Browse files
author
root
committed
Updated from pipeline, Version : 13.0.0
1 parent 95516d8 commit fa7abe2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+607
-92
lines changed

‎.variables‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
export DO_UPDATE=true
12
export LEVEL=CRITICAL
23
export REPO_NAME=justice-unreal-sdk-plugin
3-
export WORKDIR=/tmp/pipelines/2585552478/562922837/
4-
export COMMIT_HASH=dee157a1931807619ed354889862261b346605ae
5-
export GIT_HASH=dee157a1931807619ed354889862261b346605ae
6-
export VERSION=12.2.1
7-
export REVISION_ID=12.2.1
4+
export WORKDIR=/tmp/pipelines/2610350453/567577416/
5+
export COMMIT_HASH=fa82ca4ea200e62da466b8f99df0001921a1fbd9
6+
export GIT_HASH=fa82ca4ea200e62da466b8f99df0001921a1fbd9
7+
export VERSION=13.0.0
8+
export REVISION_ID=13.0.0
89
export [email protected]
9-
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDEyLjIuMSAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='
10+
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDEzLjAuMCAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='

‎CHANGELOG.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [13.0.0](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/13.0.0%0D12.2.1) (2022-06-20)
6+
7+
8+
### ⚠ BREAKING CHANGES
9+
10+
* new param Source and tags in GrantExpToUser method
11+
12+
### Features
13+
14+
* **credentials:** add function to get IsComply ([b84625e](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/b84625e79e6cad8b517385eefdc3d9bb1ebf6af9))
15+
* **precompileHeader:** Resolve compile when set BuildConfiguration UsePchFiles as false ([025fa48](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/025fa486b77e1d933b889c3b504ee3c58f684fc0))
16+
* **seasonpass:** make new params (source & tags) as optional. ([7f46ba7](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/7f46ba7ecb1f025f27e28341c3e6fbe09a4a4a50))
17+
* **user:** add login with refresh token param ([dffdaff](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/dffdaff6bf405b47d4474809355e37f0634c469d))
18+
* **user:** fix query search users encode twice ([8c53ae1](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/8c53ae1e92a29e01a02044a0b8c049c95215542d))
19+
* **user:** fix query search users encode twice ([1411838](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/14118389d1f5f5fe5600830780ed6f74d6da71be))
20+
21+
22+
### Bug Fixes
23+
24+
* create ticker alias to support both UE4 FTicker and UE5 FTSTicker ([e4dca48](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/e4dca4802d0055f7dc348270b4f186f5b7dae35f))
25+
* wrong implementation causing errors ([a3242e5](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/a3242e56da934fe58e458308f1a6cedf879b24c3))
26+
27+
28+
### seasonpass
29+
30+
* Granted Season Pass EXP Tracking ([4afa10c](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/4afa10c70e9c7b23809c84ab2a14ad1b998a2f78))
31+
32+
33+
### Tests
34+
35+
* **reporting:** add missing object type when submitting report ([41295ec](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/41295ecc8d50246d6b227129863a135bacdacb99))
36+
537
### [12.2.1](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/12.2.1%0D12.2.0) (2022-06-14)
638

739

‎Content/CompatibilityMap.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"iam": {
3-
"minVersion": "5.10.1",
4-
"maxVersion": "5.10.1"
3+
"minVersion": "5.11.0",
4+
"maxVersion": "5.11.0"
55
},
66
"agreement": {
77
"minVersion": "1.22.2",
88
"maxVersion": "1.22.2"
99
},
1010
"basic": {
11-
"minVersion": "1.36.3",
12-
"maxVersion": "1.36.3"
11+
"minVersion": "1.37.0",
12+
"maxVersion": "1.37.0"
1313
},
1414
"platform": {
15-
"minVersion": "4.10.0",
16-
"maxVersion": "4.10.0"
15+
"minVersion": "4.10.1",
16+
"maxVersion": "4.10.1"
1717
},
1818
"social": {
1919
"minVersion": "1.29.2",
@@ -24,32 +24,32 @@
2424
"maxVersion": "2.15.5"
2525
},
2626
"achievement": {
27-
"minVersion": "2.10.6",
28-
"maxVersion": "2.10.6"
27+
"minVersion": "2.10.7",
28+
"maxVersion": "2.10.7"
2929
},
3030
"cloudsave": {
31-
"minVersion": "3.0.1",
32-
"maxVersion": "3.0.1"
31+
"minVersion": "3.1.0",
32+
"maxVersion": "3.1.0"
3333
},
3434
"ugc": {
35-
"minVersion": "2.1.0",
36-
"maxVersion": "2.1.0"
35+
"minVersion": "2.2.0",
36+
"maxVersion": "2.2.0"
3737
},
3838
"lobby": {
39-
"minVersion": "3.10.3",
40-
"maxVersion": "3.10.3"
39+
"minVersion": "3.11.0",
40+
"maxVersion": "3.11.0"
4141
},
4242
"group": {
4343
"minVersion": "2.11.5",
4444
"maxVersion": "2.11.5"
4545
},
4646
"qosm": {
47-
"minVersion": "1.14.0",
48-
"maxVersion": "1.14.0"
47+
"minVersion": "1.14.1",
48+
"maxVersion": "1.14.1"
4949
},
5050
"dsmcontroller": {
51-
"minVersion": "3.2.1",
52-
"maxVersion": "3.2.1"
51+
"minVersion": "3.2.2",
52+
"maxVersion": "3.2.2"
5353
},
5454
"game-telemetry": {
5555
"minVersion": "1.7.1",

‎Source/AccelByteUe4Sdk/AccelByteUe4Sdk.Build.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class AccelByteUe4Sdk : ModuleRules
1414
{
1515
public AccelByteUe4Sdk(ReadOnlyTargetRules Target) : base(Target)
1616
{
17-
#if UE_4_24_OR_LATER
17+
#if UE_4_24_OR_LATER || UE_5_0_OR_LATER
1818
bLegacyPublicIncludePaths = false;
1919
DefaultBuildSettings = BuildSettingsVersion.V2;
2020
#else
@@ -32,7 +32,7 @@ public AccelByteUe4Sdk(ReadOnlyTargetRules Target) : base(Target)
3232
"Sockets",
3333
"Json",
3434
"JsonUtilities",
35-
"Http",
35+
"HTTP",
3636
"WebSockets",
3737
"Networking",
3838
"SSL",

‎Source/AccelByteUe4Sdk/Private/Api/AccelByteEntitlementApi.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,12 @@ void Entitlement::UpdateDistributionReceiver(FString const& ExtUserId, FAccelByt
335335
}
336336

337337
void Entitlement::SyncPlatformPurchase(EAccelBytePlatformSync PlatformType, FVoidHandler const& OnSuccess, FErrorHandler const& OnError)
338+
{
339+
FAccelByteModelsPlayStationDLCSync PSSyncModel;
340+
SyncPlatformPurchase(PlatformType, PSSyncModel, OnSuccess, OnError);
341+
}
342+
343+
void Entitlement::SyncPlatformPurchase(EAccelBytePlatformSync PlatformType, FAccelByteModelsPlayStationDLCSync const& PSSyncModel, FVoidHandler const& OnSuccess, FErrorHandler const& OnError)
338344
{
339345
FReport::Log(FString(__FUNCTION__));
340346

@@ -357,6 +363,7 @@ void Entitlement::SyncPlatformPurchase(EAccelBytePlatformSync PlatformType, FVoi
357363
break;
358364
case EAccelBytePlatformSync::PLAYSTATION:
359365
PlatformText = TEXT("psn");
366+
Content = FString::Printf(TEXT("{\"serviceLabel\": \"%d\"}"), PSSyncModel.ServiceLabel);
360367
break;
361368
case EAccelBytePlatformSync::EPIC_GAMES:
362369
PlatformText = TEXT("epicgames");

‎Source/AccelByteUe4Sdk/Private/Api/AccelByteGameTelemetryApi.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void GameTelemetry::Send(FAccelByteModelsTelemetryBody TelemetryBody, FVoidHandl
7272
{
7373
bTelemetryJobStarted = true;
7474
GameTelemetryTickDelegate = FTickerDelegate::CreateRaw(this, &GameTelemetry::PeriodicTelemetry);
75-
GameTelemetryTickDelegateHandle = FTicker::GetCoreTicker().AddTicker(GameTelemetryTickDelegate, static_cast<float>(TelemetryInterval.GetTotalSeconds()));
75+
GameTelemetryTickDelegateHandle = FTickerAlias::GetCoreTicker().AddTicker(GameTelemetryTickDelegate, static_cast<float>(TelemetryInterval.GetTotalSeconds()));
7676
}
7777
}
7878
}
@@ -94,7 +94,7 @@ void GameTelemetry::Shutdown()
9494
{
9595
if (GameTelemetryTickDelegateHandle.IsValid())
9696
{
97-
FTicker::GetCoreTicker().RemoveTicker(GameTelemetryTickDelegateHandle);
97+
FTickerAlias::GetCoreTicker().RemoveTicker(GameTelemetryTickDelegateHandle);
9898
GameTelemetryTickDelegateHandle.Reset();
9999
}
100100
// flush events

‎Source/AccelByteUe4Sdk/Private/Api/AccelByteQos.cpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// and restrictions contact your company contract manager.
44

55
#include "Api/AccelByteQos.h"
6+
#include "Icmp.h"
7+
#include "Networking.h"
68
#include "Api/AccelByteQosManagerApi.h"
79
#include "Core/AccelByteRegistry.h"
810

@@ -12,8 +14,8 @@ namespace Api
1214
{
1315
FAccelByteModelsQosServerList Qos::QosServers = {};
1416
TArray<TPair<FString, float>> Qos::Latencies = {};
15-
FDelegateHandle Qos::PollLatenciesHandle;
16-
FDelegateHandle Qos::PollServerLatenciesHandle;
17+
FDelegateHandleAlias Qos::PollLatenciesHandle;
18+
FDelegateHandleAlias Qos::PollServerLatenciesHandle;
1719

1820
Qos::Qos(Credentials& InCredentialsRef
1921
, Settings const& InSettingsRef)
@@ -156,10 +158,8 @@ namespace Api
156158

157159
// -----------------------------------
158160
// Schedule a Latencies refresh poller
159-
auto& Ticker = FTicker::GetCoreTicker();
160-
161161
// Loop infinitely, every x seconds, until we tell the delegate to stop via RemoveFromTicker()
162-
Qos::PollLatenciesHandle = Ticker.AddTicker(FTickerDelegate::CreateLambda(
162+
Qos::PollLatenciesHandle = FTickerAlias::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda(
163163
[this](float DeltaTime)
164164
{
165165
PingRegionsSetLatencies(Qos::QosServers, nullptr, nullptr);
@@ -189,10 +189,8 @@ namespace Api
189189

190190
// -----------------------------------
191191
// Schedule a Latencies refresh poller
192-
auto& Ticker = FTicker::GetCoreTicker();
193-
194192
// Loop infinitely, every x seconds, until we tell the delegate to stop via RemoveFromTicker()
195-
Qos::PollServerLatenciesHandle = Ticker.AddTicker(FTickerDelegate::CreateLambda(
193+
Qos::PollServerLatenciesHandle = FTickerAlias::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda(
196194
[this](float DeltaTime)
197195
{
198196
constexpr bool bPingRegionsOnSuccess = false;
@@ -202,12 +200,12 @@ namespace Api
202200
}), AdjustedSecondsPerTick);
203201
}
204202

205-
void Qos::RemoveFromTicker(FDelegateHandle& Handle)
203+
void Qos::RemoveFromTicker(FDelegateHandleAlias& Handle)
206204
{
207205
if (!Handle.IsValid())
208206
return;
209207

210-
FTicker::GetCoreTicker().RemoveTicker(Handle);
208+
FTickerAlias::GetCoreTicker().RemoveTicker(Handle);
211209
Handle.Reset();
212210
}
213211

‎Source/AccelByteUe4Sdk/Private/Api/AccelByteSeasonPassApi.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ namespace AccelByte
343343
TMap<FString, TArray<FString>> SeasonPass::FJsonObjectToPassRewards(TSharedPtr<FJsonObject> JsonObject)
344344
{
345345
TMap<FString, TArray<FString>> PassAndRewardCode;
346-
for (TTuple<FString, TSharedPtr<FJsonValue, ESPMode::Fast>> const& PassReward : JsonObject->Values)
346+
for (TTuple<FString, TSharedPtr<FJsonValue>> const& PassReward : JsonObject->Values)
347347
{
348348
TArray<FString> ClaimRewardCode;
349349

‎Source/AccelByteUe4Sdk/Private/Api/AccelByteSessionBrowserApi.cpp‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,40 @@ namespace Api
236236
HttpRef.ProcessRequest(Request, CreateHttpResultHandler(OnSuccess, OnError), FPlatformTime::Seconds());
237237
}
238238

239+
void SessionBrowser::UpdateGameSettings(FString const& SessionId, TMap<FString, FString> Settings, THandler<FAccelByteModelsSessionBrowserData> const& OnSuccess, FErrorHandler const& OnError)
240+
{
241+
auto SettingJson = MakeShared<FJsonObject>();
242+
for (const auto& Set : Settings)
243+
{
244+
SettingJson->SetStringField(Set.Key, Set.Value);
245+
}
246+
247+
UpdateGameSettings(SessionId, SettingJson, OnSuccess, OnError);
248+
}
249+
250+
void SessionBrowser::UpdateGameSettings(FString const& SessionId, TSharedPtr<FJsonObject> Settings, THandler<FAccelByteModelsSessionBrowserData> const& OnSuccess, FErrorHandler const& OnError)
251+
{
252+
FString Authorization = FString::Printf(TEXT("Bearer %s"), *CredentialsRef.GetAccessToken());
253+
FString Url = FString::Printf(TEXT("%s/namespaces/%s/gamesession/%s/settings"), *SettingsRef.SessionBrowserServerUrl, *CredentialsRef.GetNamespace(), *SessionId);
254+
FString Verb = TEXT("PUT");
255+
FString ContentType = TEXT("application/json");
256+
FString Accept = TEXT("application/json");
257+
258+
FString Content;
259+
TSharedRef< TJsonWriter<> > Writer = TJsonWriterFactory<>::Create(&Content);
260+
FJsonSerializer::Serialize(Settings.ToSharedRef(), Writer);
261+
262+
FHttpRequestPtr Request = FHttpModule::Get().CreateRequest();
263+
Request->SetURL(Url);
264+
Request->SetHeader(TEXT("Authorization"), Authorization);
265+
Request->SetVerb(Verb);
266+
Request->SetHeader(TEXT("Content-Type"), ContentType);
267+
Request->SetHeader(TEXT("Accept"), Accept);
268+
Request->SetContentAsString(Content);
269+
270+
HttpRef.ProcessRequest(Request, CreateHttpResultHandler(OnSuccess, OnError), FPlatformTime::Seconds());
271+
}
272+
239273
void SessionBrowser::RemoveGameSession(FString const& SessionId
240274
, THandler<FAccelByteModelsSessionBrowserData> const& OnSuccess
241275
, FErrorHandler const& OnError)

‎Source/AccelByteUe4Sdk/Private/Api/AccelByteUserApi.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,22 @@ void User::LoginWithLauncher(const FVoidHandler& OnSuccess, const FErrorHandler
318318
}
319319

320320
void User::LoginWithRefreshToken(const FVoidHandler& OnSuccess, const FErrorHandler& OnError) const
321+
{
322+
LoginWithRefreshToken(CredentialsRef.GetRefreshToken(), OnSuccess, OnError);
323+
}
324+
325+
void AccelByte::Api::User::LoginWithRefreshToken(const FString& RefreshToken, const FVoidHandler& OnSuccess, const FErrorHandler& OnError) const
321326
{
322327
FReport::Log(FString(__FUNCTION__));
323328

324329
Oauth2::GetTokenWithRefreshToken(
325330
CredentialsRef.GetOAuthClientId(),
326331
CredentialsRef.GetOAuthClientSecret(),
327-
CredentialsRef.GetRefreshToken(),
332+
RefreshToken,
328333
THandler<FOauth2Token>::CreateLambda([this, OnSuccess, OnError](const FOauth2Token& Result)
329334
{
330335
OnLoginSuccess(OnSuccess, Result); // Curry to general handler
331-
}),
336+
}),
332337
FErrorHandler::CreateLambda([OnError](const int32 ErrorCode, const FString& ErrorMessage)
333338
{
334339
OnError.ExecuteIfBound(ErrorCode, ErrorMessage);
@@ -960,7 +965,7 @@ void User::SearchUsers(const FString& Query, EAccelByteSearchType By, const THan
960965
FString Content;
961966

962967
TMap<FString, FString> QueryParams = {};
963-
QueryParams.Add("query", *FGenericPlatformHttp::UrlEncode(Query));
968+
QueryParams.Add("query", Query);
964969
if (By != EAccelByteSearchType::ALL)
965970
{
966971
FString SearchId = SearchStrings[static_cast<std::underlying_type<EAccelByteSearchType>::type>(By)];

0 commit comments

Comments
 (0)