Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Source/FicsitRemoteMonitoring/FicsitRemoteMonitoring.build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ public bool LoaduWebSockets(ReadOnlyTargetRules Target)
});
}

RuntimeDependencies.Add(Path.Combine(LibrariesPath, "zlib1.dll"));
RuntimeDependencies.Add(Path.Combine(LibrariesPath, "uv.dll"));
RuntimeDependencies.Add("$(BinaryOutputDir)/uv.dll", Path.Combine(LibrariesPath, "uv.dll"));
RuntimeDependencies.Add("$(BinaryOutputDir)/zlib1.dll", Path.Combine(LibrariesPath, "zlib1.dll"));

CopyToBinaries(Path.Combine(LibrariesPath, "zlib1.dll"), Target);
CopyToBinaries(Path.Combine(LibrariesPath, "uv.dll"), Target);
Expand Down
27 changes: 25 additions & 2 deletions Source/FicsitRemoteMonitoring/Private/FRMConfigInitSubsystem.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "FRMConfigInitSubsystem.h"
#include "Configuration/ConfigManager.h"
#include "ConfigPropertyString.h"
#include "Engine/Engine.h"

void UFRMConfigInitSubsystem::Initialize(FSubsystemCollectionBase& Collection)
Expand All @@ -23,7 +24,7 @@ void UFRMConfigInitSubsystem::Initialize(FSubsystemCollectionBase& Collection)
if (HttpConfig.Authentication_Token.IsEmpty())
{
HttpConfig.Authentication_Token = GenerateAuthToken(32);
HttpConfig.Save(GetWorld());
SaveHttpAuthToken(ConfigManager);

UE_LOG(LogTemp, Log, TEXT("[FRMConfigInitSubsystem] Generated and saved new token: %s"), *HttpConfig.Authentication_Token);
}
Expand All @@ -35,6 +36,28 @@ void UFRMConfigInitSubsystem::Initialize(FSubsystemCollectionBase& Collection)
AuthenticationToken = HttpConfig.Authentication_Token;
}

void UFRMConfigInitSubsystem::SaveHttpAuthToken(UConfigManager* ConfigManager)
{
FConfigId ConfigId{ "FicsitRemoteMonitoring", "WebServer" };

UConfigPropertySection* ConfigurationRootSection = ConfigManager->GetConfigurationRootSection(ConfigId);
if (!ConfigurationRootSection)
{
UE_LOG(LogTemp, Warning, TEXT("[FRMConfigInitSubsystem] ConfigurationRootSection is null."));
return;
}

if (ConfigurationRootSection->SectionProperties.Contains("Authentication_Token"))
{
if (UConfigPropertyString* AuthTokenProperty = Cast<UConfigPropertyString>(ConfigurationRootSection->SectionProperties["Authentication_Token"]))
{
AuthTokenProperty->Value = HttpConfig.Authentication_Token;
}
}

ConfigManager->MarkConfigurationDirty(ConfigId);
}

FString UFRMConfigInitSubsystem::GenerateAuthToken(const int32 Length)
{
const FString Characters = TEXT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
Expand All @@ -47,4 +70,4 @@ FString UFRMConfigInitSubsystem::GenerateAuthToken(const int32 Length)
}

return RandomString;
}
}
14 changes: 0 additions & 14 deletions Source/FicsitRemoteMonitoring/Public/Configs/Config_HTTPStruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,5 @@ struct FConfig_HTTPStruct {
}
return ConfigStruct;
}

void Save(UWorld* World)
{
FConfigId ConfigId{"FicsitRemoteMonitoring", "WebServer"};
UConfigManager* ConfigManager = World->GetGameInstance()->GetSubsystem<UConfigManager>();
UConfigPropertySection* ConfigurationRootSection = ConfigManager->GetConfigurationRootSection(ConfigId);

if (ConfigurationRootSection->SectionProperties.Contains("Authentication_Token"))
{
Cast<UConfigPropertyString>(ConfigurationRootSection->SectionProperties["Authentication_Token"])->Value = Authentication_Token;
}

ConfigManager->MarkConfigurationDirty(ConfigId);
}
};

3 changes: 3 additions & 0 deletions Source/FicsitRemoteMonitoring/Public/FRMConfigInitSubsystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "Config_FactoryStruct.h"
#include "FRMConfigInitSubsystem.generated.h"

class UConfigManager;

UCLASS()
class FICSITREMOTEMONITORING_API UFRMConfigInitSubsystem : public UGameInstanceSubsystem
{
Expand All @@ -30,4 +32,5 @@ class FICSITREMOTEMONITORING_API UFRMConfigInitSubsystem : public UGameInstanceS
FConfig_FactoryStruct FactoryConfig;

FString GenerateAuthToken(int32 Length);
void SaveHttpAuthToken(UConfigManager* ConfigManager);
};