fix compilation issues after backporting fixes

1 files changed, 164 insertions, 175 deletions

diff --git a/src/zenhttp/clients/httpclientcurl.cpp b/src/zenhttp/clients/httpclientcurl.cpp
index 31665781d..9e2019247 100644
--- a/src/zenhttp/clients/httpclientcurl.cpp
+++ b/src/zenhttp/clients/httpclientcurl.cpp
@@ -718,15 +718,14 @@ CurlHttpClient::DoWithRetry(std::string_view						  SessionId,
 //////////////////////////////////////////////////////////////////////////
 
 CurlHttpClient::Session
-CurlHttpClient::AllocSession(std::string_view					  BaseUrl,
-							 std::string_view					  ResourcePath,
-							 const HttpClientSettings&			  ConnectionSettings,
-							 const KeyValueMap&					  AdditionalHeader,
-							 const KeyValueMap&					  Parameters,
-							 std::string_view					  SessionId,
-							 std::optional<HttpClientAccessToken> AccessToken)
+CurlHttpClient::AllocSession(std::string_view		   BaseUrl,
+							 std::string_view		   ResourcePath,
+							 const HttpClientSettings& ConnectionSettings,
+							 const KeyValueMap&		   AdditionalHeader,
+							 const KeyValueMap&		   Parameters,
+							 std::string_view		   SessionId)
 {
-	ZEN_UNUSED(AccessToken, SessionId, AdditionalHeader);
+	ZEN_UNUSED(SessionId, AdditionalHeader);
 	ZEN_TRACE_CPU("CurlHttpClient::AllocSession");
 	CURL* Handle = nullptr;
 	m_SessionLock.WithExclusiveLock([&] {
@@ -851,7 +850,7 @@ CurlHttpClient::TransactPackage(std::string_view Url, CbPackage Package, const K
 		OfferExtraHeaders.emplace_back(HeaderContentType(HttpContentType::kCbPackageOffer));
 		OfferExtraHeaders.emplace_back("UE-Request", RequestIdString);
 
-		Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
+		Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
 		CURL*	H	 = Sess.Get();
 
 		curl_slist* HeaderList = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken(), OfferExtraHeaders);
@@ -909,7 +908,7 @@ CurlHttpClient::TransactPackage(std::string_view Url, CbPackage Package, const K
 	PkgExtraHeaders.emplace_back(HeaderContentType(HttpContentType::kCbPackage));
 	PkgExtraHeaders.emplace_back("UE-Request", RequestIdString);
 
-	Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
+	Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
 	CURL*	H	 = Sess.Get();
 
 	curl_slist* HeaderList = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken(), PkgExtraHeaders);
@@ -960,9 +959,8 @@ CurlHttpClient::Put(std::string_view Url, const IoBuffer& Payload, const KeyValu
 		m_SessionId,
 		DoWithRetry(m_SessionId,
 					[&]() -> CurlResult {
-						Session Sess =
-							AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
-						CURL* H = Sess.Get();
+						Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
+						CURL*	H	 = Sess.Get();
 
 						curl_slist* Headers =
 							BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken(), {HeaderContentType(Payload.GetContentType())});
@@ -1006,39 +1004,37 @@ CurlHttpClient::Put(std::string_view Url, const KeyValueMap& Parameters)
 
 	return CommonResponse(
 		m_SessionId,
-		DoWithRetry(
-			m_SessionId,
-			[&]() -> CurlResult {
-				KeyValueMap HeaderWithContentLength{std::pair<std::string_view, std::string_view>{"Content-Length", "0"}};
-				Session		Sess =
-					AllocSession(m_BaseUri, Url, m_ConnectionSettings, HeaderWithContentLength, Parameters, m_SessionId, GetAccessToken());
-				CURL* H = Sess.Get();
+		DoWithRetry(m_SessionId,
+					[&]() -> CurlResult {
+						KeyValueMap HeaderWithContentLength{std::pair<std::string_view, std::string_view>{"Content-Length", "0"}};
+						Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, HeaderWithContentLength, Parameters, m_SessionId);
+						CURL*	H	 = Sess.Get();
 
-				curl_slist* Headers = BuildHeaderList(HeaderWithContentLength, m_SessionId, GetAccessToken());
-				curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
+						curl_slist* Headers = BuildHeaderList(HeaderWithContentLength, m_SessionId, GetAccessToken());
+						curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
 
-				curl_easy_setopt(H, CURLOPT_UPLOAD, 1L);
-				curl_easy_setopt(H, CURLOPT_INFILESIZE_LARGE, 0LL);
+						curl_easy_setopt(H, CURLOPT_UPLOAD, 1L);
+						curl_easy_setopt(H, CURLOPT_INFILESIZE_LARGE, 0LL);
 
-				std::string										 Body;
-				WriteCallbackData								 WriteData{.Body = &Body};
-				HeaderCallbackData								 HdrData{};
-				std::vector<std::pair<std::string, std::string>> ResponseHeaders;
-				HdrData.Headers = &ResponseHeaders;
+						std::string										 Body;
+						WriteCallbackData								 WriteData{.Body = &Body};
+						HeaderCallbackData								 HdrData{};
+						std::vector<std::pair<std::string, std::string>> ResponseHeaders;
+						HdrData.Headers = &ResponseHeaders;
 
-				curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
-				curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
-				curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
-				curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
+						curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
+						curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
+						curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
+						curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
 
-				CurlResult Result = Sess.Perform();
-				Result.Body		  = std::move(Body);
-				Result.Headers	  = std::move(ResponseHeaders);
+						CurlResult Result = Sess.Perform();
+						Result.Body		  = std::move(Body);
+						Result.Headers	  = std::move(ResponseHeaders);
 
-				curl_slist_free_all(Headers);
+						curl_slist_free_all(Headers);
 
-				return Result;
-			}),
+						return Result;
+					}),
 		{});
 }
 
@@ -1046,43 +1042,42 @@ CurlHttpClient::Response
 CurlHttpClient::Get(std::string_view Url, const KeyValueMap& AdditionalHeader, const KeyValueMap& Parameters)
 {
 	ZEN_TRACE_CPU("CurlHttpClient::Get");
-	return CommonResponse(
-		m_SessionId,
-		DoWithRetry(
-			m_SessionId,
-			[&]() -> CurlResult {
-				Session Sess =
-					AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, Parameters, m_SessionId, GetAccessToken());
-				CURL* H = Sess.Get();
-
-				curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
-				curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
-				curl_easy_setopt(H, CURLOPT_HTTPGET, 1L);
-
-				std::string										 Body;
-				WriteCallbackData								 WriteData{.Body = &Body};
-				HeaderCallbackData								 HdrData{};
-				std::vector<std::pair<std::string, std::string>> ResponseHeaders;
-				HdrData.Headers = &ResponseHeaders;
-
-				curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
-				curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
-				curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
-				curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
-
-				CurlResult Result = Sess.Perform();
-				Result.Body		  = std::move(Body);
-				Result.Headers	  = std::move(ResponseHeaders);
-
-				curl_slist_free_all(Headers);
-
-				return Result;
-			},
-			[this](CurlResult& Result) {
-				std::unique_ptr<detail::TempPayloadFile> NoTempFile;
-				return ValidatePayload(Result, NoTempFile);
-			}),
-		{});
+	return CommonResponse(m_SessionId,
+						  DoWithRetry(
+							  m_SessionId,
+							  [&]() -> CurlResult {
+								  Session Sess =
+									  AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, Parameters, m_SessionId);
+								  CURL* H = Sess.Get();
+
+								  curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
+								  curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
+								  curl_easy_setopt(H, CURLOPT_HTTPGET, 1L);
+
+								  std::string									   Body;
+								  WriteCallbackData								   WriteData{.Body = &Body};
+								  HeaderCallbackData							   HdrData{};
+								  std::vector<std::pair<std::string, std::string>> ResponseHeaders;
+								  HdrData.Headers = &ResponseHeaders;
+
+								  curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
+								  curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
+								  curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
+								  curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
+
+								  CurlResult Result = Sess.Perform();
+								  Result.Body		= std::move(Body);
+								  Result.Headers	= std::move(ResponseHeaders);
+
+								  curl_slist_free_all(Headers);
+
+								  return Result;
+							  },
+							  [this](CurlResult& Result) {
+								  std::unique_ptr<detail::TempPayloadFile> NoTempFile;
+								  return ValidatePayload(Result, NoTempFile);
+							  }),
+						  {});
 }
 
 CurlHttpClient::Response
@@ -1090,33 +1085,32 @@ CurlHttpClient::Head(std::string_view Url, const KeyValueMap& AdditionalHeader)
 {
 	ZEN_TRACE_CPU("CurlHttpClient::Head");
 
-	return CommonResponse(
-		m_SessionId,
-		DoWithRetry(m_SessionId,
-					[&]() -> CurlResult {
-						Session Sess =
-							AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
-						CURL* H = Sess.Get();
+	return CommonResponse(m_SessionId,
+						  DoWithRetry(m_SessionId,
+									  [&]() -> CurlResult {
+										  Session Sess =
+											  AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
+										  CURL* H = Sess.Get();
 
-						curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
-						curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
-						curl_easy_setopt(H, CURLOPT_NOBODY, 1L);
+										  curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
+										  curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
+										  curl_easy_setopt(H, CURLOPT_NOBODY, 1L);
 
-						HeaderCallbackData								 HdrData{};
-						std::vector<std::pair<std::string, std::string>> ResponseHeaders;
-						HdrData.Headers = &ResponseHeaders;
+										  HeaderCallbackData							   HdrData{};
+										  std::vector<std::pair<std::string, std::string>> ResponseHeaders;
+										  HdrData.Headers = &ResponseHeaders;
 
-						curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
-						curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
+										  curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
+										  curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
 
-						CurlResult Result = Sess.Perform();
-						Result.Headers	  = std::move(ResponseHeaders);
+										  CurlResult Result = Sess.Perform();
+										  Result.Headers	= std::move(ResponseHeaders);
 
-						curl_slist_free_all(Headers);
+										  curl_slist_free_all(Headers);
 
-						return Result;
-					}),
-		{});
+										  return Result;
+									  }),
+						  {});
 }
 
 CurlHttpClient::Response
@@ -1124,38 +1118,37 @@ CurlHttpClient::Delete(std::string_view Url, const KeyValueMap& AdditionalHeader
 {
 	ZEN_TRACE_CPU("CurlHttpClient::Delete");
 
-	return CommonResponse(
-		m_SessionId,
-		DoWithRetry(m_SessionId,
-					[&]() -> CurlResult {
-						Session Sess =
-							AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
-						CURL* H = Sess.Get();
-
-						curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
-						curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
-						curl_easy_setopt(H, CURLOPT_CUSTOMREQUEST, "DELETE");
-
-						std::string										 Body;
-						WriteCallbackData								 WriteData{.Body = &Body};
-						HeaderCallbackData								 HdrData{};
-						std::vector<std::pair<std::string, std::string>> ResponseHeaders;
-						HdrData.Headers = &ResponseHeaders;
-
-						curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
-						curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
-						curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
-						curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
-
-						CurlResult Result = Sess.Perform();
-						Result.Body		  = std::move(Body);
-						Result.Headers	  = std::move(ResponseHeaders);
-
-						curl_slist_free_all(Headers);
-
-						return Result;
-					}),
-		{});
+	return CommonResponse(m_SessionId,
+						  DoWithRetry(m_SessionId,
+									  [&]() -> CurlResult {
+										  Session Sess =
+											  AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
+										  CURL* H = Sess.Get();
+
+										  curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
+										  curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
+										  curl_easy_setopt(H, CURLOPT_CUSTOMREQUEST, "DELETE");
+
+										  std::string									   Body;
+										  WriteCallbackData								   WriteData{.Body = &Body};
+										  HeaderCallbackData							   HdrData{};
+										  std::vector<std::pair<std::string, std::string>> ResponseHeaders;
+										  HdrData.Headers = &ResponseHeaders;
+
+										  curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
+										  curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
+										  curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
+										  curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
+
+										  CurlResult Result = Sess.Perform();
+										  Result.Body		= std::move(Body);
+										  Result.Headers	= std::move(ResponseHeaders);
+
+										  curl_slist_free_all(Headers);
+
+										  return Result;
+									  }),
+						  {});
 }
 
 CurlHttpClient::Response
@@ -1163,39 +1156,38 @@ CurlHttpClient::Post(std::string_view Url, const KeyValueMap& AdditionalHeader,
 {
 	ZEN_TRACE_CPU("CurlHttpClient::PostNoPayload");
 
-	return CommonResponse(
-		m_SessionId,
-		DoWithRetry(m_SessionId,
-					[&]() -> CurlResult {
-						Session Sess =
-							AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, Parameters, m_SessionId, GetAccessToken());
-						CURL* H = Sess.Get();
-
-						curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
-						curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
-						curl_easy_setopt(H, CURLOPT_POST, 1L);
-						curl_easy_setopt(H, CURLOPT_POSTFIELDSIZE, 0L);
-
-						std::string										 Body;
-						WriteCallbackData								 WriteData{.Body = &Body};
-						HeaderCallbackData								 HdrData{};
-						std::vector<std::pair<std::string, std::string>> ResponseHeaders;
-						HdrData.Headers = &ResponseHeaders;
-
-						curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
-						curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
-						curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
-						curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
-
-						CurlResult Result = Sess.Perform();
-						Result.Body		  = std::move(Body);
-						Result.Headers	  = std::move(ResponseHeaders);
-
-						curl_slist_free_all(Headers);
-
-						return Result;
-					}),
-		{});
+	return CommonResponse(m_SessionId,
+						  DoWithRetry(m_SessionId,
+									  [&]() -> CurlResult {
+										  Session Sess =
+											  AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, Parameters, m_SessionId);
+										  CURL* H = Sess.Get();
+
+										  curl_slist* Headers = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
+										  curl_easy_setopt(H, CURLOPT_HTTPHEADER, Headers);
+										  curl_easy_setopt(H, CURLOPT_POST, 1L);
+										  curl_easy_setopt(H, CURLOPT_POSTFIELDSIZE, 0L);
+
+										  std::string									   Body;
+										  WriteCallbackData								   WriteData{.Body = &Body};
+										  HeaderCallbackData							   HdrData{};
+										  std::vector<std::pair<std::string, std::string>> ResponseHeaders;
+										  HdrData.Headers = &ResponseHeaders;
+
+										  curl_easy_setopt(H, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
+										  curl_easy_setopt(H, CURLOPT_WRITEDATA, &WriteData);
+										  curl_easy_setopt(H, CURLOPT_HEADERFUNCTION, CurlHeaderCallback);
+										  curl_easy_setopt(H, CURLOPT_HEADERDATA, &HdrData);
+
+										  CurlResult Result = Sess.Perform();
+										  Result.Body		= std::move(Body);
+										  Result.Headers	= std::move(ResponseHeaders);
+
+										  curl_slist_free_all(Headers);
+
+										  return Result;
+									  }),
+						  {});
 }
 
 CurlHttpClient::Response
@@ -1214,7 +1206,7 @@ CurlHttpClient::Post(std::string_view Url, const IoBuffer& Payload, ZenContentTy
 		DoWithRetry(
 			m_SessionId,
 			[&]() -> CurlResult {
-				Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
+				Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
 				CURL*	H	 = Sess.Get();
 
 				// Rebuild headers with content type
@@ -1296,7 +1288,7 @@ CurlHttpClient::Post(std::string_view			  Url,
 			PayloadString.clear();
 			PayloadFile.reset();
 
-			Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
+			Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
 			CURL*	H	 = Sess.Get();
 
 			curl_slist* Headers =
@@ -1468,9 +1460,8 @@ CurlHttpClient::Post(std::string_view Url, const CompositeBuffer& Payload, ZenCo
 		m_SessionId,
 		DoWithRetry(m_SessionId,
 					[&]() -> CurlResult {
-						Session Sess =
-							AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
-						CURL* H = Sess.Get();
+						Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
+						CURL*	H	 = Sess.Get();
 
 						curl_slist* Headers =
 							BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken(), {HeaderContentType(ContentType)});
@@ -1517,7 +1508,7 @@ CurlHttpClient::Upload(std::string_view Url, const IoBuffer& Payload, const KeyV
 		DoWithRetry(
 			m_SessionId,
 			[&]() -> CurlResult {
-				Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
+				Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
 				CURL*	H	 = Sess.Get();
 
 				curl_slist* Headers =
@@ -1597,9 +1588,8 @@ CurlHttpClient::Upload(std::string_view		  Url,
 		m_SessionId,
 		DoWithRetry(m_SessionId,
 					[&]() -> CurlResult {
-						Session Sess =
-							AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
-						CURL* H = Sess.Get();
+						Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
+						CURL*	H	 = Sess.Get();
 
 						curl_slist* Headers =
 							BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken(), {HeaderContentType(ContentType)});
@@ -1652,7 +1642,7 @@ CurlHttpClient::Download(std::string_view Url, const std::filesystem::path& Temp
 	CurlResult Result = DoWithRetry(
 		m_SessionId,
 		[&]() -> CurlResult {
-			Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId, GetAccessToken());
+			Session Sess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, AdditionalHeader, {}, m_SessionId);
 			CURL*	H	 = Sess.Get();
 
 			curl_slist* DlHeaders = BuildHeaderList(AdditionalHeader, m_SessionId, GetAccessToken());
@@ -1958,9 +1948,8 @@ CurlHttpClient::Download(std::string_view Url, const std::filesystem::path& Temp
 							}
 							HeadersWithRange.Entries.insert_or_assign("Range", Range);
 
-							Session ResumeSess =
-								AllocSession(m_BaseUri, Url, m_ConnectionSettings, HeadersWithRange, {}, m_SessionId, GetAccessToken());
-							CURL* ResumeH = ResumeSess.Get();
+							Session ResumeSess = AllocSession(m_BaseUri, Url, m_ConnectionSettings, HeadersWithRange, {}, m_SessionId);
+							CURL*	ResumeH	   = ResumeSess.Get();
 
 							curl_slist* ResumeHdrList = BuildHeaderList(HeadersWithRange, m_SessionId, GetAccessToken());
 							curl_easy_setopt(ResumeH, CURLOPT_HTTPHEADER, ResumeHdrList);