From 3f05a719bb16ead3dfc9a572eaf3ad77c43aba0f Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 3 Sep 2024 18:17:24 +1200 Subject: [PATCH 1/3] feat: add silent logout boolean to passport init blueprint --- .../Actions/ImtblPassportInitializationAsyncAction.cpp | 5 +++-- .../Actions/ImtblPassportInitializationAsyncAction.h | 3 ++- Source/Immutable/Public/Immutable/ImmutableDataTypes.h | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Source/Immutable/Private/Immutable/Actions/ImtblPassportInitializationAsyncAction.cpp b/Source/Immutable/Private/Immutable/Actions/ImtblPassportInitializationAsyncAction.cpp index 0123cee9..280e7a9d 100644 --- a/Source/Immutable/Private/Immutable/Actions/ImtblPassportInitializationAsyncAction.cpp +++ b/Source/Immutable/Private/Immutable/Actions/ImtblPassportInitializationAsyncAction.cpp @@ -6,7 +6,7 @@ #include "Immutable/ImmutableSubsystem.h" -UImtblPassportInitializationAsyncAction* UImtblPassportInitializationAsyncAction::InitializePassport(UObject* WorldContextObject, const FString& ClientID, const FString& RedirectUri, const FString& LogoutUri, const FString& Environment) +UImtblPassportInitializationAsyncAction* UImtblPassportInitializationAsyncAction::InitializePassport(UObject* WorldContextObject, const FString& ClientID, const FString& RedirectUri, const FString& LogoutUri, const FString& Environment, bool IsSilentLogout) { UImtblPassportInitializationAsyncAction* PassportInitBlueprintNode = NewObject(); @@ -15,6 +15,7 @@ UImtblPassportInitializationAsyncAction* UImtblPassportInitializationAsyncAction PassportInitBlueprintNode->LogoutUri = LogoutUri; PassportInitBlueprintNode->Environment = Environment; PassportInitBlueprintNode->WorldContextObject = WorldContextObject; + PassportInitBlueprintNode->IsSilentLogout = IsSilentLogout; return PassportInitBlueprintNode; } @@ -35,7 +36,7 @@ void UImtblPassportInitializationAsyncAction::DoInit(TWeakObjectPtrGetPassport(); // Run Initialize - Passport->Initialize(FImmutablePassportInitData{ClientId, RedirectUri, LogoutUri, Environment}, UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportInitializationAsyncAction::OnInitialized)); + Passport->Initialize(FImmutablePassportInitData{ClientId, RedirectUri, LogoutUri, Environment, IsSilentLogout}, UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportInitializationAsyncAction::OnInitialized)); } void UImtblPassportInitializationAsyncAction::OnInitialized(FImmutablePassportResult Result) diff --git a/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h b/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h index b0c9ad85..cb03cdb5 100644 --- a/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h +++ b/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h @@ -20,7 +20,7 @@ class IMMUTABLE_API UImtblPassportInitializationAsyncAction : public UImtblBluep public: UFUNCTION(BlueprintCallable, meta = (WorldContext = "WorldContextObject", BlueprintInternalUseOnly = "true"), Category = "Immutable") - static UImtblPassportInitializationAsyncAction* InitializePassport(UObject* WorldContextObject, const FString& ClientID, const FString& RedirectUri, const FString& LogoutUri, const FString& Environment); + static UImtblPassportInitializationAsyncAction* InitializePassport(UObject* WorldContextObject, const FString& ClientID, const FString& RedirectUri, const FString& LogoutUri, const FString& Environment, bool LogoutMode); virtual void Activate() override; @@ -29,6 +29,7 @@ class IMMUTABLE_API UImtblPassportInitializationAsyncAction : public UImtblBluep FString RedirectUri; FString LogoutUri; FString Environment; + bool IsSilentLogout; UPROPERTY(BlueprintAssignable) FPassportInitializationOutputPin Initialized; diff --git a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h index 90167ed0..bd988785 100644 --- a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h +++ b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h @@ -55,6 +55,9 @@ struct IMMUTABLE_API FImmutablePassportInitData UPROPERTY() FString environment = ImmutablePassportAction::EnvSandbox; + UPROPERTY() + bool IsSilentLogout = false; + UPROPERTY() FImmutableEngineVersionData engineVersion; From ee4ca36f55064cec70d17221d1aaec870226a7a1 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 3 Sep 2024 18:33:01 +1200 Subject: [PATCH 2/3] fix: initialize passport parameter --- .../Immutable/Actions/ImtblPassportInitializationAsyncAction.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h b/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h index cb03cdb5..e337dca3 100644 --- a/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h +++ b/Source/Immutable/Public/Immutable/Actions/ImtblPassportInitializationAsyncAction.h @@ -20,7 +20,7 @@ class IMMUTABLE_API UImtblPassportInitializationAsyncAction : public UImtblBluep public: UFUNCTION(BlueprintCallable, meta = (WorldContext = "WorldContextObject", BlueprintInternalUseOnly = "true"), Category = "Immutable") - static UImtblPassportInitializationAsyncAction* InitializePassport(UObject* WorldContextObject, const FString& ClientID, const FString& RedirectUri, const FString& LogoutUri, const FString& Environment, bool LogoutMode); + static UImtblPassportInitializationAsyncAction* InitializePassport(UObject* WorldContextObject, const FString& ClientID, const FString& RedirectUri, const FString& LogoutUri, const FString& Environment, bool IsSilentLogout); virtual void Activate() override; From fa02c86a9d974ff74bcd79df1fc508fe3c9d7e00 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 3 Sep 2024 18:44:01 +1200 Subject: [PATCH 3/3] fix: init data is silent logut boolean name --- Source/Immutable/Public/Immutable/ImmutableDataTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h index bd988785..46a0b543 100644 --- a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h +++ b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h @@ -56,7 +56,7 @@ struct IMMUTABLE_API FImmutablePassportInitData FString environment = ImmutablePassportAction::EnvSandbox; UPROPERTY() - bool IsSilentLogout = false; + bool isSilentLogout = false; UPROPERTY() FImmutableEngineVersionData engineVersion;