fix: build issues

.drone.yml

@@ -13,23 +13,23 @@ steps:
   - cargo clippy -- -D warnings
   - cargo test
 
-- name: app_deploy
+# - name: app_deploy
-  image: node:24
+#   image: node:24
-  environment:
+#   environment:
-    AWS_ACCESS_KEY_ID:
+#     AWS_ACCESS_KEY_ID:
-      from_secret: AWS_ACCESS_KEY_ID
+#       from_secret: AWS_ACCESS_KEY_ID
-    AWS_SECRET_ACCESS_KEY:
+#     AWS_SECRET_ACCESS_KEY:
-      from_secret: AWS_SECRET_ACCESS_KEY
+#       from_secret: AWS_SECRET_ACCESS_KEY
-    AWS_DEFAULT_REGION: us-east-1
+#     AWS_DEFAULT_REGION: us-east-1
-  commands:
+#   commands:
-  # Build website
+#   # Build website
-  - cd geneit_app
+#   - cd geneit_app
-  - npm install
+#   - npm install
-  - GENERATE_SOURCEMAP=false npm run build 
+#   - GENERATE_SOURCEMAP=false npm run build 
-  # Install AWS
+#   # Install AWS
-  - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+#   - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-  - unzip awscliv2.zip
+#   - unzip awscliv2.zip
-  - ./aws/install
+#   - ./aws/install
-  - aws configure set default.s3.signature_version s3v4
+#   - aws configure set default.s3.signature_version s3v4
-  # Upload to bucket
+#   # Upload to bucket
-  - bash upload_bucket.sh 
+#   - bash upload_bucket.sh 

README.md

@@ -10,7 +10,8 @@
 2. Start services:
 ```bash
 cd geneit_backend
-docker-compose up
+mkdir -p storage/{rustfs,db,redis-data,redis-conf}
+docker compose up
 ```
 
 
@@ -22,7 +23,7 @@ cargo install diesel_cli --no-default-features --features postgres
 ```
 
 
-4. Initialize database:
+4. Initialize database manually (or it will be done automatically when the backend is started):
 
 ```bash
 diesel migration run
