Update dependency eslint to ^9.27.0

2025-05-19 00:07:42 +00:00
20 changed files with 275 additions and 785 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -38,7 +38,6 @@ steps:
    - cd moneymgr_backend
    - rustup component add clippy
    - cargo clippy -- -D warnings
-    - cargo clippy --example api_curl -- -D warnings

 - name: backend_test
  image: rust
@@ -52,7 +51,7 @@ steps:
    - cargo test


- name: backend_build
+- name: backend_compile
  image: rust
  volumes:
  - name: rust_registry
@@ -68,16 +67,15 @@ steps:
  - cd moneymgr_backend
  - mv /tmp/web_build/dist static
  - cargo build --release
-  - cargo build --release --example api_curl
-  - ls -lah target/release/moneymgr_backend target/release/examples/api_curl
-  - cp target/release/moneymgr_backend target/release/examples/api_curl /tmp/release
+  - ls -lah target/release/moneymgr_backend
+  - cp target/release/moneymgr_backend /tmp/release


 # Release
 - name: gitea_release
  image: plugins/gitea-release
  depends_on:
-  - backend_build
+  - backend_compile
  when:
    event:
      - tag
--- a/README.md
+++ b/README.md
@@ -3,46 +3,10 @@

 Open Source web-based personal expenses tool.

-**Note :** This project does not handle authentication itself. Instead, it relies on OpenID to achieve users authentication.
-
-## Setup prod env
-1. Install prerequisites:
-   1. docker
-   2. docker compose
-   3. git
-
-2. Clone this git repository:
-```bash
-git clone https://gitea.communiquons.org/pierre/MoneyMgr
-cd MoneyMgr/docker_prod
-```
-
-3. Copy and adapt env values
-```bash
-cp .env.sample .env
-nano .env
-```
-
-4. Create required directories:
-
-```bash
-mkdir -p storage/{db,redis-data,redis-conf,minio}
-```
-
-5. Start containers
-
-```bash
-docker compose up
-```
-
-6. Checkout http://localhost:8000/
-
-> The default credentials are `admin` / `admin`
-
 ## Setup dev env
 1. Install prerequisites:
   1. docker
-   2. docker compose
+   2. docker-compose
   3. rust
   4. node

