Skip to content

[DX-2718, DX-2719] fix: removal of redundant data types, save game load on initialisation #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2024
Merged

[DX-2718, DX-2719] fix: removal of redundant data types, save game load on initialisation #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions Source/Immutable/Private/Immutable/ImmutableDataTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
// Fill out your copyright notice in the Description page of Project Settings.

#include "Immutable/ImmutableDataTypes.h"


FString FImmutablePassportInitData::ToJsonString() const
{
FString OutString;
FJsonObjectWrapper Wrapper;
Wrapper.JsonObject = MakeShared<FJsonObject>();
FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);

if (!Wrapper.JsonObject.IsValid())
{
IMTBL_ERR("Could not convert FImmutablePassportInitData to JSON")
return "";
}
// Remove redirectUri field if it's empty so that the bridge doesn't try to
// use it
if (Wrapper.JsonObject->HasField("redirectUri") && Wrapper.JsonObject->GetStringField("redirectUri").IsEmpty())
{
Wrapper.JsonObject->RemoveField("redirectUri");
}
Wrapper.JsonObjectToString(OutString);

return OutString;
}

TOptional<FImmutablePassportInitDeviceFlowData> FImmutablePassportInitDeviceFlowData::FromJsonString(const FString& JsonObjectString)
{
FImmutablePassportInitDeviceFlowData PassportConnect;

if (!FJsonObjectConverter::JsonObjectStringToUStruct(JsonObjectString, &PassportConnect, 0, 0))
{
IMTBL_WARN("Could not parse response from JavaScript into the expected " "Passport connect format")
return TOptional<FImmutablePassportInitDeviceFlowData>();
}

return PassportConnect;
}

FString FImmutablePassportZkEvmRequestAccountsData::ToJsonString() const
{
FString OutString;

FJsonObjectConverter::UStructToJsonObjectString(*this, OutString, 0, 0, 0, nullptr, false);

return OutString;
}

TOptional<FImmutablePassportZkEvmRequestAccountsData> FImmutablePassportZkEvmRequestAccountsData::FromJsonString(const FString& JsonObjectString)
{
FImmutablePassportZkEvmRequestAccountsData RequestAccounts;
if (!FJsonObjectConverter::JsonObjectStringToUStruct(JsonObjectString, &RequestAccounts, 0, 0))
{
IMTBL_WARN("Could not parse response from JavaScript into the expected " "Passport ZkEvm request accounts format")
return TOptional<FImmutablePassportZkEvmRequestAccountsData>();
}

return RequestAccounts;
}

TOptional<FImmutablePassportZkEvmRequestAccountsData> FImmutablePassportZkEvmRequestAccountsData::FromJsonObject(const TSharedPtr<FJsonObject>& JsonObject)
{
if (!JsonObject.IsValid()) { return TOptional<FImmutablePassportZkEvmRequestAccountsData>(); }

// Parse the JSON
FImmutablePassportZkEvmRequestAccountsData RequestAccounts;
if (!FJsonObjectConverter::JsonObjectToUStruct(JsonObject.ToSharedRef(), &RequestAccounts, 0, 0))
{
IMTBL_ERR("Could not parse response from JavaScript into the expected " "Passport ZkEvm request accounts format")
return TOptional<FImmutablePassportZkEvmRequestAccountsData>();
}

return RequestAccounts;
}

FString FImmutablePassportZkEvmGetBalanceData::ToJsonString() const
{
FString OutString;

FJsonObjectWrapper Wrapper;
Wrapper.JsonObject = MakeShared<FJsonObject>();
FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);

if (!Wrapper.JsonObject.IsValid())
{
IMTBL_ERR("Could not convert FImmutablePassportZkEvmGetBalanceData to JSON")
return "";
}
Wrapper.JsonObjectToString(OutString);

return OutString;
}
148 changes: 20 additions & 128 deletions Source/Immutable/Private/Immutable/ImmutablePassport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "Kismet/GameplayStatics.h"
#include "Policies/CondensedJsonPrintPolicy.h"


#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
#include "GenericPlatform/GenericPlatformHttp.h"
#endif
Expand All @@ -25,119 +24,20 @@
#include "Mac/ImmutableMac.h"
#endif

#define PASSPORT_SAVE_GAME_SLOT_NAME TEXT("ImmutablePassport")

FString FImmutablePassportInitData::ToJsonString() const
{
FString OutString;

FJsonObjectWrapper Wrapper;
Wrapper.JsonObject = MakeShared<FJsonObject>();
FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);

if (!Wrapper.JsonObject.IsValid())
{
IMTBL_ERR("Could not convert FImmutablePassportInitData to JSON")
return "";
}
// Remove redirectUri field if it's empty so that the bridge doesn't try to
// use it
if (Wrapper.JsonObject->HasField("redirectUri") && Wrapper.JsonObject->GetStringField("redirectUri").IsEmpty())
{
Wrapper.JsonObject->RemoveField("redirectUri");
}
Wrapper.JsonObjectToString(OutString);

