fix: combine requests

WalletConnect · Feb 22, 2024 · dc2c552 · dc2c552
1 parent a08cc2a
commit dc2c552
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/http_server/index_js.rs b/src/http_server/index_js.rs
@@ -8,8 +8,7 @@ use {
     serde::Deserialize,
 };
 
-const TEMPLATE: &str = r#"
-const csrfToken = '{token}';
+const SCRIPT: &str = r#"
 // event subscribed by Verify Enclave
 window.addEventListener("message", (event) => {
     const attestationId = event.data
@@ -46,5 +45,8 @@ pub(super) async fn get(query: Query<Params>) -> Result<impl IntoResponse, Statu
         return Err(StatusCode::BAD_REQUEST);
     }
 
-    Ok(Html(TEMPLATE.replacen("{token}", &query.token, 1)))
+    Ok(Html(format!(
+        "const csrfToken = '{}';{}",
+        query.token, SCRIPT
+    )))
 }
diff --git a/src/http_server/mod.rs b/src/http_server/mod.rs
@@ -1,4 +1,5 @@
 use {
+    self::index_js::SCRIPT,
     crate::{
         ContextualCommand,
         Domain,
@@ -34,13 +35,13 @@ use {
         StatusCode,
     },
     serde::{Deserialize, Serialize},
-    std::{convert::Infallible, future::Future, iter, net::SocketAddr, sync::Arc},
+    std::{convert::Infallible, future::Future, iter, net::SocketAddr, str::Bytes, sync::Arc},
     tap::{Pipe, Tap},
     tower_http::cors::{self, CorsLayer},
     tracing::{info, instrument},
-    wc::{
-        geoip,
-        geoip::block::{middleware::GeoBlockLayer, BlockingPolicy as GeoBlockingPolicy},
+    wc::geoip::{
+        self,
+        block::{middleware::GeoBlockLayer, BlockingPolicy as GeoBlockingPolicy},
     },
 };
 
@@ -132,7 +133,7 @@ pub async fn run<S, G>(
         .layer(cors_layer)
         .route("/health", get(health::get(health_provider)))
         .route("/attestation", post(attestation::post))
-        .route("/index.js", get(index_js::get))
+        .route("/index.js", get(index_js::get)) // TODO remove in next deploy
         .route("/:project_id", get(root))
         .layer(metrics_layer)
         .with_state(Arc::new(state));
@@ -167,13 +168,6 @@ pub async fn run<S, G>(
     );
 }
 
-fn index_html(token: &str) -> String {
-    format!(
-        "<!-- index.html --><html><head><script \
-         src=\"/index.js?token={token}\"></script></head></html>"
-    )
-}
-
 const UNKNOWN_PROJECT_MSG: &str = "Project with the provided ID doesn't exist. Please, ensure \
                                    that the project is registered on cloud.walletconnect.com";
 
@@ -194,7 +188,7 @@ where
         VerifyStatus::Disabled => String::new().into_response(),
         VerifyStatus::Enabled { verified_domains } => {
             let token = s.token_manager.generate_csrf_token()?;
-            let html = index_html(&token);
+            let html = format!("<script>const csrfToken = '{token}';{SCRIPT}</script>");
             let csp = build_content_security_header(verified_domains);
             let headers = [
                 (header::CONTENT_SECURITY_POLICY, csp),