Updated from pipeline, Version : 23.5.1

Author: AccelByte-Build

.variables

@@ -1,9 +1,9 @@
 export LEVEL=CRITICAL
 export REPO_NAME=justice-unreal-sdk-plugin
-export WORKDIR=/tmp/pipelines/4674800454/934782948/
-export COMMIT_HASH=0a02b07641c8d8ef8d81c1de001e3a40ee481f05
-export GIT_HASH=0a02b07641c8d8ef8d81c1de001e3a40ee481f05
-export VERSION=23.5.0
-export REVISION_ID=23.5.0
+export WORKDIR=/tmp/pipelines/4694888083/937992268/
+export COMMIT_HASH=c70bcde039015a4603ca597ae2617a9dffec6c0d
+export GIT_HASH=c70bcde039015a4603ca597ae2617a9dffec6c0d
+export VERSION=23.5.1
+export REVISION_ID=23.5.1
 export [email protected]
-export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDIzLjUuMCAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='
+export COMMIT_MESSAGE_BASE64='Y2hvcmUocmVsZWFzZSk6IDIzLjUuMSAtIGNvbW1pdGVkIGFuZCB0YWdnZWQgYnkgSmVua2lucwo='

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.
 
+### [23.5.1](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/23.5.1%0D23.5.0) (2023-07-20)
+
+
+### Bug Fixes
+
+* **AMS:** launch param cannot be read properly ([786170e](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/786170e5e05e64512c92d8b39f130a3b7aff5393))
+* **chatV2:** update websocket chat session id after connected ([c83f2c2](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/c83f2c2eb4e822bd54a3db5bff8c2f4f781c6933))
+* removed oculus iap sync API function due to incompatibility with AB service. ([10e5529](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/commits/10e5529100166be7e62c24b7b69227a9fe477e07))
+
 ## [23.5.0](https://bitbucket.org/accelbyte/justice-unreal-sdk-plugin/branches/compare/23.5.0%0D23.4.2) (2023-07-17)
 
 

Source/AccelByteUe4Sdk/Private/AccelByteUe4SdkModule.cpp

@@ -90,7 +90,9 @@ void FAccelByteUe4SdkModule::StartupModule()
 	AccelByte::FRegistry::ServerCredentials.Startup();
 
 #if UE_SERVER
-	if (!FParse::Param(FCommandLine::Get(), TEXT("dsid")))
+	FString ServerID;
+	FParse::Value(FCommandLine::Get(), TEXT("dsid="), ServerID);
+	if (ServerID.IsEmpty())
 	{
 		UE_LOG(LogAccelByte, Warning, TEXT("dsid not provided, not connecting to AMS"));
 	}

Source/AccelByteUe4Sdk/Private/Api/AccelByteChatApi.cpp

@@ -426,9 +426,9 @@ namespace AccelByte
 			}
 
 			TMap<FString, FString> Headers;
-			Headers.Add("X-Ab-ChatSessionID", ChatSessionId.SessionID);
-			Headers.Add("X-Ab-RpcEnvelopeStart", WsEnvelopeStart);
-			Headers.Add("X-Ab-RpcEnvelopeEnd", WsEnvelopeEnd);
+			Headers.Add(ChatSessionHeaderName, ChatSessionId.SessionID);
+			Headers.Add(TEXT("X-Ab-RpcEnvelopeStart"), WsEnvelopeStart);
+			Headers.Add(TEXT("X-Ab-RpcEnvelopeEnd"), WsEnvelopeEnd);
 			FModuleManager::Get().LoadModuleChecked(FName(TEXT("WebSockets")));
 			WebSocket = AccelByteWebSocket::Create(*SettingsRef.ChatServerWsUrl, TEXT("wss"), CredentialsRef, Headers, TSharedRef<IWebSocketFactory>(new FUnrealWebSocketFactory()), PingDelay, InitialBackoffDelay, MaxBackoffDelay, TotalTimeout);
 
