izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Backout] - CL30069106

Browse Source 
[FYI] Ben.Marsh
Original CL Desc
-----------------------------------------------------------------
Horde: Add a typed HTTP client for communicating with the Horde server. Removes boilerplate code for getting an access token, configuring request objects, and parsing responses. Synchronous for now.

[CL 30069215 by ben marsh in ue5-main branch]
This commit is contained in:
ben marsh
2023-12-02 21:19:55 -05:00
parent e3248c1b3f
commit f3ef3e01ac
6 changed files with 2 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Engine/Source/Developer/DesktopPlatform/Private/DesktopPlatformBase.cpp
View File

@@ -820,10 +820,7 @@ bool FDesktopPlatformBase::GetOidcAccessToken(const FString& RootDir, const FStr
FString Arguments = TEXT(" ");
Arguments += FString::Printf(TEXT(" --Service=\"%s\""), *ProviderIdentifier);
Arguments += FString::Printf(TEXT(" --OutFile=\"%s\""), *ResultFilePath);
if (ProjectFileName.Len() > 0)
{
Arguments += FString::Printf(TEXT(" --project=\"%s\""), *IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*FPaths::GetPath(*ProjectFileName)));
}
Arguments += FString::Printf(TEXT(" --project=\"%s\""), *IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*FPaths::ProjectDir()));
FString UnattendedArguments = Arguments;
UnattendedArguments += TEXT(" --Unattended=true");

2
Engine/Source/Developer/Horde/Horde.Build.cs
View File

@@ -7,6 +7,6 @@ public class Horde : ModuleRules
{
public Horde(ReadOnlyTargetRules Target) : base(Target)
{
PrivateDependencyModuleNames.AddRange(new string[] { "Core", "HTTP", "Json", "DesktopPlatform" });
PrivateDependencyModuleNames.AddRange(new string[] { "Core" });
}
}

70
Engine/Source/Developer/Horde/Private/HordeHttpClient.cpp
View File

@@ -1,70 +0,0 @@
// Copyright Epic Games, Inc. All Rights Reserved.
#include "HordeHttpClient.h"
#include "Server/ServerMessages.h"
#include "Interfaces/IHttpResponse.h"
#include "DesktopPlatformModule.h"
#include "IDesktopPlatform.h"
#include "HttpModule.h"
#include "Misc/Paths.h"
FHordeHttpClient::FHordeHttpClient(FString InServerUrl)
: ServerUrl(InServerUrl)
{
}
FHordeHttpClient::~FHordeHttpClient()
{
}
bool FHordeHttpClient::LoginWithOidc(const TCHAR* Profile, bool bUnattended, FFeedbackContext* Warn)
{
IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
FString NewToken;
FDateTime ExpiresAt;
bool bWasInteractive = false;
if (!DesktopPlatform->GetOidcAccessToken(FPaths::RootDir(), FString(), Profile, bUnattended, Warn, NewToken, ExpiresAt, bWasInteractive))
{
return false;
}
Token = NewToken;
return true;
}
TSharedRef<IHttpRequest> FHordeHttpClient::CreateRequest(const TCHAR* Verb, const TCHAR* Path)
{
FHttpModule& Module = FHttpModule::Get();
TSharedRef<IHttpRequest> Request = Module.CreateRequest();
Request->SetVerb(Verb);
Request->SetURL(ServerUrl / Path);
if (Token.Len() > 0)
{
Request->SetHeader(TEXT("Authorization"), FString::Printf(TEXT("Bearer %s"), *Token));
}
return Request;
}
TSharedRef<IHttpResponse> FHordeHttpClient::Get(const TCHAR* Path)
{
return ExecuteRequest(CreateRequest(TEXT("GET"), Path));
}
TSharedRef<IHttpResponse> FHordeHttpClient::ExecuteRequest(TSharedRef<IHttpRequest> Request)
{
verify(Request->ProcessRequest());
for (;;)
{
FHttpResponsePtr Response = Request->GetResponse();
if (Response)
{
return Response.ToSharedRef();
}
FPlatformProcess::Sleep(0.05f);
}
}

