fix: removed "prerender" token from builder if using custom URL

saskenuba · saskenuba · commit cdb519c2f7a4 · 2022-03-02T17:54:20.000-03:00
Signed-off-by: Martin &lt;martin@hotmail.com.br&gt;
diff --git a/src/builder.rs b/src/builder.rs
@@ -35,7 +35,7 @@ use url::Url;
 /// use actix_web::http::header;
 ///
 /// let token = "prerender service token".to_string();
-/// let prerender = Prerender::build().use_custom_prerender_url("https://localhost:5001", token);
+/// let prerender = Prerender::build().use_custom_prerender_url("https://localhost:5001");
 ///
 /// // `prerender` can now be used in `App::wrap`.
 /// ```
@@ -52,23 +52,19 @@ impl PrerenderBuilder {
         let inner = Inner {
             prerender_service_url: middleware::prerender_url(),
             inner_client: Client::default(),
-            prerender_token: token,
+            prerender_token: Some(token),
         };
 
         Prerender { inner: Rc::new(inner) }
     }
 
-    pub fn use_custom_prerender_url(
-        self,
-        prerender_service_url: &str,
-        token: String,
-    ) -> Result<Prerender, PrerenderError> {
+    pub fn use_custom_prerender_url(self, prerender_service_url: &str) -> Result<Prerender, PrerenderError> {
         let prerender_service_url = Url::parse(prerender_service_url).map_err(|_| PrerenderError::InvalidUrl)?;
 
         let inner = Inner {
             prerender_service_url,
             inner_client: Client::default(),
-            prerender_token: token,
+            prerender_token: None,
         };
 
         Ok(Prerender { inner: Rc::new(inner) })
diff --git a/src/middleware.rs b/src/middleware.rs
@@ -9,7 +9,7 @@ use actix_web::http::{header, Method};
 use actix_web::{Error, HttpResponse};
 use futures_util::future::LocalBoxFuture;
 use futures_util::TryFutureExt;
-use log::debug;
+use log::trace;
 use reqwest::Client;
 use url::Url;
 
@@ -20,7 +20,7 @@ use crate::{IGNORED_EXTENSIONS, USER_AGENTS};
 pub struct Inner {
     pub(crate) prerender_service_url: Url,
     pub(crate) inner_client: Client,
-    pub(crate) prerender_token: String,
+    pub(crate) prerender_token: Option<String>,
 }
 
 pub(crate) fn prerender_url() -> Url {
@@ -105,14 +105,14 @@ impl<S> PrerenderMiddleware<S> {
         }
 
         prerender_request_headers.append(header::ACCEPT_ENCODING, "gzip".parse().unwrap());
-        prerender_request_headers.append(
-            "X-Prerender-Token".parse().unwrap(),
-            inner.prerender_token.parse().unwrap(),
-        );
+
+        if let Some(token) = &inner.prerender_token {
+            prerender_request_headers.append("X-Prerender-Token".parse().unwrap(), token.parse().unwrap());
+        }
 
         let url_to_request = Self::prepare_build_api_url(&inner.prerender_service_url, &req);
 
-        debug!("sending request to: {}", &url_to_request);
+        trace!("sending request to: {}", &url_to_request);
         let prerender_response = inner
             .inner_client
             .get(url_to_request)
