From 26a894c0b15787fb9e54334d1db8fde7dfa9c937 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Mon, 8 Apr 2019 22:44:53 -0700
Subject: [PATCH] Properly redirect to index.html so relative src properties in
 html work

---
 src/swagger.rs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/swagger.rs b/src/swagger.rs
index 6a47a45..e0560ff 100644
--- a/src/swagger.rs
+++ b/src/swagger.rs
@@ -1,4 +1,6 @@
+use rocket::http::uri::Origin;
 use rocket::response::NamedFile;
+use rocket::response::Redirect;
 use rocket::State;
 use std::io;
 use std::path::PathBuf;
@@ -14,10 +16,9 @@ pub fn get_routes() -> Vec<rocket::Route> {
 }
 
 #[get("/", rank = 9)]
-fn index(static_dirs: State<Arc<StaticDirs>>) -> io::Result<NamedFile> {
-	let mut path = static_dirs.swagger_dir_path.clone();
-	path.push("index.html");
-    NamedFile::open(path)
+fn index(origin: &Origin) -> Redirect {
+	let redirect = Redirect::permanent(origin.path().to_owned() + "index.html");
+	return redirect;
 }
 
 #[get("/<file..>", rank = 9)]
@@ -26,6 +27,17 @@ fn files(static_dirs: State<Arc<StaticDirs>>, file: PathBuf) -> Option<NamedFile
     NamedFile::open(path).ok()
 }
 
+#[test]
+fn test_index_redirect() {
+	use rocket::http::Status;
+	use crate::test::get_test_environment;
+
+	let env = get_test_environment("swagger_index_redirect.sqlite");
+	let client = &env.client;
+	let response = client.get("/swagger").dispatch();
+	assert_eq!(response.status(), Status::PermanentRedirect);
+}
+
 #[test]
 fn test_index() {
 	use rocket::http::Status;
@@ -33,6 +45,6 @@ fn test_index() {
 
 	let env = get_test_environment("swagger_index.sqlite");
 	let client = &env.client;
-	let response = client.get("/swagger").dispatch();
+	let response = client.get("/swagger/index.html").dispatch();
 	assert_eq!(response.status(), Status::Ok);
 }