Merge from main

1 files changed, 21 insertions, 4 deletions

diff --git a/zenhttp/httpclient.cpp b/zenhttp/httpclient.cpp
index b7df12026..7e3e9d374 100644
--- a/zenhttp/httpclient.cpp
+++ b/zenhttp/httpclient.cpp
@@ -7,6 +7,7 @@
 #include <zencore/compactbinarypackage.h>
 #include <zencore/iobuffer.h>
 #include <zencore/logging.h>
+#include <zencore/session.h>
 #include <zencore/sharedbuffer.h>
 #include <zencore/stream.h>
 
@@ -30,6 +31,9 @@ FromCprResponse(cpr::Response& InResponse)
 
 HttpClient::HttpClient(std::string_view BaseUri) : m_BaseUri(BaseUri)
 {
+	StringBuilder<32> SessionId;
+	GetSessionId().ToString(SessionId);
+	m_SessionId = SessionId;
 }
 
 HttpClient::~HttpClient()
@@ -68,8 +72,7 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package)
 		BinaryWriter	MemWriter(MemOut);
 		Writer.Save(MemWriter);
 
-		Sess.SetHeader(
-			{{"Content-Type", "application/x-ue-offer"}, {"UE-Session", "123456789012345678901234"}, {"UE-Request", RequestIdString}});
+		Sess.SetHeader({{"Content-Type", "application/x-ue-offer"}, {"UE-Session", m_SessionId}, {"UE-Request", RequestIdString}});
 		Sess.SetBody(cpr::Body{(const char*)MemOut.Data(), MemOut.Size()});
 
 		cpr::Response FilterResponse = Sess.Post();
@@ -111,8 +114,7 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package)
 	CompositeBuffer Message		= FormatPackageMessageBuffer(SendPackage);
 	SharedBuffer	FlatMessage = Message.Flatten();
 
-	Sess.SetHeader(
-		{{"Content-Type", "application/x-ue-cbpkg"}, {"UE-Session", "123456789012345678901234"}, {"UE-Request", RequestIdString}});
+	Sess.SetHeader({{"Content-Type", "application/x-ue-cbpkg"}, {"UE-Session", m_SessionId}, {"UE-Request", RequestIdString}});
 	Sess.SetBody(cpr::Body{(const char*)FlatMessage.GetData(), FlatMessage.GetSize()});
 
 	cpr::Response FilterResponse = Sess.Post();
@@ -135,6 +137,21 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package)
 }
 
 HttpClient::Response
+HttpClient::Put(std::string_view Url, IoBuffer Payload)
+{
+	ZEN_UNUSED(Url);
+	ZEN_UNUSED(Payload);
+	return {};
+}
+
+HttpClient::Response
+HttpClient::Get(std::string_view Url)
+{
+	ZEN_UNUSED(Url);
+	return {};
+}
+
+HttpClient::Response
 HttpClient::Delete(std::string_view Url)
 {
 	ZEN_UNUSED(Url);