Merge pull request 'Update dependency dayjs to ^1.11.20' (#200) from renovate/dayjs-1.x into main

moneymgr_backend/Cargo.toml

@@ -4,36 +4,35 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-env_logger = "0.11.8"
+env_logger = "0.11.9"
 log = "0.4.29"
-diesel = { version = "2.2.12", features = ["postgres", "r2d2"] }
+diesel = { version = "2.3.6", features = ["postgres", "r2d2"] }
 diesel_migrations = "2.2.0"
-clap = { version = "4.5.59", features = ["env", "derive"] }
-actix-web = "4.11.0"
+clap = { version = "4.5.60", features = ["env", "derive"] }
+actix-web = "4.13.0"
 actix-cors = "0.7.1"
 actix-multipart = "0.7.2"
 actix-remote-ip = "0.1.0"
-actix-session = { version = "0.10.1", features = ["redis-session"] }
+actix-session = { version = "0.11.0", features = ["redis-session"] }
 actix-files = "0.6.10"
-lazy_static = "1.5.0"
-anyhow = "1.0.101"
+anyhow = "1.0.102"
 serde = { version = "1.0.228", features = ["derive"] }
-rust-s3 = "0.36.0-beta.2"
+rust-s3 = "0.37.1"
 thiserror = "2.0.18"
-tokio = "1.45.1"
-futures-util = "0.3.31"
+tokio = "1.49.0"
+futures-util = "0.3.32"
 serde_json = "1.0.149"
-light-openid = "1.0.4"
-rand = "0.9.2"
+light-openid = "1.1.0"
+rand = "0.10.0"
 ipnet = { version = "2.11.0", features = ["serde"] }
-lazy-regex = "3.4.2"
+lazy-regex = "3.6.0"
 jwt-simple = { version = "0.12.14", default-features = false, features = ["pure-rust"] }
 mime_guess = "2.0.5"
-rust-embed = { version = "8.7.2" }
-sha2 = "0.11.0-rc.4"
-base16ct = "0.2.0"
+rust-embed = { version = "8.11.0" }
+sha2 = "0.11.0-rc.5"
+base16ct = { version = "1.0.0", features = ["alloc"] }
 httpdate = "1.0.3"
-chrono = "0.4.43"
-tempfile = "3.20.0"
-zip = "3.0.0"
-rust_xlsxwriter = "0.87.0"
+chrono = "0.4.44"
+tempfile = "3.25.0"
+zip = "8.1.0"
+rust_xlsxwriter = "0.93.0"

moneymgr_backend/src/app_config.rs

@@ -1,6 +1,7 @@
 use clap::Parser;
 use s3::creds::Credentials;
 use s3::{Bucket, Region};
+use std::sync::OnceLock;
 
 /// Money Manager backend API
 #[derive(Parser, Debug, Clone)]
@@ -132,16 +133,13 @@ pub struct AppConfig {
     pub apk_download_url: String,
 }
 
-lazy_static::lazy_static! {
-    static ref ARGS: AppConfig = {
-        AppConfig::parse()
-    };
-}
+/// Cached application config
+static ARGS: OnceLock<AppConfig> = OnceLock::new();
 
 impl AppConfig {
     /// Get parsed command line arguments
     pub fn get() -> &'static AppConfig {
-        &ARGS
+        ARGS.get_or_init(AppConfig::parse)
     }
 
     /// Get auto login email (if not empty)

moneymgr_backend/src/connections/db_connection.rs

@@ -2,8 +2,7 @@ use crate::app_config::AppConfig;
 use diesel::PgConnection;
 use diesel::r2d2::{ConnectionManager, Pool, PooledConnection};
 use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
-use lazy_static::lazy_static;
-use std::sync::Arc;
+use std::sync::{Arc, OnceLock};
 
 const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
 
@@ -20,12 +19,13 @@ fn get_db_connection_pool() -> anyhow::Result<DBConn> {
     ))
 }
 