@@ -770,7 +770,10 @@ namespace AccelByte
 				{
 					TSharedPtr<FJsonObject> Result = MessageAsJsonObj->GetObjectField(ChatToken::Json::Field::Params);
 					const bool bSuccess = FJsonObjectConverter::JsonObjectToUStruct(Result.ToSharedRef(), &ChatSessionId, 0, 0);
-
+					if (bSuccess)
+					{
+						WebSocket->UpdateUpgradeHeaders(ChatSessionHeaderName, ChatSessionId.SessionID);
+					}
 					break;
 				}
 				case(HandleType::Disconnect):

Source/AccelByteUe4Sdk/Private/Api/AccelByteEntitlementApi.cpp

@@ -841,31 +841,7 @@ void Entitlement::SellUserEntitlement(FString const& EntitlementId
 	FJsonSerializer::Serialize(Json.ToSharedRef(), Writer);
 
 	HttpClient.ApiRequest(TEXT("PUT"), Url, {}, Content, OnSuccess, OnError);
-}
-
-void Entitlement::SyncOculusConsumableEntitlements(THandler<TArray<FAccelByteModelsSyncOculusConsumableEntitlementInfo>> const& OnSuccess
-	, FErrorHandler const& OnError)
-{
-	FReport::Log(FString(__FUNCTION__));  
-	const FString Url = FString::Printf(TEXT("%s/public/namespaces/%s/users/%s/iap/oculus/sync")
-		, *SettingsRef.PlatformServerUrl
-		, *CredentialsRef.GetNamespace()
-		, *CredentialsRef.GetUserId());
-
-	HttpClient.ApiRequest(TEXT("PUT"), Url, {},  OnSuccess, OnError);
-}
-
-void Entitlement::SyncOculusDLC(FVoidHandler const& OnSuccess
-	, FErrorHandler const& OnError)
-{
-	FReport::Log(FString(__FUNCTION__));  
-	const FString Url = FString::Printf(TEXT("%s/public/namespaces/%s/users/%s/dlc/oculus/sync")
-		, *SettingsRef.PlatformServerUrl
-		, *CredentialsRef.GetNamespace()
-		, *CredentialsRef.GetUserId());
-
-	HttpClient.ApiRequest(TEXT("PUT"), Url, {},  OnSuccess, OnError);
-}
+} 
 
 } // Namespace Api
 }

Source/AccelByteUe4Sdk/Private/Core/AccelByteServerSettings.cpp

@@ -93,14 +93,13 @@ void ServerSettings::LoadSettings(const FString& SectionPath)
 		QosPingTimeout = .6;
 	}
 
-	FParse::Value(FCommandLine::Get(), TEXT("dsid"), DSId);
-
-	if (!FParse::Value(FCommandLine::Get(), TEXT("watchdog_url"), AMSServerWatchdogUrl))
+	FParse::Value(FCommandLine::Get(), TEXT("dsid="), DSId);
+	if (!FParse::Value(FCommandLine::Get(), TEXT("watchdog_url="), AMSServerWatchdogUrl))
 	{
 		GConfig->GetString(*DefaultServerSection, TEXT("WatchdogUrl"), AMSServerWatchdogUrl, GEngineIni);
 	}
 
-	if (!FParse::Value(FCommandLine::Get(), TEXT("heartbeat"), AMSHeartbeatInterval))
+	if (!FParse::Value(FCommandLine::Get(), TEXT("heartbeat="), AMSHeartbeatInterval))
 	{
 		GConfig->GetInt(*DefaultServerSection, TEXT("AMSHeartbeatInterval"), AMSHeartbeatInterval, GEngineIni);
 	}

Source/AccelByteUe4Sdk/Private/GameServerApi/AccelByteServerAMSApi.cpp

