Skip to content

Commit 95516d8

Browse files
Updated from pipeline, Version : 12.2.1
1 parent 8fd1446 commit 95516d8

File tree

8 files changed

+32
-25
lines changed

8 files changed

+32
-25
lines changed

.variables

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
export DO_UPDATE=true
21
export LEVEL=CRITICAL
32
export REPO_NAME=justice-unreal-sdk-plugin
4-
export WORKDIR=/tmp/pipelines/2548961204/556205868/
5-
export COMMIT_HASH=e55bd23c43981d22239b43bf2a85e05aa509c0bf
6-
export GIT_HASH=e55bd23c43981d22239b43bf2a85e05aa509c0bf
7-
export VERSION=12.2.0
8-
export REVISION_ID=12.2.0
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
98
10-
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDEyLjIuMCAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='
9+
export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDEyLjIuMSAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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+
### [12.2.1](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/12.2.1%0D12.2.0) (2022-06-14)
6+
7+
8+
### Bug Fixes
9+
10+
* OAuth client credentials not set when ApiClient is created without the MultiRegistry ([c727808](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/c727808dd097f529fc336226c80b81bb20fafc7e))
11+
512
## [12.2.0](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/12.2.0%0D12.1.2) (2022-06-06)
613

714

Content/CompatibilityMap.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"iam": {
3-
"minVersion": "5.10.0",
4-
"maxVersion": "5.10.0"
3+
"minVersion": "5.10.1",
4+
"maxVersion": "5.10.1"
55
},
66
"agreement": {
77
"minVersion": "1.22.2",
@@ -36,8 +36,8 @@
3636
"maxVersion": "2.1.0"
3737
},
3838
"lobby": {
39-
"minVersion": "3.10.0",
40-
"maxVersion": "3.10.0"
39+
"minVersion": "3.10.3",
40+
"maxVersion": "3.10.3"
4141
},
4242
"group": {
4343
"minVersion": "2.11.5",
@@ -48,8 +48,8 @@
4848
"maxVersion": "1.14.0"
4949
},
5050
"dsmcontroller": {
51-
"minVersion": "3.2.0",
52-
"maxVersion": "3.2.0"
51+
"minVersion": "3.2.1",
52+
"maxVersion": "3.2.1"
5353
},
5454
"game-telemetry": {
5555
"minVersion": "1.7.1",

Source/AccelByteUe4Sdk/Private/AccelByteUe4SdkModule.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class FAccelByteUe4SdkModule : public IAccelByteUe4SdkModuleInterface
3131
virtual ESettingsEnvironment const& GetSettingsEnvironment() const override;
3232
virtual FEnvironmentChangedDelegate& OnEnvironmentChanged() override;
3333
private:
34-
AccelByte::Settings ClientSettings;
35-
AccelByte::ServerSettings ServerSettings;
36-
ESettingsEnvironment SettingsEnvironment;
37-
FEnvironmentChangedDelegate EnvironmentChangedDelegate;
34+
AccelByte::Settings ClientSettings{};
35+
AccelByte::ServerSettings ServerSettings{};
36+
ESettingsEnvironment SettingsEnvironment{ESettingsEnvironment::Default};
37+
FEnvironmentChangedDelegate EnvironmentChangedDelegate{};
3838

3939
// For registering settings in UE4 editor
4040
void RegisterSettings();
@@ -198,7 +198,7 @@ bool FAccelByteUe4SdkModule::LoadServerSettings(ESettingsEnvironment const Envir
198198

199199
bool FAccelByteUe4SdkModule::LoadSettingsFromConfigUObject()
200200
{
201-
return LoadClientSettings(ESettingsEnvironment::Default);
201+
return LoadClientSettings(SettingsEnvironment);
202202
}
203203

204204
bool FAccelByteUe4SdkModule::LoadServerSettingsFromConfigUObject()
@@ -216,7 +216,7 @@ bool FAccelByteUe4SdkModule::LoadServerSettingsFromConfigUObject()
216216

217217
if (bEnableSettings)
218218
{
219-
bResult = LoadServerSettings(ESettingsEnvironment::Default);
219+
bResult = LoadServerSettings(SettingsEnvironment);
220220
}
221221

222222
return bResult;

Source/AccelByteUe4Sdk/Private/Core/AccelByteCredentials.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "Core/AccelByteHttpRetryScheduler.h"
77
#include "Core/AccelByteOauth2Api.h"
88
#include "Models/AccelByteOauth2Models.h"
9+
#include "AccelByteUe4SdkModule.h"
910

1011
using namespace AccelByte::Api;
1112

@@ -146,6 +147,8 @@ void Credentials::Startup()
146147
return true;
147148
}),
148149
0.2f);
150+
IAccelByteUe4SdkModuleInterface& ABSDKModule = IAccelByteUe4SdkModuleInterface::Get();
151+
SetClientCredentials(ABSDKModule.GetSettingsEnvironment());
149152
}
150153

151154
void Credentials::Shutdown()

Source/AccelByteUe4Sdk/Private/Core/AccelByteMultiRegistry.cpp

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

55
#include "Core/AccelByteMultiRegistry.h"
6-
#include "AccelByteUe4SdkModule.h"
76

87
namespace AccelByte
98
{
@@ -20,9 +19,7 @@ FApiClientPtr AccelByte::FMultiRegistry::GetApiClient(const FString &Key)
2019
}
2120
else
2221
{
23-
IAccelByteUe4SdkModuleInterface& ABSDKModule = IAccelByteUe4SdkModuleInterface::Get();
2422
NewClient = MakeShared<FApiClient, ESPMode::ThreadSafe>();
25-
NewClient->CredentialsRef->SetClientCredentials(ABSDKModule.GetSettingsEnvironment());
2623
}
2724

2825
ApiClientInstances.Add(Key, NewClient);
@@ -43,9 +40,7 @@ FServerApiClientPtr AccelByte::FMultiRegistry::GetServerApiClient(const FString
4340
}
4441
else
4542
{
46-
IAccelByteUe4SdkModuleInterface& ABSDKModule = IAccelByteUe4SdkModuleInterface::Get();
4743
NewClient = MakeShared<FServerApiClient, ESPMode::ThreadSafe>();
48-
NewClient->ServerCredentialsRef->SetClientCredentials(ABSDKModule.GetSettingsEnvironment());
4944
}
5045

5146
ServerApiClientInstances.Add(Key, NewClient);

Source/AccelByteUe4Sdk/Private/Core/AccelByteServerCredentials.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "Core/AccelByteOauth2Api.h"
88
#include "GameServerApi/AccelByteServerOauth2Api.h"
99
#include "Models/AccelByteOauth2Models.h"
10+
#include "AccelByteUe4SdkModule.h"
1011

1112
using namespace AccelByte::Api;
1213

@@ -102,6 +103,8 @@ void ServerCredentials::SetClientToken(const FString& AccessToken, double Expire
102103

103104
void ServerCredentials::Startup()
104105
{
106+
IAccelByteUe4SdkModuleInterface& ABSDKModule = IAccelByteUe4SdkModuleInterface::Get();
107+
SetClientCredentials(ABSDKModule.GetSettingsEnvironment());
105108
}
106109

107110
void ServerCredentials::Shutdown()

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "12.2.0"
2+
"version": "12.2.1"
33
}

0 commit comments

Comments
 (0)