return OutString;
}

FString FImxBatchNftTransferRequest::ToJsonString() const
{
FString OutString;
FJsonObjectWrapper Wrapper;
Wrapper.JsonObject = MakeShared<FJsonObject>();
FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);

if (!Wrapper.JsonObject.IsValid())
{
IMTBL_ERR("Could not convert FImxBatchNftTransferRequest to JSON")
return "";
}

if (Wrapper.JsonObject->HasField("nftTransferDetails"))
{
const auto Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&OutString);
FJsonSerializer::Serialize(Wrapper.JsonObject->GetArrayField("nftTransferDetails"), Writer);
IMTBL_LOG("FImxBatchNftTransferRequest Serialised: %s", *OutString);
Writer->Close();
}
return OutString;
}

TOptional<FImmutablePassportInitDeviceFlowData> FImmutablePassportInitDeviceFlowData::FromJsonString(const FString& JsonObjectString)
{
FImmutablePassportInitDeviceFlowData PassportConnect;
if (!FJsonObjectConverter::JsonObjectStringToUStruct(JsonObjectString, &PassportConnect, 0, 0))
{
IMTBL_WARN("Could not parse response from JavaScript into the expected " "Passport connect format")
return TOptional<FImmutablePassportInitDeviceFlowData>();
}
return PassportConnect;
}

FString FImmutablePassportZkEvmRequestAccountsData::ToJsonString() const
{
FString OutString;
FJsonObjectConverter::UStructToJsonObjectString(*this, OutString, 0, 0, 0, nullptr, false);
return OutString;
}

TOptional<FImmutablePassportZkEvmRequestAccountsData> FImmutablePassportZkEvmRequestAccountsData::FromJsonString(const FString& JsonObjectString)
{
FImmutablePassportZkEvmRequestAccountsData RequestAccounts;
if (!FJsonObjectConverter::JsonObjectStringToUStruct(JsonObjectString, &RequestAccounts, 0, 0))
{
IMTBL_WARN("Could not parse response from JavaScript into the expected " "Passport ZkEvm request accounts format")
return TOptional<FImmutablePassportZkEvmRequestAccountsData>();
}
return RequestAccounts;
}

TOptional<FImmutablePassportZkEvmRequestAccountsData> FImmutablePassportZkEvmRequestAccountsData::FromJsonObject(const TSharedPtr<FJsonObject>& JsonObject)
{
if (!JsonObject.IsValid()) { return TOptional<FImmutablePassportZkEvmRequestAccountsData>(); }

// Parse the JSON
FImmutablePassportZkEvmRequestAccountsData RequestAccounts;
if (!FJsonObjectConverter::JsonObjectToUStruct(JsonObject.ToSharedRef(), &RequestAccounts, 0, 0))
{
IMTBL_ERR("Could not parse response from JavaScript into the expected " "Passport ZkEvm request accounts format")
return TOptional<FImmutablePassportZkEvmRequestAccountsData>();
}
return RequestAccounts;
}

FString FImmutablePassportZkEvmGetBalanceData::ToJsonString() const
{
FString OutString;

FJsonObjectWrapper Wrapper;
Wrapper.JsonObject = MakeShared<FJsonObject>();
FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);

if (!Wrapper.JsonObject.IsValid())
{
IMTBL_ERR("Could not convert FImmutablePassportZkEvmGetBalanceData to JSON")
return "";
}
Wrapper.JsonObjectToString(OutString);

return OutString;
}
#define PASSPORT_SAVE_GAME_SLOT_NAME TEXT("Immutable")

