Skip to content

Fix URI macro misuse #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZmoleCristian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix URI macro misuse #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/meltdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ impl From<MeltDown> for Flash<Redirect> {
fn from(error: MeltDown) -> Self {
error.log();

Flash::error(Redirect::to(uri!("/auth/login")), error.user_message())
Flash::error(Redirect::to("/auth/login"), error.user_message())
}
}

Expand Down
20 changes: 10 additions & 10 deletions src/routes/home.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ async fn post_login(tenant: &str, login_form: Form<LoginForm>, cookies: &CookieJ
if !exists {
cata_log!(Warning, format!("Attempted to login to non-existent tenant: {}", tenant));
let error = MeltDown::new(MeltType::NotFound, "Tenant not found");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}
Err(e) => {
cata_log!(Error, format!("Error checking tenant existence: {}", e.log_message()));
let error = MeltDown::new(MeltType::DatabaseError, "Database error");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}

Expand Down Expand Up @@ -191,13 +191,13 @@ async fn get_register(tenant: &str, app_context: AppContext<'_>) -> Result<Templ
if !exists {
cata_log!(Warning, format!("Attempted to access registration for non-existent tenant: {}", tenant));
let error = MeltDown::new(MeltType::NotFound, "Tenant not found");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}
Err(e) => {
cata_log!(Error, format!("Error checking tenant existence: {}", e.log_message()));
let error = MeltDown::new(MeltType::DatabaseError, "Database error");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}

Expand All @@ -213,13 +213,13 @@ async fn post_register(tenant: &str, register_form: Form<RegisterForm>, app_cont
if !exists {
cata_log!(Warning, format!("Attempted to register for non-existent tenant: {}", tenant));
let error = MeltDown::new(MeltType::NotFound, "Tenant not found");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}
Err(e) => {
cata_log!(Error, format!("Error checking tenant existence: {}", e.log_message()));
let error = MeltDown::new(MeltType::DatabaseError, "Database error");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}

Expand Down Expand Up @@ -248,13 +248,13 @@ async fn get_login(tenant: &str, app_context: AppContext<'_>, jwt: Option<JWT>,
if !exists {
cata_log!(Warning, format!("Attempted to access login for non-existent tenant: {}", tenant));
let error = MeltDown::new(MeltType::NotFound, "Tenant not found");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}
Err(e) => {
cata_log!(Error, format!("Error checking tenant existence: {}", e.log_message()));
let error = MeltDown::new(MeltType::DatabaseError, "Database error");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}

Expand Down Expand Up @@ -313,13 +313,13 @@ pub async fn get_home(tenant: &str, app_context: AppContext<'_>, jwt: Option<JWT
if !exists {
cata_log!(Warning, format!("Attempted to access non-existent tenant: {}", tenant));
let error = MeltDown::new(MeltType::NotFound, "Tenant not found");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}
Err(e) => {
cata_log!(Error, format!("Error checking tenant existence: {}", e.log_message()));
let error = MeltDown::new(MeltType::DatabaseError, "Database error");
return Err(Flash::error(Redirect::to(uri!("/vessel/auth/login")), error.user_message()));
return Err(Flash::error(Redirect::to("/vessel/auth/login"), error.user_message()));
}
}

Expand Down