vinod/booksman
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

User Authentication and Other fixes #1

Merged
vinod merged 30 commits from user-auth into main 2023-02-05 09:01:08 +00:00
Conversation 0 Commits 30 Files Changed 62 +8 -3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 65cbf74802 - Show all commits

11
backend/api/src/lib.rs
View File

@@ -22,7 +22,7 @@ use std::net::{IpAddr, Ipv6Addr, SocketAddr};
use std::str::FromStr; use std::str::FromStr;
use tower::ServiceBuilder; use tower::ServiceBuilder;
use tower_http::cors::{Any, CorsLayer}; use tower_http::cors::{Any, CorsLayer};
use tower_http::services::ServeDir; use tower_http::services::{ServeDir,ServeFile};
use tower_http::trace::TraceLayer; use tower_http::trace::TraceLayer;
//use itertools::Itertools; //use itertools::Itertools;
use ::entity::entities::{ use ::entity::entities::{
@@ -273,8 +273,13 @@ pub async fn main() {
get_service(ServeDir::new(images_dir)).handle_error(handle_error), get_service(ServeDir::new(images_dir)).handle_error(handle_error),
) )
.nest_service( .nest_service(
"/", "/assets",
get_service(ServeDir::new(opt.static_dir)).handle_error(handle_error), get_service(ServeDir::new(opt.static_dir.clone())).handle_error(handle_error),
)
.fallback_service(
get_service(ServeFile::new( format!("{}/index.html",opt.static_dir))).handle_error(
|_| async move { (StatusCode::INTERNAL_SERVER_ERROR, "internal server error") },
),
) )
// .merge(SpaRouter::new("/assets", opt.static_dir)) // .merge(SpaRouter::new("/assets", opt.static_dir))
.layer(auth_layer) .layer(auth_layer)