Share hostname string in RequestFactory

mullvad · Oct 21, 2023 · 0be2712 · 0be2712
1 parent 990a3d6
commit 0be2712
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/mullvad-api/src/access.rs b/mullvad-api/src/access.rs
@@ -38,7 +38,7 @@ struct AccountState {
 
 impl AccessTokenStore {
     pub(crate) fn new(service: RequestServiceHandle) -> Self {
-        let factory = rest::RequestFactory::new(API.host.clone(), None);
+        let factory = rest::RequestFactory::new(&API.host, None);
         let (tx, rx) = mpsc::unbounded();
         tokio::spawn(Self::service_requests(rx, service, factory));
         Self { tx }

diff --git a/mullvad-api/src/lib.rs b/mullvad-api/src/lib.rs
@@ -341,7 +341,7 @@ impl Runtime {
             )
             .await;
         let token_store = access::AccessTokenStore::new(service.clone());
-        let factory = rest::RequestFactory::new(API.host.clone(), Some(token_store));
+        let factory = rest::RequestFactory::new(&API.host, Some(token_store));
 
         rest::MullvadRestHandle::new(
             service,

diff --git a/mullvad-api/src/rest.rs b/mullvad-api/src/rest.rs
@@ -467,13 +467,13 @@ struct NewErrorResponse {
 
 #[derive(Clone)]
 pub struct RequestFactory {
-    hostname: String,
+    hostname: &'static str,
     token_store: Option<AccessTokenStore>,
     default_timeout: Duration,
 }
 
 impl RequestFactory {
-    pub fn new(hostname: String, token_store: Option<AccessTokenStore>) -> Self {
+    pub fn new(hostname: &'static str, token_store: Option<AccessTokenStore>) -> Self {
         Self {
             hostname,
             token_store,
@@ -550,7 +550,7 @@ impl RequestFactory {
             .uri(uri)
             .header(header::USER_AGENT, HeaderValue::from_static(USER_AGENT))
             .header(header::ACCEPT, HeaderValue::from_static("application/json"))
-            .header(header::HOST, self.hostname.clone());
+            .header(header::HOST, self.hostname.to_owned());
 
         let result = request.body(hyper::Body::empty())?;
         Ok(result)