1 files changed, 16 insertions, 24 deletions

diff --git a/src/zenhttp/auth/oidc.cpp b/src/zenhttp/auth/oidc.cpp
index 318110c7d..38e7586ad 100644
--- a/src/zenhttp/auth/oidc.cpp
+++ b/src/zenhttp/auth/oidc.cpp
@@ -1,9 +1,9 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
 #include "zenhttp/auth/oidc.h"
+#include <zenhttp/httpclient.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
-#include <cpr/cpr.h>
 #include <fmt/format.h>
 #include <json11.hpp>
 ZEN_THIRD_PARTY_INCLUDES_END
@@ -41,27 +41,21 @@ OidcClient::OidcClient(const OidcClient::Options& Options)
 OidcClient::InitResult
 OidcClient::Initialize()
 {
-	ExtendableStringBuilder<256> Uri;
-	Uri << m_BaseUrl << "/.well-known/openid-configuration"sv;
+	HttpClient			 Http{m_BaseUrl};
+	HttpClient::Response Response = Http.Get("/.well-known/openid-configuration"sv);
 
-	cpr::Session Session;
-
-	Session.SetOption(cpr::Url{Uri.c_str()});
-
-	cpr::Response Response = Session.Get();
-
-	if (Response.error)
+	if (!Response)
 	{
-		return {.Reason = std::move(Response.error.message)};
+		return {.Reason = Response.ErrorMessage("")};
 	}
 
-	if (Response.status_code != 200)
+	if (Response.StatusCode != HttpResponseCode::OK)
 	{
-		return {.Reason = std::move(Response.reason)};
+		return {.Reason = std::string{ToString(Response.StatusCode)}};
 	}
 
 	std::string	 JsonError;
-	json11::Json Json = json11::Json::parse(Response.text, JsonError);
+	json11::Json Json = json11::Json::parse(std::string{Response.AsText()}, JsonError);
 
 	if (JsonError.empty() == false)
 	{
@@ -89,26 +83,24 @@ OidcClient::RefreshToken(std::string_view RefreshToken)
 {
 	const std::string Body = fmt::format("grant_type=refresh_token&refresh_token={}&client_id={}", RefreshToken, m_ClientId);
 
-	cpr::Session Session;
+	HttpClient Http{m_Config.TokenEndpoint};
 
-	Session.SetOption(cpr::Url{m_Config.TokenEndpoint.c_str()});
-	Session.SetOption(cpr::Header{{"Content-Type", "application/x-www-form-urlencoded"}});
-	Session.SetBody(cpr::Body{Body.data(), Body.size()});
+	HttpClient::KeyValueMap Headers{{"Content-Type", "application/x-www-form-urlencoded"}};
 
-	cpr::Response Response = Session.Post();
+	HttpClient::Response Response = Http.Post("", IoBufferBuilder::MakeFromMemory(MemoryView{Body.data(), Body.size()}), Headers);
 
-	if (Response.error)
+	if (!Response)
 	{
-		return {.Reason = std::move(Response.error.message)};
+		return {.Reason = std::string{Response.ErrorMessage("")}};
 	}
 
-	if (Response.status_code != 200)
+	if (Response.StatusCode != HttpResponseCode::OK)
 	{
-		return {.Reason = fmt::format("{} ({})", Response.reason, Response.text)};
+		return {.Reason = fmt::format("{} ({})", ToString(Response.StatusCode), Response.AsText())};
 	}
 
 	std::string	 JsonError;
-	json11::Json Json = json11::Json::parse(Response.text, JsonError);
+	json11::Json Json = json11::Json::parse(std::string{Response.AsText()}, JsonError);
 
 	if (JsonError.empty() == false)
 	{