-lazy_static! {
-    static ref DB_POOL: DBConn = get_db_connection_pool().expect("Failed to connect to database");
-}
+static DB_POOL: OnceLock<DBConn> = OnceLock::new();
 
 pub fn db() -> anyhow::Result<PooledConnection<ConnectionManager<PgConnection>>> {
-    Ok(DB_POOL.clone().get()?)
+    Ok(DB_POOL
+        .get_or_init(|| get_db_connection_pool().expect("Failed to connect to database"))
+        .clone()
+        .get()?)
 }
 
 pub fn initialize_conn() -> anyhow::Result<()> {

moneymgr_backend/src/controllers/auth_controller.rs

@@ -1,5 +1,5 @@
 use crate::app_config::AppConfig;
-use crate::controllers::{HttpFailure, HttpResult};
+use crate::controllers::HttpResult;
 use crate::extractors::auth_extractor::{AuthExtractor, AuthenticatedMethod};
 use crate::extractors::money_session::MoneySession;
 use crate::services::{tokens_service, users_service};
@@ -61,9 +61,7 @@ pub async fn finish_oidc(
 
     let prov = AppConfig::get().openid_provider();
 
-    let conf = OpenIDConfig::load_from_url(prov.configuration_url)
-        .await
-        .map_err(HttpFailure::OpenID)?;
+    let conf = OpenIDConfig::load_from_url(prov.configuration_url).await?;
 
     let (token, _) = conf
         .request_token(
@@ -72,12 +70,8 @@ pub async fn finish_oidc(
             &req.code,
             &AppConfig::get().oidc_redirect_url(),
         )
-        .await
-        .map_err(HttpFailure::OpenID)?;
-    let (user_info, _) = conf
-        .request_user_info(&token)
-        .await
-        .map_err(HttpFailure::OpenID)?;
+        .await?;
+    let (user_info, _) = conf.request_user_info(&token).await?;
 
     if user_info.email_verified != Some(true) {
         log::error!("Email is not verified!");

moneymgr_backend/src/controllers/mod.rs

@@ -1,7 +1,7 @@
 use crate::controllers::backup_controller::BackupControllerError;
 use actix_web::http::StatusCode;
 use actix_web::{HttpResponse, ResponseError};
-use std::error::Error;
+use light_openid::errors::OpenIdError;
 use zip::result::ZipError;
 
 pub mod accounts_controller;
@@ -28,7 +28,7 @@ pub enum HttpFailure {
     #[error("an unhandled session error occurred")]
     SessionError(#[from] actix_session::SessionGetError),
     #[error("an unspecified open id error occurred: {0}")]
-    OpenID(Box<dyn Error>),
+    OpenID(#[from] OpenIdError),
     #[error("an unspecified internal error occurred: {0}")]
     InternalError(#[from] anyhow::Error),
     #[error("a serde_json error occurred: {0}")]

moneymgr_backend/src/utils/crypt_utils.rs

@@ -7,3 +7,20 @@ pub fn sha512(bytes: &[u8]) -> String {
     let h = hasher.finalize();
     base16ct::lower::encode_string(h.as_slice())
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::utils::crypt_utils::sha512;
+
+    #[test]
+    fn test_sha512() {
+        assert_eq!(
+            sha512(&[]),
+            "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
+        );
+        assert_eq!(
+            sha512("hello".as_bytes()),
+            "9b71d224bd62f3785d96d46ad3ea3d73319bfbc2890caadae2dff72519673ca72323c3d99ba5c11d7c7acc6e14b8c5da0c4663475c2e5c3adef46f73bcdec043"
+        );
+    }
+}

moneymgr_mobile/pubspec.yaml

@@ -68,10 +68,10 @@ dependencies:
   logging: ^1.3.0
 
   # API authentication
-  dart_jsonwebtoken: 3.3.1
+  dart_jsonwebtoken: 3.3.2
 
   # API requests
-  dio: 5.9.1
+  dio: 5.9.2
   http_parser: ^4.1.2
 
   # Qr Code library

moneymgr_web/package-lock.json

@@ -10,17 +10,17 @@
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
-        "@fontsource/roboto": "^5.2.9",
+        "@fontsource/roboto": "^5.2.10",
         "@jsonjoy.com/base64": "^1.1.2",
         "@mdi/js": "^7.4.47",
         "@mdi/react": "^1.6.1",
         "@mui/icons-material": "^7.1.2",
         "@mui/material": "^7.1.2",
-        "@mui/x-charts": "^8.27.0",
+        "@mui/x-charts": "^8.27.5",
         "@mui/x-data-grid": "^8.18.0",
         "@mui/x-date-pickers": "^8.23.0",
         "date-and-time": "^3.6.0",
-        "dayjs": "^1.11.19",
+        "dayjs": "^1.11.20",
         "filesize": "^10.1.6",
         "qrcode.react": "^4.2.0",
         "react": "^19.2.4",
@@ -30,11 +30,11 @@
         "ts-pattern": "^5.8.0"
       },
       "devDependencies": {
-        "@eslint/js": "^9.39.2",
+        "@eslint/js": "^9.39.4",
         "@types/react": "^19.2.14",
         "@types/react-dom": "^19.2.3",
         "@vitejs/plugin-react": "^4.7.0",
-        "eslint": "^9.39.2",
+        "eslint": "^9.39.4",
         "eslint-plugin-react-dom": "^1.52.4",
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^00.4.20",
@@ -1799,15 +1799,15 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
-      "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz",
+      "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.7",
         "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
+        "minimatch": "^3.1.5"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1840,20 +1840,20 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz",
+      "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
         "debug": "^4.3.2",
         "espree": "^10.0.1",
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
+        "js-yaml": "^4.1.1",
+        "minimatch": "^3.1.5",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
@@ -1877,9 +1877,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
-      "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
+      "version": "9.39.4",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
+      "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1914,9 +1914,9 @@
       }
     },
     "node_modules/@fontsource/roboto": {
-      "version": "5.2.9",
-      "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.2.9.tgz",
-      "integrity": "sha512-ZTkyHiPk74B/aj8BZWbsxD5Yu+Lq+nR64eV4wirlrac2qXR7jYk2h6JlLYuOuoruTkGQWNw2fMuKNavw7/rg0w==",
+      "version": "5.2.10",
+      "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.2.10.tgz",
+      "integrity": "sha512-8HlA5FtSfz//oFSr2eL7GFXAiE7eIkcGOtx7tjsLKq+as702x9+GU7K95iDeWFapHC4M2hv9RrpXKRTGGBI8Zg==",
       "license": "OFL-1.1",
       "funding": {
         "url": "https://github.com/sponsors/ayuhito"
@@ -2288,9 +2288,9 @@
       }
     },
     "node_modules/@mui/x-charts": {
-      "version": "8.27.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.27.0.tgz",
-      "integrity": "sha512-MzP1jeiEkMOPWQfzRNo11iwbTwXcSDP7hKd3s/mSN0U4aINKpyHEQX6RAM8OkWzqK8ijTXYWRPVKaRYTLBx7+A==",
+      "version": "8.27.5",
+      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.27.5.tgz",
+      "integrity": "sha512-45XAKzEaTXx8D612zAghr6ofNK/OHukKTl9kuI+UmpaOE3se+khNwKHeOyXcus2uUoGoL6jxZcENklZmJDxzCg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.28.4",
@@ -3408,9 +3408,9 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3483,9 +3483,9 @@
       "license": "(MIT OR Apache-2.0)"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3800,9 +3800,9 @@
       "license": "MIT"
     },
     "node_modules/dayjs": {
-      "version": "1.11.19",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
+      "version": "1.11.20",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
+      "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
       "license": "MIT"
     },
     "node_modules/debug": {
@@ -3919,25 +3919,25 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
-      "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
+      "version": "9.39.4",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz",
+      "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.1",
+        "@eslint/config-array": "^0.21.2",
         "@eslint/config-helpers": "^0.4.2",
         "@eslint/core": "^0.17.0",
-        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.2",
+        "@eslint/eslintrc": "^3.3.5",
+        "@eslint/js": "9.39.4",
         "@eslint/plugin-kit": "^0.4.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
@@ -3956,7 +3956,7 @@
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
+        "minimatch": "^3.1.5",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -5028,9 +5028,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5192,9 +5192,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {

moneymgr_web/package.json

@@ -12,17 +12,17 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@fontsource/roboto": "^5.2.9",
+    "@fontsource/roboto": "^5.2.10",
     "@jsonjoy.com/base64": "^1.1.2",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
     "@mui/icons-material": "^7.1.2",
     "@mui/material": "^7.1.2",
-    "@mui/x-charts": "^8.27.0",
+    "@mui/x-charts": "^8.27.5",
     "@mui/x-data-grid": "^8.18.0",
     "@mui/x-date-pickers": "^8.23.0",
     "date-and-time": "^3.6.0",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.20",
     "filesize": "^10.1.6",
     "qrcode.react": "^4.2.0",
     "react": "^19.2.4",
@@ -32,11 +32,11 @@
     "ts-pattern": "^5.8.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^9.39.4",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^4.7.0",
-    "eslint": "^9.39.2",
+    "eslint": "^9.39.4",
     "eslint-plugin-react-dom": "^1.52.4",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^00.4.20",