--- a/docker_prod/.env.sample
+++ b/docker_prod/.env.sample
@@ -1,10 +0,0 @@
-MINIO_ROOT_USER=rootuser
-MINIO_ROOT_PASSWORD=rootpassword
-DB_USER=db_user
-DB_PASSWORD=db_password
-REDIS_PASS=redis_password
-WEBSITE_ORIGIN=http://localhost:8000
-APP_SECRET=secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-AUTH_SECRET_KEY=secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-OIDC_CLIENT_ID=bar
-OIDC_CLIENT_SECRET=foo
--- a/docker_prod/.gitignore
+++ b/docker_prod/.gitignore
@@ -1,3 +0,0 @@
-.env
-storage
-auth/users.json
--- a/docker_prod/auth/clients.yaml
+++ b/docker_prod/auth/clients.yaml
@@ -1,5 +0,0 @@
- id: ${OIDC_CLIENT_ID}
-  name: MoneyMgr
-  description: Money management tool
-  secret: ${OIDC_CLIENT_SECRET}
-  redirect_uri: ${APP_ORIGIN}/oidc_cb
--- a/docker_prod/docker-compose.yml
+++ b/docker_prod/docker-compose.yml
@@ -1,79 +0,0 @@
-services:
-  minio:
-    image: minio/minio
-    user: "1000"
-    environment:
-      - MINIO_ROOT_USER=$MINIO_ROOT_USER
-      - MINIO_ROOT_PASSWORD=$MINIO_ROOT_PASSWORD
-    volumes:
-      - ./storage/minio:/data
-    command: [ "minio", "server", "/data", "--console-address", ":9090" ]
-    ports:
-      - 9000:9000
-      - 9090:9090
-    expose:
-      - 9000
-
-  db:
-    image: postgres
-    user: "1000"
-    ports:
-      - "5432:5432"
-    expose:
-      - 5432
-    environment:
-      - POSTGRES_USER=$DB_USER
-      - POSTGRES_PASSWORD=$DB_PASSWORD
-      - POSTGRES_DB=moneymgr
-    volumes:
-      - ./storage/db:/var/lib/postgresql/data
-
-  oidc:
-    image: pierre42100/basic_oidc
-    user: "1000"
-    environment:
-      - LISTEN_ADDRESS=0.0.0.0:9001
-      - STORAGE_PATH=/storage
-      - TOKEN_KEY=$AUTH_SECRET_KEY
-      - WEBSITE_ORIGIN=http://localhost:9001
-      - OIDC_CLIENT_ID=$OIDC_CLIENT_ID
-      - OIDC_CLIENT_SECRET=$OIDC_CLIENT_SECRET
-      - APP_ORIGIN=$WEBSITE_ORIGIN
-    expose:
-      - 9001
-    ports:
-      - 9001:9001
-    volumes:
-      - ./auth:/storage
-
-  redis:
-    image: redis:alpine
-    user: "1000"
-    command: redis-server --requirepass ${REDIS_PASS:-secretredis}
-    expose:
-      - 6379
-    volumes:
-      - ./storage/redis-data:/data
-      - ./storage/redis-conf:/usr/local/etc/redis/redis.conf
-
-  moneymgr:
-    image: pierre42100/moneymgr_backend
-    user: "1000"
-    ports:
-      - 8000:8000
-    environment:
-      - WEBSITE_ORIGIN=${WEBSITE_ORIGIN}
-      - SECRET=${APP_SECRET}
-      - DB_HOST=db
-      - DB_USERNAME=$DB_USER
-      - DB_PASSWORD=$DB_PASSWORD
-      - DB_NAME=moneymgr
-      - OIDC_CONFIGURATION_URL=http://oidc:9001/.well-known/openid-configuration
-      - OIDC_PROVIDER_NAME=OIDC
-      - OIDC_CLIENT_ID=$OIDC_CLIENT_ID
-      - OIDC_CLIENT_SECRET=$OIDC_CLIENT_SECRET
-      - S3_ENDPOINT=http://minio:9000
-      - S3_ACCESS_KEY=$MINIO_ROOT_USER
-      - S3_SECRET_KEY=$MINIO_ROOT_PASSWORD
-      - REDIS_HOSTNAME=redis
-      - REDIS_PASSWORD=${REDIS_PASS:-secretredis}
--- a/moneymgr_backend/Cargo.lock
+++ b/moneymgr_backend/Cargo.lock
@@ -724,9 +724,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.41"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -734,9 +734,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.41"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
 "anstream",
 "anstyle",
@@ -746,9 +746,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.41"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -948,9 +948,9 @@ dependencies = [

 [[package]]
 name = "crypto-common"
-version = "0.2.0-rc.3"
+version = "0.2.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be"
+checksum = "170d71b5b14dec99db7739f6fc7d6ec2db80b78c3acb77db48392ccc3d8a9ea0"
 dependencies = [
 "hybrid-array",
 ]
