[DX-2956, DX-2965] refactor: updated passport delegate handling due to changes in the game bridge (#92)

YermekG · web-flow · commit f9b32f469598 · 2024-07-08T11:00:18.000+12:00
* chore: update game bridge(tag 1.44.3)

* refactor: updated passport to match bridge changes for consistent callback result structure
diff --git a/Content/PackagedResources/index.uasset b/Content/PackagedResources/index.uasset
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblConnectImxAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblConnectImxAsyncAction.cpp
@@ -96,6 +96,6 @@ void UImtblConnectionAsyncActions::OnConnect(FImmutablePassportResult Result)
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message);
+		Failed.Broadcast(Result.Error);
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportConnectEvmAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportConnectEvmAsyncAction.cpp
@@ -38,10 +38,10 @@ void UImtblPassportConnectEvmAsyncAction::OnConnectEvm(FImmutablePassportResult
 {
 	if (Result.Success)
 	{
-		Success.Broadcast(Result.Message);
+		Success.Broadcast("");
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message);
+		Failed.Broadcast(Result.Error);
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetAccessTokenAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetAccessTokenAsyncAction.cpp
@@ -38,10 +38,10 @@ void UImtblPassportGetAccessTokenAsyncAction::OnGetAccessTokenResponse(FImmutabl
 {
 	if (Result.Success)
 	{
-		GotAccessToken.Broadcast(TEXT(""), Result.Message);
+		GotAccessToken.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetAddressAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetAddressAsyncAction.cpp
@@ -39,10 +39,10 @@ void UImtblPassportGetAddressAsyncAction::OnGetAddressResponse(FImmutablePasspor
 {
 	if (Result.Success)
 	{
-		GotAddress.Broadcast(TEXT(""), Result.Message);
+		GotAddress.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetEmailAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetEmailAsyncAction.cpp
@@ -39,10 +39,10 @@ void UImtblPassportGetEmailAsyncAction::OnGetEmailResponse(FImmutablePassportRes
 {
 	if (Result.Success)
 	{
-		GotEmail.Broadcast(TEXT(""), Result.Message);
+		GotEmail.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetIdTokenAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportGetIdTokenAsyncAction.cpp
@@ -38,10 +38,10 @@ void UImtblPassportGetIdTokenAsyncAction::OnGetIdTokenResponse(FImmutablePasspor
 {
 	if (Result.Success)
 	{
-		GotIdToken.Broadcast(TEXT(""), Result.Message);
+		GotIdToken.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportHasStoredCredentialsAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportHasStoredCredentialsAsyncAction.cpp
@@ -45,6 +45,6 @@ void UImtblPassportHasStoredCredentialsAsyncAction::OnHasStoredCredentialsRespon
 	}
 	else
 	{
-		OnFalse.Broadcast(Result.Message);
+		OnFalse.Broadcast(Result.Error);
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxBatchNftTransferAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxBatchNftTransferAsyncAction.cpp
@@ -55,6 +55,6 @@ void UImmutablePassportImxBatchNftTransferAsyncAction::OnTransferResponse(FImmut
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, TransferIds);
+		Failed.Broadcast(Result.Error, TransferIds);
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxIsRegisteredOffchainAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxIsRegisteredOffchainAsyncAction.cpp
@@ -39,5 +39,5 @@ void UImtblPassportImxIsRegisteredOffchainAsyncAction::DoImxIsRegisteredOffchain
 
 void UImtblPassportImxIsRegisteredOffchainAsyncAction::OnImxIsRegisteredOffchainResponse(FImmutablePassportResult Result)
 {
-	OnComplete.Broadcast(Result.Success);
+	OnComplete.Broadcast(UImmutablePassport::GetResponseResultAsBool(Result.Response));
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxRegisterOffchainAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxRegisterOffchainAsyncAction.cpp
@@ -49,5 +49,5 @@ void UImtblPassportImxRegisterOffchainAsyncAction::OnImxRegisterOffchainResponse
 		}
 	}
 
-	OnFailure.Broadcast(TEXT(""), Result.Message);
+	OnFailure.Broadcast(TEXT(""), Result.Error);
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxTransferAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportImxTransferAsyncAction.cpp
@@ -3,6 +3,7 @@
 #include "Immutable/Actions/ImtblPassportImxTransferAsyncAction.h"
 
 #include "Immutable/ImmutablePassport.h"
+#include "Immutable/ImmutableResponses.h"
 #include "Immutable/ImmutableSubsystem.h"
 #include "Immutable/Misc/ImtblLogging.h"
 
@@ -57,6 +58,6 @@ void UImmutablePassportImxTransferAsyncAction::OnTransferResponse(FImmutablePass
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportInitializationAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportInitializationAsyncAction.cpp
@@ -42,10 +42,10 @@ void UImtblPassportInitializationAsyncAction::OnInitialized(FImmutablePassportRe
 {
 	if (Result.Success)
 	{
-		Initialized.Broadcast(Result.Message);
+		Initialized.Broadcast("");
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message);
+		Failed.Broadcast(Result.Error);
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportLogoutAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportLogoutAsyncAction.cpp
@@ -42,10 +42,10 @@ void UImtblPassportLogoutAsyncAction::OnLogoutResponse(FImmutablePassportResult
 {
 	if (Result.Success)
 	{
-		OnSuccess.Broadcast(Result.Message);
+		OnSuccess.Broadcast("");
 	}
 	else
 	{
-		OnFailure.Broadcast(Result.Message);
+		OnFailure.Broadcast(Result.Error);
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmGetBalanceAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmGetBalanceAsyncAction.cpp
@@ -30,22 +30,22 @@ void UImtblPassportZkEvmGetBalanceAsyncAction::Activate()
 
 void UImtblPassportZkEvmGetBalanceAsyncAction::DoZkEvmGetBalance(TWeakObjectPtr<UImtblJSConnector> JSConnector)
 {
-	// Get Passport
 	auto Passport = GetSubsystem()->GetPassport();
-	// Run ZkEvmGetBalance
-	Passport->ZkEvmGetBalance(FImmutablePassportZkEvmGetBalanceData{Address, BlockNumberOrTag}, UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportZkEvmGetBalanceAsyncAction::OnZkEvmGetBalanceResponse));
+
+	if (Passport.IsValid())
+	{
+		Passport->ZkEvmGetBalance(FImmutablePassportZkEvmGetBalanceData{Address, BlockNumberOrTag}, UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportZkEvmGetBalanceAsyncAction::OnZkEvmGetBalanceResponse));
+	}
 }
 
 void UImtblPassportZkEvmGetBalanceAsyncAction::OnZkEvmGetBalanceResponse(FImmutablePassportResult Result)
 {
 	if (Result.Success)
 	{
-		IMTBL_LOG("ZkEvmGetBalance success")
-		GotBalance.Broadcast(TEXT(""), Result.Message);
+		GotBalance.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));
 	}
 	else
 	{
-		IMTBL_LOG("ZkEvmGetBalance failed")
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmGetTransactionReceiptAA.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmGetTransactionReceiptAA.cpp
@@ -59,6 +59,6 @@ void UImtblPassportZkEvmGetTransactionReceiptAA::OnZkEvmGetTransactionReceiptRes
 	else
 	{
 		IMTBL_LOG("zkEVM Transaction Receipt retrival failed")
-		Failed.Broadcast(Result.Message, FZkEvmTransactionReceipt());
+		Failed.Broadcast(Result.Error, FZkEvmTransactionReceipt());
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmRequestAccountsAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmRequestAccountsAsyncAction.cpp
@@ -29,22 +29,24 @@ void UImtblPassportZkEvmRequestAccountsAsyncAction::Activate()
 
 void UImtblPassportZkEvmRequestAccountsAsyncAction::DoRequestAccounts(TWeakObjectPtr<UImtblJSConnector> JSConnector)
 {
-	// Get Passport
 	auto Passport = GetSubsystem()->GetPassport();
-	// Run ZkEvmRequestAccounts
-	Passport->ZkEvmRequestAccounts(UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportZkEvmRequestAccountsAsyncAction::OnRequestAccountsResponse));
+
+	if (Passport.IsValid())
+	{
+		Passport->ZkEvmRequestAccounts(UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportZkEvmRequestAccountsAsyncAction::OnRequestAccountsResponse));
+	}
 }
 
 void UImtblPassportZkEvmRequestAccountsAsyncAction::OnRequestAccountsResponse(FImmutablePassportResult Result)
 {
-	TArray<FString> StrArr;
 	if (Result.Success)
 	{
-		Result.Message.ParseIntoArray(StrArr, TEXT(","));
-		GotAccounts.Broadcast(TEXT(""), StrArr);
+		const auto RequestAccountsData = FImmutablePassportZkEvmRequestAccountsData::FromJsonObject(Result.Response.JsonObject);
+
+		GotAccounts.Broadcast(TEXT(""), RequestAccountsData->accounts);
 	}
 	else
 	{
-		Failed.Broadcast(Result.Message, StrArr);
+		Failed.Broadcast(Result.Error, TArray<FString>());
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmSendTransactionAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportZkEvmSendTransactionAsyncAction.cpp
@@ -29,23 +29,25 @@ void UImtblPassportZkEvmSendTransactionAsyncAction::Activate()
 
 void UImtblPassportZkEvmSendTransactionAsyncAction::DoZkEvmSendTransaction(TWeakObjectPtr<UImtblJSConnector> JSConnector)
 {
-	// Get Passport
 	auto Passport = GetSubsystem()->GetPassport();
-	// Run ZkEvmSendTransaction
-	Passport->ZkEvmSendTransaction(TransactionRequest, UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportZkEvmSendTransactionAsyncAction::OnZkEvmSendTransactionResponse));
+
+	if (Passport.IsValid())
+	{
+		Passport->ZkEvmSendTransaction(TransactionRequest, UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportZkEvmSendTransactionAsyncAction::OnZkEvmSendTransactionResponse));
+	}
 }
 
 void UImtblPassportZkEvmSendTransactionAsyncAction::OnZkEvmSendTransactionResponse(FImmutablePassportResult Result)
 {
 	if (Result.Success)
 	{
 		IMTBL_LOG("zkEVM Send Transaction success")
-		TransactionSent.Broadcast(TEXT(""), Result.Message);
+		TransactionSent.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));
 	}
 	else
 	{
 		IMTBL_LOG("zkEVM Send Transaction failed")
-		Failed.Broadcast(Result.Message, TEXT(""));
+		Failed.Broadcast(Result.Error, TEXT(""));
 	}
 }
 
@@ -105,6 +107,6 @@ void UImtblPassportZkEvmSendTransactionWithConfirmationAA::OnZkEvmSendTransactio
 	else
 	{
 		IMTBL_LOG("zkEVM Send Transaction with confirmation failed")
-		Failed.Broadcast(Result.Message, FZkEvmTransactionReceipt());
+		Failed.Broadcast(Result.Error, FZkEvmTransactionReceipt());
 	}
 }
diff --git a/Source/Immutable/Private/Immutable/ImmutablePassport.cpp b/Source/Immutable/Private/Immutable/ImmutablePassport.cpp
diff --git a/Source/Immutable/Public/Immutable/Actions/ImtblPassportZkEvmRequestAccountsAsyncAction.h b/Source/Immutable/Public/Immutable/Actions/ImtblPassportZkEvmRequestAccountsAsyncAction.h
diff --git a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h
diff --git a/Source/Immutable/Public/Immutable/ImmutablePassport.h b/Source/Immutable/Public/Immutable/ImmutablePassport.h

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@ void UImtblConnectionAsyncActions::OnConnect(FImmutablePassportResult Result)`
`96`	`96`	`}`
`97`	`97`	`else`
`98`	`98`	`{`
`99`		`- Failed.Broadcast(Result.Message);`
	`99`	`+ Failed.Broadcast(Result.Error);`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ void UImtblPassportConnectEvmAsyncAction::OnConnectEvm(FImmutablePassportResult`
`38`	`38`	`{`
`39`	`39`	`if (Result.Success)`
`40`	`40`	`{`
`41`		`- Success.Broadcast(Result.Message);`
	`41`	`+ Success.Broadcast("");`
`42`	`42`	`}`
`43`	`43`	`else`
`44`	`44`	`{`
`45`		`- Failed.Broadcast(Result.Message);`
	`45`	`+ Failed.Broadcast(Result.Error);`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ void UImtblPassportGetAddressAsyncAction::OnGetAddressResponse(FImmutablePasspor`
`39`	`39`	`{`
`40`	`40`	`if (Result.Success)`
`41`	`41`	`{`
`42`		`- GotAddress.Broadcast(TEXT(""), Result.Message);`
	`42`	`+ GotAddress.Broadcast(TEXT(""), UImmutablePassport::GetResponseResultAsString(Result.Response));`
`43`	`43`	`}`
`44`	`44`	`else`
`45`	`45`	`{`
`46`		`- Failed.Broadcast(Result.Message, TEXT(""));`
	`46`	`+ Failed.Broadcast(Result.Error, TEXT(""));`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ void UImtblPassportHasStoredCredentialsAsyncAction::OnHasStoredCredentialsRespon`
`45`	`45`	`}`
`46`	`46`	`else`
`47`	`47`	`{`
`48`		`- OnFalse.Broadcast(Result.Message);`
	`48`	`+ OnFalse.Broadcast(Result.Error);`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ void UImmutablePassportImxBatchNftTransferAsyncAction::OnTransferResponse(FImmut`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- Failed.Broadcast(Result.Message, TransferIds);`
	`58`	`+ Failed.Broadcast(Result.Error, TransferIds);`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ void UImtblPassportImxIsRegisteredOffchainAsyncAction::DoImxIsRegisteredOffchain`
`39`	`39`
`40`	`40`	`void UImtblPassportImxIsRegisteredOffchainAsyncAction::OnImxIsRegisteredOffchainResponse(FImmutablePassportResult Result)`
`41`	`41`	`{`
`42`		`- OnComplete.Broadcast(Result.Success);`
	`42`	`+ OnComplete.Broadcast(UImmutablePassport::GetResponseResultAsBool(Result.Response));`
`43`	`43`	`}`