@@ -152,6 +152,11 @@ void ServerAMS::SetOnConnectionClosed(const FConnectionClosed& OnConnectionClose
 
 void ServerAMS::OnMessage(const FString& Message)
 {
+	if (Message.IsEmpty())
+	{
+		return;
+	}
+
 	UE_LOG(LogAccelByteAMS, Log, TEXT("New message received from AMS:\n%s"), *Message);
 
 	TSharedPtr<FJsonObject> MessageObject;
@@ -193,6 +198,8 @@ void ServerAMS::SendReadyMessage()
 	}
 
 	FString ReadyMessage = FString::Format(TEXT("{\"ready\":{\"dsid\":\"{0}\"}}"), { ServerSettingsRef.DSId });
+
+	UE_LOG(LogAccelByteAMS, Log, TEXT("Send ready message to AMS\n%s"), *ReadyMessage);
 	WebSocket->Send(ReadyMessage);
 
 	if (bHeartbeatJobStarted == false)

Source/AccelByteUe4Sdk/Public/Api/AccelByteChatApi.h

@@ -50,6 +50,8 @@ class ACCELBYTEUE4SDK_API Chat : public FApiBase
 
 	~Chat();
 private:
+	const FString ChatSessionHeaderName = TEXT("X-Ab-ChatSessionID");
+
 	Credentials& ChatCredentialsRef;
 	bool bBanNotifReceived = false;
 

Source/AccelByteUe4Sdk/Public/Api/AccelByteEntitlementApi.h

@@ -431,24 +431,6 @@ class ACCELBYTEUE4SDK_API Entitlement : public FApiBase
 		, THandler<FAccelByteModelsSellItemEntitlementInfo> const& OnSuccess
 		, FErrorHandler const& OnError);
 
-	/**
-	 * @brief Synchronize Oculus Consumable Entitlement/IAP.
-	 *
-	 * @param OnSuccess This will be called when the operation succeeded.
-	 * @param OnError This will be called when the operation failed.
-	 */	
-	void SyncOculusConsumableEntitlements(THandler<TArray<FAccelByteModelsSyncOculusConsumableEntitlementInfo>> const& OnSuccess
-		, FErrorHandler const& OnError);
-
-	/**
-	 * @brief Synchronize Oculus Downloadable Content/DLC.
-	 *
-	 * @param OnSuccess This will be called when the operation succeeded.
-	 * @param OnError This will be called when the operation failed.
-	 */	
-	void SyncOculusDLC(FVoidHandler const& OnSuccess
-		, FErrorHandler const& OnError);
-	
 private:
 	Entitlement() = delete;
 	Entitlement(Entitlement const&) = delete;

Source/AccelByteUe4Sdk/Public/Models/AccelByteEcommerceModels.h

@@ -264,23 +264,6 @@ enum class EAccelByteSubscriptionSummarySubscribedBy : uint8
 	PLATFORM 
 };
 
-UENUM(BlueprintType)
-enum class EAccelByteEntitlementItemIdentityType : uint8
-{
-	NONE = 0,
-	ITEM_ID,
-	ITEM_SKU 
-};
-
-UENUM(BlueprintType)
-enum class EAccelByteEntitlementIAPOrderStatus : uint8
-{
-	NONE = 0,
-	VERIFIED,
-	FULFILLED,
-	FAILED
-};
-
 #pragma endregion EnumField
 
 #pragma region ItemModelsField
@@ -2534,25 +2517,4 @@ struct ACCELBYTEUE4SDK_API FAccelByteModelsSellItemEntitlementInfo
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SellItemEntitlementInfo ")
 	FAccelByteModelsEntitlementInfo EntitlementInfo{}; 
-};
-
-USTRUCT(BlueprintType)
-struct ACCELBYTEUE4SDK_API FAccelByteModelsSyncOculusConsumableEntitlementInfo
-{
-	GENERATED_BODY()
-	
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
-	FString TransactionId{};
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
-	FString OculusItemSku{};
-	
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
-	EAccelByteEntitlementItemIdentityType ItemIdentityType{EAccelByteEntitlementItemIdentityType::NONE};
-	
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
-	FString ItemIdentity{};
-	
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Accelbyte | Entitlement | Models | SyncOculusConsumableEntitlementInfo ")
-	EAccelByteEntitlementIAPOrderStatus IAPOrderStatus{EAccelByteEntitlementIAPOrderStatus::NONE};
-};
+};