fix(oauth): use wreq API for token requests

Author: Algorithm5838

src/oauth.rs

@@ -5,7 +5,6 @@ use crate::{
 	oauth_resources::ANDROID_APP_VERSION_LIST,
 };
 use base64::{engine::general_purpose, Engine as _};
-use hyper::{client, Body, Method, Request};
 use log::{error, info, trace, warn};
 use serde_json::json;
 use tegen::tegen::TextGenerator;
@@ -88,7 +87,7 @@ impl Oauth {
 					error!(
 						"[⛔] Failed to create OAuth client: {}. Retrying in 5 seconds...",
 						match e {
-							AuthError::Hyper(error) => error.to_string(),
+							AuthError::Wreq(error) => error.to_string(),
 							AuthError::SerdeDeserialize(error) => error.to_string(),
 							AuthError::Field((value, error)) => format!("{error}\n{value}"),
 						}
@@ -142,14 +141,14 @@ impl Oauth {
 
 #[derive(Debug)]
 enum AuthError {
-	Hyper(hyper::Error),
+	Wreq(wreq::Error),
 	SerdeDeserialize(serde_json::Error),
 	Field((serde_json::Value, &'static str)),
 }
 
-impl From<hyper::Error> for AuthError {
-	fn from(err: hyper::Error) -> Self {
-		AuthError::Hyper(err)
+impl From<wreq::Error> for AuthError {
+	fn from(err: wreq::Error) -> Self {
+		AuthError::Wreq(err)
 	}
 }
 
@@ -222,42 +221,26 @@ impl OauthBackend for MobileSpoofAuth {
 	async fn authenticate(&mut self) -> Result<OauthResponse, AuthError> {
 		// Construct URL for OAuth token
 		let url = format!("{AUTH_ENDPOINT}/auth/v2/oauth/access-token/loid");
-		let mut builder = Request::builder().method(Method::POST).uri(&url);
 
-		// Add headers from spoofed client
+		// Set up HTTP Basic Auth
+		let auth = general_purpose::STANDARD.encode(format!("{}:", self.device.oauth_id));
+
+		// Build request with spoofed device headers
+		let mut req_builder = CLIENT.post(&url).header("Authorization", format!("Basic {auth}"));
 		for (key, value) in &self.device.initial_headers {
-			builder = builder.header(key, value);
+			req_builder = req_builder.header(key.as_str(), value.as_str());
 		}
-		// Set up HTTP Basic Auth - basically just the const OAuth ID's with no password,
-		// Base64-encoded. https://en.wikipedia.org/wiki/Basic_access_authentication
-		// This could be constant, but I don't think it's worth it. OAuth ID's can change
-		// over time and we want to be flexible.
-		let auth = general_purpose::STANDARD.encode(format!("{}:", self.device.oauth_id));
-		builder = builder.header("Authorization", format!("Basic {auth}"));
 
-		// Set JSON body. I couldn't tell you what this means. But that's what the client sends
-		let json = json!({
-				"scopes": ["*","email", "pii"]
+		// Set JSON body
+		let json_body = json!({
+			"scopes": ["*", "email", "pii"]
 		});
-		let body = Body::from(json.to_string());
-
-		// Build request
-		let request = builder.body(body).unwrap();
-
-		trace!("Sending token request...\n\n{request:?}");
-
-		// Send request
-		let client: &std::sync::LazyLock<client::Client<_, Body>> = &CLIENT;
-		let resp = client.request(request).await?;
+		let resp = req_builder.json(&json_body).send().await?;
 
 		trace!("Received response with status {} and length {:?}", resp.status(), resp.headers().get("content-length"));
 		trace!("OAuth headers: {:#?}", resp.headers());
 
 		// Parse headers - loid header _should_ be saved sent on subsequent token refreshes.
-		// Technically it's not needed, but it's easy for Reddit API to check for this.
-		// It's some kind of header that uniquely identifies the device.
-		// Not worried about the privacy implications, since this is randomly changed
-		// and really only as privacy-concerning as the OAuth token itself.
 		if let Some(header) = resp.headers().get("x-reddit-loid") {
 			self.additional_headers.insert("x-reddit-loid".to_owned(), header.to_str().unwrap().to_string());
 		}
@@ -270,8 +253,7 @@ impl OauthBackend for MobileSpoofAuth {
 		trace!("Serializing response...");
 
 		// Serialize response
-		let body_bytes = hyper::body::to_bytes(resp.into_body()).await?;
-		let json: serde_json::Value = serde_json::from_slice(&body_bytes).map_err(AuthError::SerdeDeserialize)?;
+		let json: serde_json::Value = resp.json().await.map_err(|e| AuthError::Wreq(e))?;
 
 		trace!("Accessing relevant fields...");
 
@@ -341,40 +323,28 @@ impl OauthBackend for GenericWebAuth {
 	async fn authenticate(&mut self) -> Result<OauthResponse, AuthError> {
 		// Construct URL for OAuth token
 		let url = "https://www.reddit.com/api/v1/access_token";
-		let mut builder = Request::builder().method(Method::POST).uri(url);
-
-		// Add minimal headers
-		builder = builder.header("Host", "www.reddit.com");
-		builder = builder.header("User-Agent", &self.user_agent);
-		builder = builder.header("Accept", "*/*");
-		builder = builder.header("Accept-Language", "en-US,en;q=0.5");
-		// builder = builder.header("Accept-Encoding", "gzip, deflate, br, zstd");
-		builder = builder.header("Authorization", "Basic M1hmQkpXbGlIdnFBQ25YcmZJWWxMdzo=");
-		builder = builder.header("Content-Type", "application/x-www-form-urlencoded");
-		builder = builder.header("Sec-GPC", "1");
-		builder = builder.header("Connection", "keep-alive");
 
 		// Set up form body
 		let body_str = format!("grant_type=https%3A%2F%2Foauth.reddit.com%2Fgrants%2Finstalled_client&device_id={}", self.device_id);
-		let body = Body::from(body_str);
-
-		// Build request
-		let request = builder.body(body).unwrap();
 
-		trace!("Sending GenericWebAuth token request...\n\n{request:?}");
-
-		// Send request
-		let client: &std::sync::LazyLock<client::Client<_, Body>> = &CLIENT;
-		let resp = client.request(request).await?;
+		let resp = CLIENT
+			.post(url)
+			.header("Host", "www.reddit.com")
+			.header("User-Agent", &self.user_agent)
+			.header("Accept", "*/*")
+			.header("Accept-Language", "en-US,en;q=0.5")
+			.header("Authorization", "Basic M1hmQkpXbGlIdnFBQ25YcmZJWWxMdzo=")
+			.header("Content-Type", "application/x-www-form-urlencoded")
+			.header("Sec-GPC", "1")
+			.header("Connection", "keep-alive")
+			.body(body_str)
+			.send()
+			.await?;
 
 		trace!("Received response with status {} and length {:?}", resp.status(), resp.headers().get("content-length"));
 		trace!("GenericWebAuth headers: {:#?}", resp.headers());
 
-		// Parse headers - loid header _should_ be saved sent on subsequent token refreshes.
-		// Technically it's not needed, but it's easy for Reddit API to check for this.
-		// It's some kind of header that uniquely identifies the device.
-		// Not worried about the privacy implications, since this is randomly changed
-		// and really only as privacy-concerning as the OAuth token itself.
+		// Parse headers
 		if let Some(header) = resp.headers().get("x-reddit-loid") {
 			self.additional_headers.insert("x-reddit-loid".to_owned(), header.to_str().unwrap().to_string());
 		}
@@ -387,8 +357,7 @@ impl OauthBackend for GenericWebAuth {
 		trace!("Serializing GenericWebAuth response...");
 
 		// Serialize response
-		let body_bytes = hyper::body::to_bytes(resp.into_body()).await?;
-		let json: serde_json::Value = serde_json::from_slice(&body_bytes).map_err(AuthError::SerdeDeserialize)?;
+		let json: serde_json::Value = resp.json().await.map_err(|e| AuthError::Wreq(e))?;
 
 		trace!("Accessing relevant fields...");