void UImmutablePassport::Initialize(const FImmutablePassportInitData& Data, const FImtblPassportResponseDelegate& ResponseDelegate)
{
check(JSConnector.IsValid());

LoadPassportSettings();
// we check saved settings in case if player has not logged out properly
if (Data.logoutRedirectUri.IsEmpty() && IsStateFlagsSet(IPS_PKCE))
{
IMTBL_ERR("Logout URI is empty. Previously logged in via PKCE.")
ResetStateFlags(IPS_PKCE);
SavePassportSettings();
}

InitData = Data;

Expand Down Expand Up @@ -177,7 +77,7 @@ void UImmutablePassport::ConnectPKCE(bool IsConnectImx, const FImtblPassportResp
void UImmutablePassport::Logout(bool DoHardLogout, const FImtblPassportResponseDelegate& ResponseDelegate)
{
#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
if (IsStateFlagsSet(IPS_PKCE) || bIsPrevConnectedViaPKCEFlow)
if (IsStateFlagsSet(IPS_PKCE))
{
PKCELogoutResponseDelegate = ResponseDelegate;
}
Expand Down Expand Up @@ -305,7 +205,7 @@ void UImmutablePassport::Setup(const TWeakObjectPtr<UImtblJSConnector> Connector

if (!Connector.IsValid())
{
IMTBL_ERR("Invalid JSConnector passed to UImmutablePassport::Initialize")
IMTBL_ERR("Invalid JSConnector passed to UImmutablePassport::Initialize.")
return;
}

Expand All @@ -329,9 +229,8 @@ void UImmutablePassport::ReinstateConnection(FImtblJSResponse Response)
else
{
#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
if (bIsPrevConnectedViaPKCEFlow)
if (IsStateFlagsSet(IPS_PKCE))
{
SetStateFlags(IPS_PKCE);
PKCEResponseDelegate = ResponseDelegate.GetValue();
CallJS(ImmutablePassportAction::GetPKCEAuthUrl, TEXT(""), PKCEResponseDelegate, FImtblJSResponseDelegate::CreateUObject(this, &UImmutablePassport::OnGetPKCEAuthUrlResponse));
}
Expand Down Expand Up @@ -386,8 +285,6 @@ void UImmutablePassport::OnInitializeResponse(FImtblJSResponse Response)
{
SetStateFlags(IPS_INITIALIZED);
IMTBL_LOG("Passport initialization succeeded.")
// we load settings in case if player has not logged out properly
LoadPassportSettings();
}
else
{
Expand Down Expand Up @@ -469,7 +366,7 @@ void UImmutablePassport::OnLogoutResponse(FImtblJSResponse Response)
if (!Url.IsEmpty())
{
#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
if (IsStateFlagsSet(IPS_PKCE) || bIsPrevConnectedViaPKCEFlow)
if (IsStateFlagsSet(IPS_PKCE))
{
OnHandleDeepLink = FImtblPassportHandleDeepLinkDelegate::CreateUObject(this, &UImmutablePassport::OnDeepLinkActivated);
#if PLATFORM_ANDROID
Expand Down Expand Up @@ -575,7 +472,7 @@ void UImmutablePassport::OnGetPKCEAuthUrlResponse(FImtblJSResponse Response)
}
else
{
IMTBL_ERR("Unable to return a response for Connect PKCE");
IMTBL_ERR("Unable to return a response for Connect PKCE.");
}
}

Expand Down Expand Up @@ -606,7 +503,7 @@ void UImmutablePassport::OnConnectPKCEResponse(FImtblJSResponse Response)
}
else
{
IMTBL_ERR("Unable to return a response for Connect PKCE");
IMTBL_ERR("Unable to return a response for Connect PKCE.");
}
ResetStateFlags(IPS_COMPLETING_PKCE);
}
Expand Down Expand Up @@ -911,17 +808,12 @@ void UImmutablePassport::SavePassportSettings()

void UImmutablePassport::LoadPassportSettings()
{
UImmutableSaveGame* SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::CreateSaveGameObject(UImmutableSaveGame::StaticClass()));

SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::LoadGameFromSlot(PASSPORT_SAVE_GAME_SLOT_NAME, 0));

if (!SaveGameInstance)
UImmutableSaveGame* SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::LoadGameFromSlot(PASSPORT_SAVE_GAME_SLOT_NAME, 0));

if (SaveGameInstance)
{
IMTBL_ERR("Could not find Immutable save game to load")
return;
SaveGameInstance->bWasConnectedViaPKCEFlow ? SetStateFlags(IPS_PKCE) : ResetStateFlags(IPS_PKCE);
}

bIsPrevConnectedViaPKCEFlow = SaveGameInstance->bWasConnectedViaPKCEFlow;
}

#if PLATFORM_ANDROID | PLATFORM_IOS | PLATFORM_MAC
Expand Down
33 changes: 33 additions & 0 deletions Source/Immutable/Private/Immutable/ImmutableRequests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Fill out your copyright notice in the Description page of Project Settings.

#include "Immutable/ImmutableRequests.h"

#include "JsonObjectConverter.h"
#include "JsonObjectWrapper.h"
#include "Immutable/Misc/ImtblLogging.h"
#include "Policies/CondensedJsonPrintPolicy.h"


FString FImxBatchNftTransferRequest::ToJsonString() const
{
FString OutString;
FJsonObjectWrapper Wrapper;
Wrapper.JsonObject = MakeShared<FJsonObject>();
FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);

if (!Wrapper.JsonObject.IsValid())
{
IMTBL_ERR("Could not convert FImxBatchNftTransferRequest to JSON")
return "";
}

if (Wrapper.JsonObject->HasField("nftTransferDetails"))
{
const auto Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&OutString);
FJsonSerializer::Serialize(Wrapper.JsonObject->GetArrayField("nftTransferDetails"), Writer);
IMTBL_LOG("FImxBatchNftTransferRequest Serialised: %s", *OutString);
Writer->Close();
}

return OutString;
}
Loading