@@ -1100,9 +1100,9 @@ dependencies = [

 [[package]]
 name = "diesel"
-version = "2.2.12"
+version = "2.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c"
+checksum = "ff3e1edb1f37b4953dd5176916347289ed43d7119cc2e6c7c3f7849ff44ea506"
 dependencies = [
 "bitflags",
 "byteorder",
@@ -1159,13 +1159,13 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.11.0-rc.0"
+version = "0.11.0-pre.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b"
+checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516"
 dependencies = [
 "block-buffer 0.11.0-rc.4",
 "const-oid 0.10.1",
- "crypto-common 0.2.0-rc.3",
+ "crypto-common 0.2.0-rc.2",
 ]

 [[package]]
@@ -2304,7 +2304,7 @@ dependencies = [
 "rust_xlsxwriter",
 "serde",
 "serde_json",
- "sha2 0.11.0-rc.0",
+ "sha2 0.11.0-pre.5",
 "tempfile",
 "thiserror 2.0.12",
 "tokio",
@@ -3296,13 +3296,13 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.11.0-rc.0"
+version = "0.11.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59"
+checksum = "19b4241d1a56954dce82cecda5c8e9c794eef6f53abe5e5216bac0a0ea71ffa7"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.11.0-rc.0",
+ "digest 0.11.0-pre.10",
 ]

 [[package]]
@@ -3571,9 +3571,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
 "backtrace",
 "bytes",
--- a/moneymgr_backend/Cargo.toml
+++ b/moneymgr_backend/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2024"
 [dependencies]
 env_logger = "0.11.8"
 log = "0.4.27"
-diesel = { version = "2.2.12", features = ["postgres", "r2d2"] }
+diesel = { version = "2.2.10", features = ["postgres", "r2d2"] }
 diesel_migrations = "2.2.0"
-clap = { version = "4.5.41", features = ["env", "derive"] }
+clap = { version = "4.5.38", features = ["env", "derive"] }
 actix-web = "4.11.0"
 actix-cors = "0.7.1"
 actix-multipart = "0.7.2"
@@ -20,17 +20,17 @@ anyhow = "1.0.98"
 serde = { version = "1.0.219", features = ["derive"] }
 rust-s3 = "0.36.0-beta.2"
 thiserror = "2.0.12"
-tokio = "1.45.1"
+tokio = "1.45.0"
 futures-util = "0.3.31"
 serde_json = "1.0.140"
 light-openid = "1.0.4"
 rand = "0.9.1"
 ipnet = { version = "2.11.0", features = ["serde"] }
 lazy-regex = "3.4.1"
-jwt-simple = { version = "0.12.12", default-features = false, features = ["pure-rust"] }
+jwt-simple = { version = "0.12.11", default-features = false, features = ["pure-rust"] }
 mime_guess = "2.0.5"
 rust-embed = { version = "8.7.2" }
-sha2 = "0.11.0-rc.0"
+sha2 = "0.11.0-pre.5"
 base16ct = "0.2.0"
 httpdate = "1.0.3"
 chrono = "0.4.41"
--- a/moneymgr_backend/examples/api_curl.rs
+++ b/moneymgr_backend/examples/api_curl.rs
@@ -14,7 +14,7 @@ use std::process::Command;
 struct Args {
    /// URL to Money manager API
    #[arg(short('U'), long, env, default_value = "http://localhost:8000/api")]
-    moneymgr_url: String,
+    matrix_gw_url: String,

    /// Token ID
    #[arg(short('i'), long, env)]
@@ -39,8 +39,7 @@ struct Args {
 fn main() {
    let args: Args = Args::parse();

-    let full_url = format!("{}{}", args.moneymgr_url, args.uri);
-
+    let full_url = format!("{}{}", args.matrix_gw_url, args.uri);
    log::debug!("Full URL: {full_url}");

    let key = HS256Key::from_bytes(args.token_secret.as_bytes());
--- a/moneymgr_backend/src/connections/s3_connection.rs
+++ b/moneymgr_backend/src/connections/s3_connection.rs
@@ -30,7 +30,7 @@ pub async fn create_bucket_if_required() -> anyhow::Result<()> {
            log::warn!("The bucket does not seem to exists, trying to create it!")
        }
        Err(e) => {
-            log::error!("Got unexpected error when querying bucket info: {e}");
+            log::error!("Got unexpected error when querying bucket info: {}", e);
            return Err(BucketServiceError::FailedFetchBucketInfo.into());
        }
    }
--- a/moneymgr_backend/src/extractors/account_extractor.rs
+++ b/moneymgr_backend/src/extractors/account_extractor.rs
@@ -50,7 +50,7 @@ impl FromRequest for AccountInPath {
            Self::load_account_from_path(&auth, account_id)
                .await
                .map_err(|e| {
-                    log::error!("Failed to extract account ID from URL! {e}");
+                    log::error!("Failed to extract account ID from URL! {}", e);
                    actix_web::error::ErrorNotFound("Could not fetch account information!")
                })
        })
--- a/moneymgr_backend/src/extractors/auth_extractor.rs
+++ b/moneymgr_backend/src/extractors/auth_extractor.rs
@@ -56,7 +56,7 @@ impl FromRequest for AuthExtractor {
        };

        Box::pin(async move {
-            // Check for authentication using API token
+            // Check for authentication using OpenID
            if let Some(token) = req.headers().get(constants::API_TOKEN_HEADER) {
                let Ok(jwt_token) = token.to_str() else {
                    return Err(actix_web::error::ErrorBadRequest(
@@ -165,13 +165,13 @@ impl FromRequest for AuthExtractor {
                // Update last use (if needed)
                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}");
+                        log::error!("Failed to refresh last usage of token! {}", e);
                    }
                }

                // Handle tokens expiration
                if token.is_expired() {
-                    log::error!("Attempted to use expired token! {token:?}");
+                    log::error!("Attempted to use expired token! {:?}", token);
                    return Err(actix_web::error::ErrorBadRequest("Token has expired!"));
                }

--- a/moneymgr_backend/src/extractors/file_id_extractor.rs
+++ b/moneymgr_backend/src/extractors/file_id_extractor.rs
@@ -47,7 +47,7 @@ impl FromRequest for FileIdExtractor {
            Self::load_file_from_path(&auth, file_id)
                .await
                .map_err(|e| {
-                    log::error!("Failed to extract file ID from URL! {e}");
+                    log::error!("Failed to extract file ID from URL! {}", e);
                    actix_web::error::ErrorNotFound("Could not fetch file information!")
                })
        })
--- a/moneymgr_backend/src/extractors/inbox_entry_extractor.rs
+++ b/moneymgr_backend/src/extractors/inbox_entry_extractor.rs
@@ -50,7 +50,7 @@ impl FromRequest for InboxEntryInPath {
            Self::load_inbox_entry_from_path(&auth, entry_id)
                .await
                .map_err(|e| {
-                    log::error!("Failed to extract inbox entry ID from URL! {e}");
+                    log::error!("Failed to extract inbox entry ID from URL! {}", e);
                    actix_web::error::ErrorNotFound("Could not fetch inbox entry information!")
                })
        })
--- a/moneymgr_backend/src/extractors/movement_extractor.rs
+++ b/moneymgr_backend/src/extractors/movement_extractor.rs
@@ -57,7 +57,7 @@ impl FromRequest for MovementInPath {
            Self::load_movement_from_path(&auth, account_id)
                .await
                .map_err(|e| {
-                    log::error!("Failed to extract movement ID from URL! {e}");
+                    log::error!("Failed to extract movement ID from URL! {}", e);
                    actix_web::error::ErrorNotFound("Could not fetch movement information!")
                })
        })
--- a/moneymgr_web/package-lock.json
+++ b/moneymgr_web/package-lock.json
--- a/moneymgr_web/package.json
+++ b/moneymgr_web/package.json
@@ -11,37 +11,37 @@
  },
  "dependencies": {
    "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.1",
-    "@fontsource/roboto": "^5.2.6",
+    "@emotion/styled": "^11.14.0",
+    "@fontsource/roboto": "^5.2.5",
    "@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.8.0",
-    "@mui/x-data-grid": "^8.8.0",
-    "@mui/x-date-pickers": "^8.8.0",
+    "@mui/icons-material": "^7.1.0",
+    "@mui/material": "^7.1.0",
+    "@mui/x-charts": "^8.3.1",
+    "@mui/x-data-grid": "^8.3.1",
+    "@mui/x-date-pickers": "^8.3.1",
    "date-and-time": "^3.6.0",
    "dayjs": "^1.11.13",
    "filesize": "^10.1.6",
    "qrcode.react": "^4.2.0",
    "react": "^19.1.0",
    "react-dom": "^19.1.0",
-    "react-router": "^7.6.3",
-    "react-router-dom": "^7.6.3",
-    "ts-pattern": "^5.7.1"
+    "react-router": "^7.6.0",
+    "react-router-dom": "^7.6.0",
+    "ts-pattern": "^5.7.0"
  },
  "devDependencies": {
-    "@eslint/js": "^9.31.0",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
-    "@vitejs/plugin-react": "^4.6.0",
-    "eslint": "^9.31.0",
+    "@eslint/js": "^9.26.0",
+    "@types/react": "^19.1.4",
+    "@types/react-dom": "^19.1.5",
+    "@vitejs/plugin-react": "^4.4.1",
+    "eslint": "^9.27.0",
    "eslint-plugin-react-dom": "^1.49.0",
    "eslint-plugin-react-hooks": "^5.2.0",
    "eslint-plugin-react-refresh": "^00.4.20",
-    "eslint-plugin-react-x": "^1.52.3",
-    "globals": "^16.2.0",
+    "eslint-plugin-react-x": "^1.49.0",
+    "globals": "^16.1.0",
    "typescript": "~5.8.3",
    "typescript-eslint": "^8.32.1",
    "vite": "^6.3.5"
--- a/moneymgr_web/src/api/ApiClient.ts
+++ b/moneymgr_web/src/api/ApiClient.ts
@@ -31,21 +31,12 @@ export class APIClient {
    return URL;
  }

-  /**
-   * Get the full URL at which the backend can be contacted
-   */
-  static ActualBackendURL(): string {
-    const backendURL = this.backendURL();
-    if (backendURL.startsWith("/")) return `${location.origin}${backendURL}`;
-    else return backendURL;
-  }
-
  /**
   * Check out whether the backend is accessed through
   * HTTPS or not
   */
  static IsBackendSecure(): boolean {
-    return this.ActualBackendURL().startsWith("https");
+    return this.backendURL().startsWith("https");
  }

  /**
--- a/moneymgr_web/src/routes/AccountRoute.tsx
+++ b/moneymgr_web/src/routes/AccountRoute.tsx
@@ -2,11 +2,9 @@ import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 import DriveFileMoveOutlineIcon from "@mui/icons-material/DriveFileMoveOutline";
 import LinkOffIcon from "@mui/icons-material/LinkOff";
 import MoreVertIcon from "@mui/icons-material/MoreVert";
-import ClearIcon from "@mui/icons-material/Clear";
 import RefreshIcon from "@mui/icons-material/Refresh";
 import {
  IconButton,
-  InputAdornment,
  ListItemIcon,
  ListItemText,
  TextField,
@@ -394,19 +392,6 @@ function MovementsTable(p: {
            setFilter(e.target.value);
          }}
          style={{ padding: "0px", flex: 1 }}
-          slotProps={{
-            input: {
-              endAdornment: filter.length > 0 && (
-                <InputAdornment position="end">
-                  <Tooltip title="Clear current filter">
-                    <IconButton size="small" onClick={() => { setFilter(""); }}>
-                      <ClearIcon />
-                    </IconButton>
-                  </Tooltip>
-                </InputAdornment>
-              ),
-            },
-          }}
        />
        <span style={{ flex: 1 }}></span>
        <Tooltip title="Refresh table">
--- a/moneymgr_web/src/routes/TokensRoute.tsx
+++ b/moneymgr_web/src/routes/TokensRoute.tsx
@@ -268,7 +268,7 @@ function CreatedToken(p: { token: TokenWithSecret }): React.ReactElement {
          <div style={{ padding: "15px", backgroundColor: "white" }}>
            <QRCodeCanvas
              value={`moneymgr://api=${encodeURIComponent(
-                APIClient.ActualBackendURL()
+                APIClient.backendURL()
              )}&id=${p.token.id}&secret=${p.token.token}`}
            />
          </div>