Fix deprecation warnings
This commit is contained in:
@ -11,8 +11,6 @@ use crate::controllers::base_controller::{FatalErrorPage, redirect_user};
|
||||
use crate::data::remote_ip::RemoteIP;
|
||||
use crate::data::session_identity::{SessionIdentity, SessionStatus};
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "login/base_login_page.html")]
|
||||
struct BaseLoginPage {
|
||||
danger: String,
|
||||
success: String,
|
||||
@ -24,14 +22,14 @@ struct BaseLoginPage {
|
||||
#[derive(Template)]
|
||||
#[template(path = "login/login.html")]
|
||||
struct LoginTemplate {
|
||||
_parent: BaseLoginPage,
|
||||
_p: BaseLoginPage,
|
||||
login: String,
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "login/password_reset.html")]
|
||||
struct PasswordResetTemplate {
|
||||
_parent: BaseLoginPage,
|
||||
_p: BaseLoginPage,
|
||||
min_pass_len: usize,
|
||||
}
|
||||
|
||||
@ -141,7 +139,7 @@ pub async fn login_route(
|
||||
}
|
||||
|
||||
c => {
|
||||
log::warn!("Failed login for ip {:?} / username {}: {:?}", remote_ip, login, c);
|
||||
log::warn!("Failed login for ip {:?} / username {}: {:?}", remote_ip, login, c);
|
||||
danger = "Login failed.".to_string();
|
||||
|
||||
bruteforce.send(bruteforce_actor::RecordFailedAttempt { ip: remote_ip.into() }).await.unwrap();
|
||||
@ -153,7 +151,7 @@ pub async fn login_route(
|
||||
if SessionIdentity(&id).need_new_password() {
|
||||
return HttpResponse::Ok().content_type("text/html").body(
|
||||
PasswordResetTemplate {
|
||||
_parent: BaseLoginPage {
|
||||
_p: BaseLoginPage {
|
||||
page_title: "Password reset",
|
||||
danger,
|
||||
success,
|
||||
@ -169,7 +167,7 @@ pub async fn login_route(
|
||||
|
||||
HttpResponse::Ok().content_type("text/html").body(
|
||||
LoginTemplate {
|
||||
_parent: BaseLoginPage {
|
||||
_p: BaseLoginPage {
|
||||
page_title: "Login",
|
||||
danger,
|
||||
success,
|
||||
|
Reference in New Issue
Block a user