@@ -34,19 +35,9 @@ diesel migration run
 > PGPASSWORD=pass psql -h localhost -p 5432 -U user -d geneit
 > ```
 
-## Test OIDC credentials
-Emails:
 
-```
+Useful links:
-harley@qlik.example
-barb@qlik.example
-quinn@qlik.example
-sim@qlik.example
-phillie@qlik.example
-peta@qlik.example
-sibylla@qlik.example
-evan@qlik.example
-franklin@qlik.example
-```
 
-Password: `Password1!`
+* Mailcatcher: http://localhost:1080/
+* Rustfs console: http://localhost:9090 (credentials: `topsecret` / `topsecret`)
+* Dex OpenID configuration: http://127.0.0.1:9001/dex/.well-known/openid-configuration

geneit_app/package.json

@@ -12,45 +12,45 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@fontsource/roboto": "^5.2.6",
+    "@fontsource/roboto": "^5.2.10",
-    "@fullcalendar/core": "^6.1.19",
+    "@fullcalendar/core": "^6.1.20",
-    "@fullcalendar/daygrid": "^6.1.19",
+    "@fullcalendar/daygrid": "^6.1.20",
-    "@fullcalendar/interaction": "^6.1.19",
+    "@fullcalendar/interaction": "^6.1.20",
-    "@fullcalendar/list": "^6.1.19",
+    "@fullcalendar/list": "^6.1.20",
-    "@fullcalendar/react": "^6.1.19",
+    "@fullcalendar/react": "^6.1.20",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
-    "@mui/icons-material": "^7.2.0",
+    "@mui/icons-material": "^7.3.9",
-    "@mui/lab": "^7.0.0-beta.16",
+    "@mui/lab": "^7.0.1-beta.23",
-    "@mui/material": "^7.2.0",
+    "@mui/material": "^7.3.9",
-    "@mui/x-data-grid": "^8.9.2",
+    "@mui/x-data-grid": "^8.28.2",
-    "@mui/x-date-pickers": "^8.9.2",
+    "@mui/x-date-pickers": "^8.27.2",
-    "@mui/x-tree-view": "^8.8.0",
+    "@mui/x-tree-view": "^8.27.2",
-    "date-and-time": "^3.6.0",
+    "date-and-time": "^4.4.0",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.20",
     "email-validator": "^2.0.4",
-    "filesize": "^11.0.2",
+    "filesize": "^11.0.15",
-    "jspdf": "^3.0.1",
+    "jspdf": "^4.2.1",
-    "mui-color-input": "^7.0.0",
+    "mui-color-input": "^8.0.0",
-    "react": "^19.1.1",
+    "react": "^19.2.4",
-    "react-dom": "^19.1.1",
+    "react-dom": "^19.2.4",
-    "react-easy-crop": "^5.5.0",
+    "react-easy-crop": "^5.5.7",
     "react-qr-code": "^2.0.18",
-    "react-router-dom": "^7.4.0",
+    "react-router-dom": "^7.13.2",
     "react-zoom-pan-pinch": "^3.7.0",
-    "svg2pdf.js": "^2.5.0"
+    "svg2pdf.js": "^2.7.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.32.0",
+    "@eslint/js": "^10.0.1",
-    "@types/react": "^19.1.11",
+    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.1.7",
+    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^4.7.0",
+    "@vitejs/plugin-react": "^6.0.1",
-    "eslint": "^9.31.0",
+    "eslint": "^10.1.0",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-hooks": "0.0.0-experimental-80b1cab3-20260331",
-    "eslint-plugin-react-refresh": "^0.4.20",
+    "eslint-plugin-react-refresh": "^0.5.2",
-    "globals": "^16.3.0",
+    "globals": "^17.4.0",
-    "typescript": "^5.8.3",
+    "typescript": "^6.0.2",
-    "typescript-eslint": "^8.38.0",
+    "typescript-eslint": "^8.58.0",
-    "vite": "^7.0.6"
+    "vite": "^8.0.3"
   }
 }

geneit_app/src/routes/ProfileRoute.tsx

@@ -14,10 +14,10 @@ import React from "react";
 import { ServerApi } from "../api/ServerApi";
 import { ReplacePasswordResponse, User, UserApi } from "../api/UserApi";
 import { useAlert } from "../hooks/context_providers/AlertDialogProvider";
-import { useUser } from "../widgets/BaseAuthenticatedPage";
 import { useConfirm } from "../hooks/context_providers/ConfirmDialogProvider";
+import { formatDate } from "../utils/time_utils";
+import { useUser } from "../widgets/BaseAuthenticatedPage";
 import { PasswordInput } from "../widgets/PasswordInput";
-import { formatDate } from "../widgets/TimeWidget";
 
 export function ProfileRoute(): React.ReactElement {
   const user = useUser();
@@ -172,7 +172,7 @@ function ChangePasswordCard(): React.ReactElement {
           break;
         case ReplacePasswordResponse.TooManyRequests:
           setError(
-            "Trop de tentatives de changement de mot de passe, veuillez réessayer ultérieurement !"
+            "Trop de tentatives de changement de mot de passe, veuillez réessayer ultérieurement !",
           );
           break;
       }
@@ -257,7 +257,7 @@ function DeleteAccountButton(): React.ReactElement {
       if (
         !(await confirm(
           "Voulez-vous initier la suppression de votre compte ?",
-          "Suppression de compte"
+          "Suppression de compte",
         ))
       )
         return;
@@ -265,7 +265,7 @@ function DeleteAccountButton(): React.ReactElement {
       await UserApi.RequestAccountDeletion();
 
       await alert(
-        "Demande de suppression de compte enregistrée avec succès. Veuillez consulter votre boîte mail."
+        "Demande de suppression de compte enregistrée avec succès. Veuillez consulter votre boîte mail.",
       );
     } catch (e) {
       console.error(e);

geneit_app/src/routes/family/FamilySettingsRoute.tsx

@@ -14,9 +14,9 @@ import { FamilyApi } from "../../api/FamilyApi";
 import { ServerApi } from "../../api/ServerApi";
 import { useAlert } from "../../hooks/context_providers/AlertDialogProvider";
 import { useConfirm } from "../../hooks/context_providers/ConfirmDialogProvider";
+import { formatDate } from "../../utils/time_utils";
 import { useFamily } from "../../widgets/BaseFamilyRoute";
 import { FamilyCard } from "../../widgets/FamilyCard";
-import { formatDate } from "../../widgets/TimeWidget";
 
 export function FamilySettingsRoute(): React.ReactElement {
   const alert = useAlert();
@@ -29,7 +29,7 @@ export function FamilySettingsRoute(): React.ReactElement {
     try {
       if (
         !(await confirm(
-          "Voulez-vous vraiment supprimer cette famille, et toute les données qui s'y rattachent ? Cette opération est absolument irréversible !"
+          "Voulez-vous vraiment supprimer cette famille, et toute les données qui s'y rattachent ? Cette opération est absolument irréversible !",
         ))
       )
         return;
@@ -69,10 +69,10 @@ function FamilySettingsCard(): React.ReactElement {
 
   const [newName, setNewName] = React.useState(family.family.name);
   const [enableGenealogy, setEnableGenealogy] = React.useState(
-    family.family.enable_genealogy
+    family.family.enable_genealogy,
   );
   const [enableAccommodations, setEnableAccommodations] = React.useState(
-    family.family.enable_accommodations
+    family.family.enable_accommodations,
   );
 
   const canEdit = family.family.is_admin;

geneit_app/src/routes/family/FamilyUsersListRoute.tsx

@@ -137,8 +137,10 @@ function UsersTable(p: {
             <GridActionsCellItem
               icon={<SaveIcon />}
               label="Save"
-              sx={{
+              material={{
-                color: "primary.main",
+                sx: {
+                  color: 'primary.main',
+                },
               }}
               onClick={handleSaveClick(id)}
             />,

geneit_app/src/routes/family/genealogy/FamilyMemberRoute.tsx

@@ -1,5 +1,5 @@
 import { mdiFamilyTree } from "@mdi/js";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import ClearIcon from "@mui/icons-material/Clear";
 import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
@@ -125,7 +125,7 @@ export function FamilyMemberRoute(): React.ReactElement {
     try {
       if (
         !(await confirm(
-          "Voulez-vous vraiment supprimer cette fiche membre ? L'opération n'est pas réversible !"
+          "Voulez-vous vraiment supprimer cette fiche membre ? L'opération n'est pas réversible !",
         ))
       )
         return;
@@ -250,7 +250,7 @@ export function MemberPage(p: {
 
   const [changed, setChanged] = React.useState(false);
   const [member, setMember] = React.useState(
-    new Member(structuredClone(p.member))
+    new Member(structuredClone(p.member)),
   );
 
   const updatedMember = () => {
@@ -260,7 +260,7 @@ export function MemberPage(p: {
 
   const save = async () => {
     loadingMessage.show(
-      "Enregistrement des informations du membre en cours..."
+      "Enregistrement des informations du membre en cours...",
     );
     await p.onSave!(member);
     loadingMessage.hide();
@@ -270,7 +270,7 @@ export function MemberPage(p: {
     if (
       changed &&
       !(await confirm(
-        "Voulez-vous vraiment retirer les modifications apportées ? Celles-ci seront perdues !"
+        "Voulez-vous vraiment retirer les modifications apportées ? Celles-ci seront perdues !",
       ))
     )
       return;
@@ -666,7 +666,7 @@ export function MemberPage(p: {
                   to={family.family.URL(
                     `genealogy/couple/create?${
                       member.sex === "F" ? "wife" : "husband"
-                    }=${member.id}`
+                    }=${member.id}`,
                   )}
                 >
                   <Button>Nouveau</Button>
