From b1a5ef0aab2d5a389d61a2299c503d7165c43ea9 Mon Sep 17 00:00:00 2001
From: marin postma <postma.marin@protonmail.com>
Date: Tue, 22 Jun 2021 21:48:51 +0200
Subject: [PATCH] improve mini dashboard routing

---
 meilisearch-http/src/lib.rs | 111 +++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/meilisearch-http/src/lib.rs b/meilisearch-http/src/lib.rs
index 25c29ac11..6f4ce7e43 100644
--- a/meilisearch-http/src/lib.rs
+++ b/meilisearch-http/src/lib.rs
@@ -15,64 +15,83 @@ pub use option::Opt;
 
 #[macro_export]
 macro_rules! create_app {
-    ($data:expr, $enable_frontend:expr) => {{
-        use actix_cors::Cors;
-        use actix_web::middleware::TrailingSlash;
-        use actix_web::App;
-        use actix_web::{middleware, web};
-        use meilisearch_http::error::payload_error_handler;
-        use meilisearch_http::routes::*;
+    ($data:expr, $enable_frontend:expr) => {
+        {
+            use actix_cors::Cors;
+            use actix_web::middleware::TrailingSlash;
+            use actix_web::{App, HttpResponse};
+            use actix_web::{middleware, web};
+            use meilisearch_http::error::payload_error_handler;
+            use meilisearch_http::routes::*;
 
-        #[cfg(feature = "mini-dashboard")]
-        use actix_web_static_files::ResourceFiles;
+            #[cfg(feature = "mini-dashboard")]
+            use actix_web_static_files::Resource;
 
-        #[cfg(feature = "mini-dashboard")]
-        mod dashboard {
-            include!(concat!(env!("OUT_DIR"), "/generated.rs"));
-        }
+            #[cfg(feature = "mini-dashboard")]
+            mod dashboard {
+                include!(concat!(env!("OUT_DIR"), "/generated.rs"));
+            }
 
-        let app = App::new()
-            .data($data.clone())
-            .app_data(
-                web::JsonConfig::default()
+            let app = App::new()
+                .data($data.clone())
+                .app_data(
+                    web::JsonConfig::default()
                     .limit($data.http_payload_size_limit())
                     .content_type(|_mime| true) // Accept all mime types
                     .error_handler(|err, _req| payload_error_handler(err).into()),
-            )
-            .app_data(
-                web::QueryConfig::default()
+                )
+                .app_data(
+                    web::QueryConfig::default()
                     .error_handler(|err, _req| payload_error_handler(err).into()),
-            )
-            .configure(document::services)
-            .configure(index::services)
-            .configure(search::services)
-            .configure(settings::services)
-            .configure(health::services)
-            .configure(stats::services)
-            .configure(key::services)
-            .configure(dump::services);
-        #[cfg(feature = "mini-dashboard")]
-        let app = if $enable_frontend {
-            let generated = dashboard::generate();
-            let service = ResourceFiles::new("/", generated);
-            app.service(service)
-        } else {
-            app.service(running)
-        };
+                )
+                .configure(document::services)
+                .configure(index::services)
+                .configure(search::services)
+                .configure(settings::services)
+                .configure(health::services)
+                .configure(stats::services)
+                .configure(key::services)
+                .configure(dump::services);
+            #[cfg(feature = "mini-dashboard")]
+            let app = if $enable_frontend {
+                let mut app = app;
+                let generated = dashboard::generate();
+                let mut scope = web::scope("/");
+                // Generate routes for mini-dashboard assets
+                for (path, resource) in generated.into_iter() {
+                    let Resource {mime_type, data, ..} = resource;
+                    // Redirect index.html to /
+                    if path == "index.html" {
+                        app = app.service(web::resource("/").route(web::get().to(move || {
+                            HttpResponse::Ok().content_type(mime_type).body(data)
+                        })));
+                    } else {
+                        scope = scope.service(web::resource(path).route(web::get().to(move || {
+                            HttpResponse::Ok().content_type(mime_type).body(data)
+                        })));
+                    }
+                }
+                app.service(scope)
+            } else {
+                app.service(running)
+            };
 
-        #[cfg(not(feature = "mini-dashboard"))]
-        let app = app.service(running);
+            #[cfg(not(feature = "mini-dashboard"))]
+            let app = app.service(running);
 
-        app.wrap(
-            Cors::default()
+            app.wrap(
+                Cors::default()
                 .send_wildcard()
                 .allowed_headers(vec!["content-type", "x-meili-api-key"])
                 .allow_any_origin()
                 .allow_any_method()
                 .max_age(86_400), // 24h
-        )
-        .wrap(middleware::Logger::default())
-        .wrap(middleware::Compress::default())
-        .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
-    }};
+            )
+                .wrap(middleware::Logger::default())
+                .wrap(middleware::Compress::default())
+                .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
+                .default_service(
+                    web::route().to(|| HttpResponse::NotFound()))
+        }
+    };
 }