37
Engine/Source/Developer/Horde/Private/Server/ServerMessages.cpp
View File

@@ -1,37 +0,0 @@
// Copyright Epic Games, Inc. All Rights Reserved.
#include "Server/ServerMessages.h"
FGetServerInfoResponse::FGetServerInfoResponse()
{
}
FGetServerInfoResponse::~FGetServerInfoResponse()
{
}
void FGetServerInfoResponse::Serialize(FJsonSerializerBase& Serializer, bool bFlatObject)
{
JSON_SERIALIZE("ServerVersion", ServerVersion);
JSON_SERIALIZE("AgentVersion", AgentVersion);
JSON_SERIALIZE("OsDescription", OsDescription);
}
// -------------------------------------
FGetAuthConfigResponse::FGetAuthConfigResponse()
{
}
FGetAuthConfigResponse::~FGetAuthConfigResponse()
{
}
void FGetAuthConfigResponse::Serialize(FJsonSerializerBase& Serializer, bool bFlatObject)
{
JSON_SERIALIZE("Method", Method);
JSON_SERIALIZE("ServerUrl", ServerUrl);
JSON_SERIALIZE("ClientId", ClientId);
JSON_SERIALIZE_ARRAY("LocalRedirectUrls", LocalRedirectUrls);
}

34
Engine/Source/Developer/Horde/Public/HordeHttpClient.h
View File

@@ -1,34 +0,0 @@
// Copyright Epic Games, Inc. All Rights Reserved.
#pragma once
#include "CoreMinimal.h"
#include "Containers/UnrealString.h"
#include "Interfaces/IHttpRequest.h"
#include "Interfaces/IHttpResponse.h"
class HORDE_API FHordeHttpClient
{
public:
FHordeHttpClient(FString InServerUrl);
~FHordeHttpClient();
bool LoginWithOidc(const TCHAR* Profile, bool bUnattended, FFeedbackContext* Warn = nullptr);
TSharedRef<IHttpRequest> CreateRequest(const TCHAR* Verb, const TCHAR* Path);
TSharedRef<IHttpResponse> Get(const TCHAR* Path);
template<typename T>
T Get(const TCHAR* Path)
{
T Result;
Result.FromJson(Get(Path)->GetContentAsString());
return Result;
}
static TSharedRef<IHttpResponse> ExecuteRequest(TSharedRef<IHttpRequest> Request);
private:
FString ServerUrl;
FString Token;
};

44
Engine/Source/Developer/Horde/Public/Server/ServerMessages.h
View File

@@ -1,44 +0,0 @@
// Copyright Epic Games, Inc. All Rights Reserved.
#pragma once
#include "CoreMinimal.h"
#include "Serialization/JsonSerializerMacros.h"
/** Server Info */
struct FGetServerInfoResponse : FJsonSerializable
{
/** Server version info */
FString ServerVersion;
/** The current agent version string */
FString AgentVersion;
/** The operating system server is hosted on */
FString OsDescription;
FGetServerInfoResponse();
virtual ~FGetServerInfoResponse() override;
virtual void Serialize(FJsonSerializerBase& Serializer, bool bFlatObject) override;
};
/** Describes the auth config for this server */
struct FGetAuthConfigResponse : FJsonSerializable
{
/** Issuer for tokens from the auth provider */
FString Method;
/** Issuer for tokens from the auth provider */
FString ServerUrl;
/** Client id for the OIDC authority */
FString ClientId;
/** Optional redirect url provided to OIDC login for external tools (typically to a local server) */
TArray<FString> LocalRedirectUrls;
FGetAuthConfigResponse();
virtual ~FGetAuthConfigResponse() override;
virtual void Serialize(FJsonSerializerBase& Serializer, bool bFlatObject) override;
};