@@ -695,7 +695,7 @@ export function MemberPage(p: {
                   to={family.family.URL(
                     `genealogy/member/create?${
                       member.sex === "F" ? "mother" : "father"
-                    }=${member.id}`
+                    }=${member.id}`,
                   )}
                 >
                   <Button>Nouveau</Button>
@@ -723,7 +723,7 @@ export function MemberPage(p: {
                 <div style={{ display: "flex", justifyContent: "end" }}>
                   <RouterLink
                     to={family.family.URL(
-                      `genealogy/member/create?mother=${member.mother}&father=${member.father}`
+                      `genealogy/member/create?mother=${member.mother}&father=${member.father}`,
                     )}
                   >
                     <Button>Nouveau</Button>
@@ -748,7 +748,7 @@ function CoupleItem(p: {
   const genealogy = useGenealogy();
 
   const statusStr = ServerApi.Config.couples_states.find(
-    (c) => c.code === p.couple.state
+    (c) => c.code === p.couple.state,
   )?.fr;
 
   const status = [];

geneit_app/src/utils/time_utils.ts

@@ -1,3 +1,5 @@
+import { format } from "date-and-time";
+
 /**
  * Get formatted UNIX date
  */
@@ -10,7 +12,7 @@ export function fmtUnixDate(time: number): string {
  */
 export function fmtUnixDateFullCalendar(
   time: number,
-  correctEnd: boolean
+  correctEnd: boolean,
 ): string {
   let d = new Date(time * 1000);
 
@@ -29,3 +31,65 @@ export function fmtUnixDateFullCalendar(
 
   return s;
 }
+
+/**
+ * Format a date into a human-readable form
+ */
+export function formatDate(time: number): string {
+  const t = new Date();
+  t.setTime(1000 * time);
+  return format(t, "DD/MM/YYYY HH:mm:ss");
+}
+
+/**
+ * Get human readable time between to dates
+ */
+export function timeDiff(a: number, b: number): string {
+  let diff = b - a;
+
+  if (diff === 0) return "maintenant";
+  if (diff === 1) return "1 seconde";
+
+  if (diff < 60) {
+    return `${diff} secondes`;
+  }
+
+  diff = Math.floor(diff / 60);
+
+  if (diff === 1) return "1 minute";
+  if (diff < 24) {
+    return `${diff} minutes`;
+  }
+
+  diff = Math.floor(diff / 60);
+
+  if (diff === 1) return "1 heure";
+  if (diff < 24) {
+    return `${diff} heures`;
+  }
+
+  const diffDays = Math.floor(diff / 24);
+
+  if (diffDays === 1) return "1 jour";
+  if (diffDays < 31) {
+    return `${diffDays} jours`;
+  }
+
+  diff = Math.floor(diffDays / 31);
+
+  if (diff < 12) {
+    return `${diff} mois`;
+  }
+
+  const diffYears = Math.floor(diffDays / 365);
+
+  if (diffYears === 1) return "1 an";
+  return `${diffYears} ans`;
+}
+
+/**
+ * Get human readable time diff from a given timestamp to today
+ */
+export function timeDiffFromNow(time: number): string {
+  return timeDiff(time, Math.floor(new Date().getTime() / 1000));
+}

geneit_app/src/widgets/BaseAuthenticatedPage.tsx

@@ -1,5 +1,5 @@
 import { mdiFamilyTree } from "@mdi/js";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import SettingsIcon from "@mui/icons-material/Settings";
 import { Box, Button } from "@mui/material";
 import AppBar from "@mui/material/AppBar";

geneit_app/src/widgets/BaseFamilyRoute.tsx

@@ -11,7 +11,7 @@ import {
   mdiPlus,
   mdiRefresh,
 } from "@mdi/js";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import CalendarMonthIcon from "@mui/icons-material/CalendarMonth";
 import HomeIcon from "@mui/icons-material/Home";
 import {
@@ -79,7 +79,7 @@ export function BaseFamilyRoute(): React.ReactElement {
     try {
       if (
         !(await confirm(
-          "Voulez-vous vraiment générer un nouveau code d'invitation pour cette famille ? Cette action aura pour effet d'invalider l'ancien code !"
+          "Voulez-vous vraiment générer un nouveau code d'invitation pour cette famille ? Cette action aura pour effet d'invalider l'ancien code !",
         ))
       )
         return;

geneit_app/src/widgets/BaseLoginpage.tsx

@@ -1,5 +1,5 @@
 import { mdiFamilyTree } from "@mdi/js";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import Avatar from "@mui/material/Avatar";
 import Box from "@mui/material/Box";
 import CssBaseline from "@mui/material/CssBaseline";
@@ -9,14 +9,14 @@ import Typography from "@mui/material/Typography";
 import { Link, Outlet } from "react-router-dom";
 import { DarkThemeButton } from "./DarkThemeButton";
 
-function Copyright(props: any) {
+function Copyright(): React.ReactElement {
   return (
     <Typography
       variant="body2"
       color="text.secondary"
       align="center"
       style={{ marginTop: "20px" }}
-      {...props}
+      sx={{ mt: 5 }}
     >
       {"Copyright © "}
       <a
@@ -90,7 +90,7 @@ export function BaseLoginPage() {
           {/* inner page */}
           <Outlet />
 
-          <Copyright sx={{ mt: 5 }} />
+          <Copyright />
         </Box>
       </Grid>
     </Grid>

geneit_app/src/widgets/BasicFamilyTree.tsx

@@ -1,5 +1,5 @@
 import { mdiBabyCarriage, mdiCross } from "@mdi/js";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import { TreeItem, SimpleTreeView } from "@mui/x-tree-view";

geneit_app/src/widgets/MemberItem.tsx

@@ -7,7 +7,7 @@ import {
 } from "@mui/material";
 import { Member, fmtDate } from "../api/genealogy/MemberApi";
 import { MemberPhoto } from "./MemberPhoto";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import FemaleIcon from "@mui/icons-material/Female";
 import MaleIcon from "@mui/icons-material/Male";
 
@@ -37,7 +37,7 @@ export function MemberItem(p: {
         secondary={
           p.member?.dead
             ? `${fmtDate(p.member?.dateOfBirth)} - ${fmtDate(
-                p.member?.dateOfDeath
+                p.member?.dateOfDeath,
               )}`
             : fmtDate(p.member?.dateOfBirth)
         }

geneit_app/src/widgets/TimeWidget.tsx

@@ -1,58 +1,5 @@
 import { Tooltip } from "@mui/material";
-import date from "date-and-time";
+import { formatDate, timeDiffFromNow } from "../utils/time_utils";
-
-export function formatDate(time: number): string {
-  const t = new Date();
-  t.setTime(1000 * time);
-  return date.format(t, "DD/MM/YYYY HH:mm:ss");
-}
-
-export function timeDiff(a: number, b: number): string {
-  let diff = b - a;
-
-  if (diff === 0) return "maintenant";
-  if (diff === 1) return "1 seconde";
-
-  if (diff < 60) {
-    return `${diff} secondes`;
-  }
-
-  diff = Math.floor(diff / 60);
-
-  if (diff === 1) return "1 minute";
-  if (diff < 24) {
-    return `${diff} minutes`;
-  }
-
-  diff = Math.floor(diff / 60);
-
-  if (diff === 1) return "1 heure";
-  if (diff < 24) {
-    return `${diff} heures`;
-  }
-
-  const diffDays = Math.floor(diff / 24);
-
-  if (diffDays === 1) return "1 jour";
-  if (diffDays < 31) {
-    return `${diffDays} jours`;
-  }
-
-  diff = Math.floor(diffDays / 31);
-
-  if (diff < 12) {
-    return `${diff} mois`;
-  }
-
-  const diffYears = Math.floor(diffDays / 365);
-
-  if (diffYears === 1) return "1 an";
-  return `${diffYears} ans`;
-}
-
-export function timeDiffFromNow(time: number): string {
-  return timeDiff(time, Math.floor(new Date().getTime() / 1000));
-}
 
 export function TimeWidget(p: { time: number }): React.ReactElement {
   return (

geneit_app/src/widgets/simple_family_tree/SimpleFamilyTree.tsx

@@ -1,5 +1,5 @@
 import { mdiXml } from "@mdi/js";
-import Icon from "@mdi/react";
+import { Icon } from "@mdi/react";
 import PictureAsPdfIcon from "@mui/icons-material/PictureAsPdf";
 import { IconButton, Tooltip } from "@mui/material";
 import jsPDF from "jspdf";
@@ -89,7 +89,7 @@ function center(container_width: number, el_width: number): number {
 
 function buildSimpleTreeNode(
   tree: FamilyTreeNode,
-  depth: number
+  depth: number,
 ): SimpleTreeNode {
   if (depth === 0) throw new Error("Too much recursion reached!");
 
@@ -100,7 +100,7 @@ function buildSimpleTreeNode(
   let childrenToProcess = tree.down;
   if (depth > 1)
     tree.couples?.forEach(
-      (c) => (childrenToProcess = childrenToProcess?.concat(c.down))
+      (c) => (childrenToProcess = childrenToProcess?.concat(c.down)),
     );
   else childrenToProcess = [];
 
@@ -156,7 +156,7 @@ export function SimpleFamilyTree(p: {
 
   const tree = React.useMemo(
     () => buildSimpleTreeNode(p.tree, p.depth),
-    [p.tree, p.depth]
+    [p.tree, p.depth],
   );
 
   const height = p.depth * (CARD_HEIGHT + LEVEL_SPACING) - LEVEL_SPACING;
@@ -301,7 +301,7 @@ function NodeArea(p: {
   if (
     pers2 &&
     p.node.down.every(
-      (n) => n.member.father === pers1.id && n.member.mother !== pers2!.id
+      (n) => n.member.father === pers1.id && n.member.mother !== pers2!.id,
     )
   ) {
     childrenLinkX = parent_x_offset + Math.floor(memberCardWidth(pers1) / 2);
@@ -312,7 +312,7 @@ function NodeArea(p: {
   else if (
     pers2 &&
     p.node.down.every(
-      (n) => n.member.father !== pers1.id && n.member.mother === pers2!.id
+      (n) => n.member.father !== pers1.id && n.member.mother === pers2!.id,
     )
   ) {
     childrenLinkX = beginSecondFaceX! + Math.floor(memberCardWidth(pers2) / 2);
@@ -419,7 +419,7 @@ function MemberCard(p: {
         <tspan
           x={center(
             w,
-            getTextWidth(p.member.lastNameUpperCase ?? "", NAME_FONT)
+            getTextWidth(p.member.lastNameUpperCase ?? "", NAME_FONT),
           )}
           dy="14"
           font-size="13"
@@ -430,7 +430,7 @@ function MemberCard(p: {
         <tspan
           x={center(
             w,
-            getTextWidth(p.member.displayBirthDeathShort, BIRTH_FONT)
+            getTextWidth(p.member.displayBirthDeathShort, BIRTH_FONT),
           )}
           dy="14"
           font-size="10"

geneit_backend/Cargo.toml

@@ -6,38 +6,39 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-log = "0.4.27"
+log = "0.4.29"
-env_logger = "0.11.8"
+env_logger = "0.11.10"
-clap = { version = "4.5.45", features = ["derive", "env"] }
+clap = { version = "4.6.0", features = ["derive", "env"] }
 lazy_static = "1.5.0"
-lazy-regex = "3.4.1"
+lazy-regex = "3.6.0"
-anyhow = "1.0.99"
+anyhow = "1.0.102"
-actix-web = "4.11.0"
+actix-web = "4.13.0"
 actix-cors = "0.7.1"
 actix-multipart = "0.7.2"
-actix-remote-ip = "0.1.0"
+actix-remote-ip = "1.0.0"
-futures-util = "0.3.31"
+futures-util = "0.3.32"
-diesel = { version = "2.2.12", features = ["postgres"] }
+diesel = { version = "2.3.7", features = ["postgres"] }
-diesel_migrations = "2.2.0"
+diesel_migrations = "2.3.1"
-serde = { version = "1.0.219", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.141"
+serde_json = "1.0.149"
-mailchecker = "6.0.18"
+mailchecker = "6.0.20"
-redis = "0.32.4"
+redis = "1.1.0"
-lettre = "0.11.18"
+lettre = "0.11.20"
-rand = "0.9.2"
+rand = "0.10.0"
-bcrypt = "0.17.1"
+bcrypt = "0.19.0"
-light-openid = "1.0.4"
+light-openid = "1.1.0"
-thiserror = "2.0.12"
+thiserror = "2.0.18"
-serde_with = "3.14.0"
+serde_with = "3.18.0"
 rust_iso3166 = "0.1.14"
-rust-s3 = "0.35.1"
+rust-s3 = "0.37.1"
-sha2 = "0.10.9"
+sha2 = "0.11.0"
-image = "0.25.6"
+image = "0.25.10"
-uuid = { version = "1.17.0", features = ["v4"] }
+uuid = { version = "1.23.0", features = ["v4"] }
 httpdate = "1.0.3"
-zip = "4.3.0"
+zip = "8.5.0"
 mime_guess = "2.0.5"
-tempfile = "3.20.0"
+tempfile = "3.27.0"
 base64 = "0.22.1"
 ical = { version = "0.11.0", features = ["generator", "ical", "vcard"] }
-chrono = "0.4.41"
+chrono = "0.4.44"
+hex = "0.4.3"

geneit_backend/docker-compose.yaml

@@ -1,51 +1,150 @@
 services:
-  minio:
+  rustfs:
-    image: minio/minio
+    image: rustfs/rustfs:1.0.0-alpha.90
+    user: "1000"
+    restart: unless-stopped
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
     environment:
-      - MINIO_ROOT_USER=topsecret
+      - RUSTFS_ACCESS_KEY=topsecret
-      - MINIO_ROOT_PASSWORD=topsecret
+      - RUSTFS_SECRET_KEY=topsecret
+      - RUSTFS_CONSOLE_ENABLE=true
+      - RUSTFS_ADDRESS=0.0.0.0:9000
+      - RUSTFS_CONSOLE_ENABLE=true
+      - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9090
+      - RUSTFS_VOLUMES=/data
     volumes:
-    - ./storage/minio:/data
+      - ./storage/rustfs:/data
-    command: ["minio", "server", "/data", "--console-address", ":9090"]
     ports:
-      - 9000:9000
+      - "9000:9000"
-      - 9090:9090
+      - "9090:9090"
     expose:
       - 9000
+    read_only: true
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "sh", "-c",
+          "curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9090/rustfs/console/health"
+        ]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
 
   db:
-    image: postgres
+    image: postgres:18
+    user: "1000"
+    restart: unless-stopped
     ports:
       - "5432:5432"
     expose:
       - 5432
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
     environment:
       - POSTGRES_USER=user
       - POSTGRES_PASSWORD=pass
       - POSTGRES_DB=geneit
+      - PGDATA=/data
+    read_only: true
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U user" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     volumes:
-      - ./storage/db:/var/lib/postgresql/data
+      - ./storage/db:/data
+    tmpfs:
+      - /tmp
+      - /run/postgresql
   
   mailcatcher:
     image: dockage/mailcatcher:0.9.0
+    restart: unless-stopped
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    read_only: true
     ports:
-      - 1080:1080
+      - "1080:1080"
-      - 1025:1025
+      - "1025:1025"
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://127.0.0.1:1080 || exit 1
+      interval: 5m
+      timeout: 3s
+      retries: 3
+      start_period: 2m
 
   redis:
     image: redis:alpine
+    restart: unless-stopped
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    read_only: true
     command: redis-server --requirepass ${REDIS_PASS:-secretredis}
     ports:
-      - 6379:6379
+      - "6379:6379"
+    healthcheck:
+      test: [ "CMD-SHELL", "redis-cli --no-auth-warning --pass ${REDIS_PASS:-secretredis} ping | grep PONG" ]
+      interval: 1s
+      timeout: 3s
+      retries: 5
     volumes:
       - ./storage/redis-data:/data
       - ./storage/redis-conf:/usr/local/etc/redis/redis.conf
   
   oidc:
-    image: qlik/simple-oidc-provider
+    image: dexidp/dex
-    environment:
+    user: "1000"
-    - REDIRECTS=http://localhost:3000/oidc_cb
+    restart: unless-stopped
-    - PORT=9001
     ports:
-    - 9001:9001
+      - "9001:9001"
+    command: [ "dex", "serve", "/conf/dex.config.yaml" ]
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    configs:
+      - source: dex-config
+        target: /conf/dex.config.yaml
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:9001/dex/healthz || exit 1
+      interval: 5m
+      timeout: 3s
+      retries: 3
+      start_period: 2m
 
+configs:
+  dex-config:
+    content: |
+      issuer: http://127.0.0.1:9001/dex
+
+      storage:
+        type: memory
+
+      web:
+        http: 0.0.0.0:9001
+
+      oauth2:
+        skipApprovalScreen: false
+
+      connectors:
+        - type: mockCallback
+          id: mock
+          name: Example
+
+      staticClients:
+        - id: foo
+          secret: bar
+          redirectURIs:
+            - http://localhost:5173/oidc_cb
+          name: Project

geneit_backend/src/app_config.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use redis::{IntoConnectionInfo, RedisConnectionInfo};
 use s3::creds::Credentials;
 use s3::{Bucket, Region};
 
@@ -11,7 +12,7 @@ pub struct AppConfig {
     pub listen_address: String,
 
     /// Website origin
-    #[clap(short, long, env, default_value = "http://localhost:3000")]
+    #[clap(short, long, env, default_value = "http://localhost:5173")]
     pub website_origin: String,
 
     /// Proxy IP, might end with a star "*"
@@ -98,7 +99,7 @@ pub struct AppConfig {
     #[arg(
         long,
         env,
-        default_value = "http://localhost:9001/.well-known/openid-configuration"
+        default_value = "http://localhost:9001/dex/.well-known/openid-configuration"
     )]
     pub oidc_configuration_url: String,
 
@@ -188,15 +189,16 @@ impl AppConfig {
 
     /// Get Redis connection configuration
     pub fn redis_connection_config(&self) -> redis::ConnectionInfo {
-        redis::ConnectionInfo {
+        let mut settings = RedisConnectionInfo::default().set_db(self.redis_db_number);
-            addr: redis::ConnectionAddr::Tcp(self.redis_hostname.clone(), self.redis_port),
+        if let Some(username) = self.redis_username.as_ref() {
-            redis: redis::RedisConnectionInfo {
+            settings = settings.set_username(username);
-                db: self.redis_db_number,
-                username: self.redis_username.clone(),
-                password: Some(self.redis_password.clone()),
-                protocol: Default::default(),
-            },
         }
+        settings = settings.set_password(&self.redis_password);
+
+        redis::ConnectionAddr::Tcp(self.redis_hostname.clone(), self.redis_port)
+            .into_connection_info()
+            .expect("could not parse redis connection info!")
+            .set_redis_settings(settings)
     }
 
     /// Get password reset URL

geneit_backend/src/controllers/accommodations_list_controller.rs

@@ -34,18 +34,18 @@ impl AccommodationRequest {
         }
         accommodation.name = self.name;
 
-        if let Some(d) = &self.description {
+        if let Some(d) = &self.description
-            if !c.accommodation_description_len.validate(d) {
+            && !c.accommodation_description_len.validate(d)
+        {
             return Err(AccommodationListControllerErr::InvalidDescriptionLength.into());
         }
-        }
         accommodation.description.clone_from(&self.description);
 
-        if let Some(c) = &self.color {
+        if let Some(c) = &self.color
-            if !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c) {
+            && !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c)
+        {
             return Err(AccommodationListControllerErr::MalformedColor.into());
         }
-        }
         accommodation.color.clone_from(&self.color);
 
         accommodation.need_validation = self.need_validation;

geneit_backend/src/controllers/couples_controller.rs

@@ -48,23 +48,23 @@ impl CoupleRequest {
             }
         }
 
-        if let Some(husband) = self.husband {
+        if let Some(husband) = self.husband
-            if !members_service::exists(couple.family_id(), husband).await? {
+            && !members_service::exists(couple.family_id(), husband).await?
+        {
             return Err(CoupleControllerErr::HusbandNotExisting.into());
         }
-        }
 
-        if let Some(d) = &self.wedding {
+        if let Some(d) = &self.wedding
-            if !d.check() {
+            && !d.check()
+        {
             return Err(CoupleControllerErr::MalformedDateOfWedding.into());
         }
-        }
 
-        if let Some(d) = &self.divorce {
+        if let Some(d) = &self.divorce
-            if !d.check() {
+            && !d.check()
+        {
             return Err(CoupleControllerErr::MalformedDateOfDivorce.into());
         }
-        }
 
         couple.set_wife(self.wife);
         couple.set_husband(self.husband);

geneit_backend/src/controllers/members_controller.rs

@@ -95,11 +95,11 @@ fn check_opt_str_val(
     c: SizeConstraint,
     err: MemberControllerErr,
 ) -> anyhow::Result<()> {
-    if let Some(v) = val {
+    if let Some(v) = val
-        if !c.validate(v) {
+        && !c.validate(v)
+    {
         return Err(err.into());
     }
-    }
     Ok(())
 }
 
@@ -151,11 +151,11 @@ impl MemberRequest {
             MemberControllerErr::MalformedEmailAddress,
         )?;
 
-        if let Some(mail) = &self.email {
+        if let Some(mail) = &self.email
-            if !mailchecker::is_valid(mail) {
+            && !mailchecker::is_valid(mail)
+        {
             return Err(MemberControllerErr::InvalidEmailAddress.into());
         }
-        }
 
         check_opt_str_val(
             &self.phone,
@@ -187,23 +187,23 @@ impl MemberRequest {
             MemberControllerErr::MalformedCountry,
         )?;
 
-        if let Some(c) = &self.country {
+        if let Some(c) = &self.country
-            if !countries_utils::is_code_valid(c) {
+            && !countries_utils::is_code_valid(c)
+        {
             return Err(MemberControllerErr::InvalidCountryCode.into());
         }
-        }
 
-        if let Some(d) = &self.birth {
+        if let Some(d) = &self.birth
-            if !d.check() {
+            && !d.check()
+        {
             return Err(MemberControllerErr::MalformedDateOfBirth.into());
         }
-        }
 
-        if let Some(d) = &self.death {
+        if let Some(d) = &self.death
-            if !d.check() {
+            && !d.check()
+        {
             return Err(MemberControllerErr::MalformedDateOfDeath.into());
         }
-        }
 
         check_opt_str_val(
             &self.note,
@@ -221,11 +221,11 @@ impl MemberRequest {
             }
         }
 
-        if let Some(father) = self.father {
+        if let Some(father) = self.father
-            if !members_service::exists(member.family_id(), father).await? {
+            && !members_service::exists(member.family_id(), father).await?
+        {
             return Err(MemberControllerErr::FatherNotExisting.into());
         }
-        }
 
         member.first_name = self.first_name;
         member.last_name = self.last_name;

geneit_backend/src/controllers/photos_controller.rs

@@ -36,16 +36,16 @@ async fn get_photo(id: &PhotoIdPath, full_size: bool, req: HttpRequest) -> HttpR
     };
 
     // Check if an upload is un-necessary
-    if let Some(c) = req.headers().get(header::IF_NONE_MATCH) {
+    if let Some(c) = req.headers().get(header::IF_NONE_MATCH)
-        if c.to_str().unwrap_or("") == hash {
+        && c.to_str().unwrap_or("") == hash
+    {
         return Ok(HttpResponse::NotModified().finish());
     }
-    }
 
     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) {
+        if let Ok(date) = httpdate::parse_http_date(date_str)
-            if date
+            && date
                 .add(Duration::from_secs(1))
                 .duration_since(UNIX_EPOCH)
                 .unwrap()
@@ -55,7 +55,6 @@ async fn get_photo(id: &PhotoIdPath, full_size: bool, req: HttpRequest) -> HttpR
             return Ok(HttpResponse::NotModified().finish());
         }
     }
-    }
 
     let bytes = s3_connection::get_file(&match full_size {
         true => photo.photo_path(),

geneit_backend/src/main.rs

@@ -40,9 +40,9 @@ async fn main() -> std::io::Result<()> {
                     .max_age(3600),
             )
             .wrap(Logger::default())
-            .app_data(web::Data::new(RemoteIPConfig {
+            .app_data(web::Data::new(RemoteIPConfig::parse_opt(
-                proxy: AppConfig::get().proxy_ip.clone(),
+                AppConfig::get().proxy_ip.clone(),
-            }))
+            )))
             // Uploaded files
             .app_data(TempFileConfig::default().directory(&AppConfig::get().temp_dir))
             // Config controller

geneit_backend/src/services/members_service.rs

@@ -149,11 +149,11 @@ pub mod loop_detection {
 
     impl LoopStack<'_> {
         pub fn contains(&self, id: MemberID) -> bool {
-            if let Some(ls) = &self.prev {
+            if let Some(ls) = &self.prev
-                if ls.contains(id) {
+                && ls.contains(id)
+            {
                 return true;
             }
-            }
 
             self.curr == id
         }

geneit_backend/src/services/openid_service.rs

@@ -64,7 +64,7 @@ fn redis_key(state: &str) -> String {
     format!("oidc-state-{state}")
 }
 
-async fn load_provider_info(prov_id: &str) -> anyhow::Result<OpenIDClient> {
+async fn load_provider_info(prov_id: &str) -> anyhow::Result<OpenIDClient<'_>> {
     let prov = AppConfig::get()
         .openid_providers()
         .into_iter()

geneit_backend/src/utils/crypt_utils.rs

@@ -1,17 +1,11 @@
 use sha2::{Digest, Sha256, Sha512};
 
-/// Compute hash of a slice of bytes
+/// Compute SHA256sum of a given slice of bytes
-pub fn sha256(bytes: &[u8]) -> String {
+pub fn sha256(input: &[u8]) -> String {
-    let mut hasher = Sha256::new();
+    hex::encode(Sha256::digest(input))
-    hasher.update(bytes);
-    let h = hasher.finalize();
-    format!("{h:x}")
 }
 
-/// Compute hash of a slice of bytes (sha512)
+/// Compute SHA512sum of a given slice of bytes
-pub fn sha512(bytes: &[u8]) -> String {
+pub fn sha512(input: &[u8]) -> String {
-    let mut hasher = Sha512::new();
+    hex::encode(Sha512::digest(input))
-    hasher.update(bytes);
-    let h = hasher.finalize();
-    format!("{h:x}")
 }