Update dependency eslint-plugin-react-dom to ^1.53.1

moneymgr_backend/src/app_config.rs

@@ -22,6 +22,10 @@ pub struct AppConfig {
     #[clap(short = 'S', long, env, default_value = "")]
     secret: String,
 
+    /// Specify whether the cookie should be transmitted only over secure connections
+    #[clap(long, env)]
+    pub cookie_secure: bool,
+
     /// Unsecure : for development, bypass authentication, using the account with the given
     /// email address by default
     #[clap(long, env)]
@@ -157,6 +161,23 @@ impl AppConfig {
         self.unsecure_auto_login_email().is_some()
     }
 
+    /// Get auth cookie domain
+    pub fn cookie_domain(&self) -> Option<String> {
+        if cfg!(debug_assertions) {
+            let domain = self.website_origin.split_once("://")?.1;
+            Some(
+                domain
+                    .split_once(':')
+                    .map(|s| s.0)
+                    .unwrap_or(domain)
+                    .to_string(),
+            )
+        } else {
+            // In release mode, the web app is hosted on the same origin as the API
+            None
+        }
+    }
+
     /// Get app secret
     pub fn secret(&self) -> &str {
         let mut secret = self.secret.as_str();

moneymgr_backend/src/controllers/files_controller.rs

@@ -63,23 +63,24 @@ pub async fn download(
 pub async fn serve_file(req: HttpRequest, file: &File, download_file: bool) -> HttpResult {
     if !download_file {
         // Check if the browser already knows the etag
-        if let Some(c) = req.headers().get(header::IF_NONE_MATCH)
-            && c.to_str().unwrap_or("") == file.sha512.as_str()
-        {
+        if let Some(c) = req.headers().get(header::IF_NONE_MATCH) {
+            if c.to_str().unwrap_or("") == file.sha512.as_str() {
                 return Ok(HttpResponse::NotModified().finish());
             }
+        }
 
         // Check if the browser already knows the file by date
         if let Some(c) = req.headers().get(header::IF_MODIFIED_SINCE) {
             let date_str = c.to_str().unwrap_or("");
-            if let Ok(date) = httpdate::parse_http_date(date_str)
-                && date.add(Duration::from_secs(1))
+            if let Ok(date) = httpdate::parse_http_date(date_str) {
+                if date.add(Duration::from_secs(1))
                     >= time_utils::unix_to_system_time(file.time_create as u64)
                 {
                     return Ok(HttpResponse::NotModified().finish());
                 }
             }
         }
+    }
     let mut res = HttpResponse::Ok();
     res.content_type(file.mime_type.as_str())
         .insert_header(("etag", file.sha512.as_str()))

moneymgr_backend/src/controllers/movement_controller.rs

@@ -64,11 +64,11 @@ pub async fn get_list_of_account(
         });
     }
 
-    if let Some(limit) = query.limit
-        && list.len() > limit
-    {
+    if let Some(limit) = query.limit {
+        if list.len() > limit {
             list = list[..limit].to_vec();
         }
+    }
 
     Ok(HttpResponse::Ok().json(list))
 }

moneymgr_backend/src/extractors/auth_extractor.rs

@@ -120,9 +120,8 @@ impl FromRequest for AuthExtractor {
                 }
 
                 // Check IP restriction
-                if let Some(net) = token.ip_net()
-                    && !net.contains(&remote_ip.0)
-                {
+                if let Some(net) = token.ip_net() {
+                    if !net.contains(&remote_ip.0) {
                         log::error!(
                             "Trying to use token {:?} from unauthorized IP address: {remote_ip:?}",
                             token.id()
@@ -131,6 +130,7 @@ impl FromRequest for AuthExtractor {
                             "This token cannot be used from this IP address!",
                         ));
                     }
+                }
 
                 // Check for write access
                 if token.read_only && !req.method().is_safe() {
@@ -163,11 +163,11 @@ impl FromRequest for AuthExtractor {
                 };
 
                 // Update last use (if needed)
-                if token.shall_update_time_used()
-                    && let Err(e) = tokens_service::update_time_used(&token).await
-                {
+                if token.shall_update_time_used() {
+                    if let Err(e) = tokens_service::update_time_used(&token).await {
                         log::error!("Failed to refresh last usage of token! {e}");
                     }
+                }
 
                 // Handle tokens expiration
                 if token.is_expired() {

moneymgr_backend/src/services/inbox_service.rs

@@ -23,11 +23,11 @@ impl UpdateInboxEntryQuery {
         let constraints = ServerConstraints::default();
 
         // Check inbox entry label
-        if let Some(label) = &self.label
-            && !constraints.inbox_entry_label.check_str(label)
-        {
+        if let Some(label) = &self.label {
+            if !constraints.inbox_entry_label.check_str(label) {
                 return Ok(Some("Invalid inbox entry label length!"));
             }
+        }
 
         // Check the referenced movement
         if let Some(movement_id) = self.movement_id {

moneymgr_backend/src/services/movements_service.rs

@@ -55,12 +55,13 @@ impl UpdateMovementQuery {
         if let Ok(movement) =
             get_by_account_label_amount_time(self.account_id, &self.label, self.amount, self.time)
                 .await
-            && Some(movement.id()) != ref_movement
         {
+            if Some(movement.id()) != ref_movement {
                 return Ok(Some(
                     "A movement taken at the same time with the same label and the same amount already exists!",
                 ));
             }
+        }
 
         Ok(None)
     }

moneymgr_web/package-lock.json

@@ -4122,14 +4122,14 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/project-service": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.3.tgz",
-      "integrity": "sha512-Fz8yFXsp2wDFeUElO88S9n4w1I4CWDTXDqDr9gYvZgUpwXQqmZBr9+NTTql5R3J7+hrJZPdpiWaB9VNhAKYLuQ==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.2.tgz",
+      "integrity": "sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.46.3",
-        "@typescript-eslint/types": "^8.46.3",
+        "@typescript-eslint/tsconfig-utils": "^8.46.2",
+        "@typescript-eslint/types": "^8.46.2",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4144,14 +4144,14 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz",
-      "integrity": "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.2.tgz",
+      "integrity": "sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3"
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4162,9 +4162,9 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.3.tgz",
-      "integrity": "sha512-GLupljMniHNIROP0zE7nCcybptolcH8QZfXOpCfhQDAdwJ/ZTlcaBOYebSOZotpti/3HrHSw7D3PZm75gYFsOA==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.2.tgz",
+      "integrity": "sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4179,15 +4179,15 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.3.tgz",
-      "integrity": "sha512-ZPCADbr+qfz3aiTTYNNkCbUt+cjNwI/5McyANNrFBpVxPt7GqpEYz5ZfdwuFyGUnJ9FdDXbGODUu6iRCI6XRXw==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.2.tgz",
+      "integrity": "sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/typescript-estree": "8.46.3",
-        "@typescript-eslint/utils": "8.46.3",
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/typescript-estree": "8.46.2",
+        "@typescript-eslint/utils": "8.46.2",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -4204,9 +4204,9 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/types": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.3.tgz",
-      "integrity": "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+      "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4218,16 +4218,16 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz",
-      "integrity": "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.2.tgz",
+      "integrity": "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.46.3",
-        "@typescript-eslint/tsconfig-utils": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3",
+        "@typescript-eslint/project-service": "8.46.2",
+        "@typescript-eslint/tsconfig-utils": "8.46.2",
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -4247,16 +4247,16 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.3.tgz",
-      "integrity": "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.2.tgz",
+      "integrity": "sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/typescript-estree": "8.46.3"
+        "@typescript-eslint/scope-manager": "8.46.2",
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/typescript-estree": "8.46.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4271,13 +4271,13 @@
       }
     },
     "node_modules/eslint-plugin-react-dom/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz",
-      "integrity": "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz",
+      "integrity": "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
+        "@typescript-eslint/types": "8.46.2",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {