Fix deprecation warnings

src/controllers/admin_controller.rs

@@ -16,21 +16,21 @@ use crate::utils::string_utils::rand_str;
 #[derive(Template)]
 #[template(path = "settings/clients_list.html")]
 struct ClientsListTemplate {
-    _parent: BaseSettingsPage,
+    _p: BaseSettingsPage,
     clients: Vec<Client>,
 }
 
 #[derive(Template)]
 #[template(path = "settings/users_list.html")]
 struct UsersListTemplate {
-    _parent: BaseSettingsPage,
+    _p: BaseSettingsPage,
     users: Vec<User>,
 }
 
 #[derive(Template)]
 #[template(path = "settings/edit_user.html")]
 struct EditUserTemplate {
-    _parent: BaseSettingsPage,
+    _p: BaseSettingsPage,
     u: User,
     clients: Vec<Client>,
 }
@@ -38,7 +38,7 @@ struct EditUserTemplate {
 
 pub async fn clients_route(user: CurrentUser, clients: web::Data<ClientManager>) -> impl Responder {
     HttpResponse::Ok().body(ClientsListTemplate {
-        _parent: BaseSettingsPage::get(
+        _p: BaseSettingsPage::get(
             "Clients list",
             &user,
             None,
@@ -122,7 +122,7 @@ pub async fn users_route(user: CurrentUser, users: web::Data<Addr<UsersActor>>,
     let users = users.send(users_actor::GetAllUsersRequest).await.unwrap().0;
 
     HttpResponse::Ok().body(UsersListTemplate {
-        _parent: BaseSettingsPage::get(
+        _p: BaseSettingsPage::get(
             "Users list",
             &user,
             danger,
@@ -134,7 +134,7 @@ pub async fn users_route(user: CurrentUser, users: web::Data<Addr<UsersActor>>,
 
 pub async fn create_user(user: CurrentUser, clients: web::Data<ClientManager>) -> impl Responder {
     HttpResponse::Ok().body(EditUserTemplate {
-        _parent: BaseSettingsPage::get("Create a new user", user.deref(), None, None),
+        _p: BaseSettingsPage::get("Create a new user", user.deref(), None, None),
         u: Default::default(),
         clients: clients.cloned(),
     }.render().unwrap())
@@ -155,7 +155,7 @@ pub async fn edit_user(user: CurrentUser,
 
 
     HttpResponse::Ok().body(EditUserTemplate {
-        _parent: BaseSettingsPage::get(
+        _p: BaseSettingsPage::get(
             "Edit user account",
             user.deref(),
             match edited_account.is_none() {

src/controllers/login_controller.rs

@@ -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,

src/controllers/settings_controller.rs

@@ -10,8 +10,6 @@ use crate::data::current_user::CurrentUser;
 use crate::data::remote_ip::RemoteIP;
 use crate::data::user::User;
 
-#[derive(Template)]
-#[template(path = "settings/base_settings_page.html")]
 pub(crate) struct BaseSettingsPage {
     pub danger_message: Option<String>,
     pub success_message: Option<String>,
@@ -23,7 +21,7 @@ pub(crate) struct BaseSettingsPage {
 
 impl BaseSettingsPage {
     pub fn get(page_title: &'static str, user: &User,
-                 danger_message: Option<String>, success_message: Option<String>) -> BaseSettingsPage {
+               danger_message: Option<String>, success_message: Option<String>) -> BaseSettingsPage {
         Self {
             danger_message,
             success_message,
@@ -38,18 +36,14 @@ impl BaseSettingsPage {
 #[derive(Template)]
 #[template(path = "settings/account_details.html")]
 struct AccountDetailsPage {
-    _parent: BaseSettingsPage,
-    user_id: String,
-    first_name: String,
-    last_name: String,
-    username: String,
-    email: String,
+    _p: BaseSettingsPage,
+    u: User,
 }
 
 #[derive(Template)]
 #[template(path = "settings/change_password.html")]
 struct ChangePasswordPage {
-    _parent: BaseSettingsPage,
+    _p: BaseSettingsPage,
     min_pwd_len: usize,
 }
 
@@ -58,12 +52,8 @@ pub async fn account_settings_details_route(user: CurrentUser) -> impl Responder
     let user = user.into();
     HttpResponse::Ok()
         .body(AccountDetailsPage {
-            _parent: BaseSettingsPage::get("Account details", &user, None, None),
-            user_id: user.uid,
-            first_name: user.first_name,
-            last_name: user.last_name,
-            username: user.username,
-            email: user.email,
+            _p: BaseSettingsPage::get("Account details", &user, None, None),
+            u: user,
         }.render().unwrap())
 }
 
@@ -121,7 +111,7 @@ pub async fn change_password_route(user: CurrentUser,
 
     HttpResponse::Ok()
         .body(ChangePasswordPage {
-            _parent: BaseSettingsPage::get("Change password", &user, danger, success),
+            _p: BaseSettingsPage::get("Change password", &user, danger, success),
             min_pwd_len: MIN_PASS_LEN,
         }.render().unwrap())
 }