Merge remote-tracking branch 'origin/main' into data-entry-reducer

kiesraad · Mar 5, 2025 · d0d1b26 · d0d1b26
2 parents 404e23e + 624daf3
commit d0d1b26
Show file tree

Hide file tree

Showing 164 changed files with 5,699 additions and 2,319 deletions.
diff --git a/backend/.sqlx/query-06c945e50567c6801f1346d436cdc86a82a4e13dd45d8286295ba37cdbdc045e.json b/backend/.sqlx/query-06c945e50567c6801f1346d436cdc86a82a4e13dd45d8286295ba37cdbdc045e.json
diff --git a/backend/.sqlx/query-340567823a65df0bc39149b345d334fdf52aac79a926c429961fdc980338d84e.json b/backend/.sqlx/query-340567823a65df0bc39149b345d334fdf52aac79a926c429961fdc980338d84e.json
diff --git a/backend/.sqlx/query-5ebc9c22d5c7c19f7781a215f90ae409cf58b5cb7e3ab7397ce025efa5d9a47e.json b/backend/.sqlx/query-5ebc9c22d5c7c19f7781a215f90ae409cf58b5cb7e3ab7397ce025efa5d9a47e.json
diff --git a/backend/.sqlx/query-b7831524cb4e52f2970f12032e90bab3c53effb879bf95592e52372ca8e857b0.json b/backend/.sqlx/query-b7831524cb4e52f2970f12032e90bab3c53effb879bf95592e52372ca8e857b0.json
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "abacus"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "EUPL-1.2"
-rust-version = "1.75"
+rust-version = "1.85"
 default-run = "abacus"
 
 [features]
@@ -43,7 +43,7 @@ argon2 = "0.5.3"
 password-hash = { version = "0.5.0", features = ["getrandom"] }
 rand = "0.9.0"
 cookie = { version = "0.18.1", features = ["percent-encode"] }
-zip = { version = "2.2.2", default-features = false, features = ["deflate", "chrono"] }
+zip = { version = "2.2.3", default-features = false, features = ["deflate", "chrono"] }
 
 [dev-dependencies]
 test-log = "0.2.17"

diff --git a/backend/fixtures/users.sql b/backend/fixtures/users.sql
@@ -1,3 +1,8 @@
 INSERT INTO users (id, username, fullname, role, password_hash)
--- password is 'password'
-VALUES (1, 'user', 'Sanne Molenaar', 'administrator', '$argon2id$v=19$m=19456,t=2,p=1$frZGxFIhMHEsBJS4/VZr1A$zVIGEmiTFGy9jEy1Bphdq1ZO0lUngom8qu9PLsN6mZY');
+-- Passwords:
+-- admin: 'AdminPassword01'
+-- typist: 'TypistPassword01'
+-- coordinator: 'CoordinatorPassword01'
+VALUES (1, 'admin', 'Sanne Molenaar', 'administrator', '$argon2id$v=19$m=19456,t=2,p=1$QUKK7UVINt+ORMFA+7egeQ$iWQBzhaWH5NupuTSJA5jzxC20y/SH8j53rdz5YTema4'),
+       (2, 'typist', 'Sam Kuijpers', 'typist', '$argon2id$v=19$m=19456,t=2,p=1$Er+VXYLcGjIJL8i1aCUofA$fjT6Cp1tNr0HhI+LUE+hZG8GnvZI+m9qNXr6mcyJzQM'),
+       (3, 'coordinator', 'Mohammed van der Velden', 'coordinator', '$argon2id$v=19$m=19456,t=2,p=1$M3/ivnARZ5AHMGIAIc+hpA$AUNjzm2yEWIkMlaam8BKFxr4gv3TbU+nyiAcSZrmfoM');
diff --git a/backend/migrations/5_users.sql b/backend/migrations/5_users.sql
@@ -9,5 +9,5 @@ CREATE TABLE users
     last_activity_at       DATETIME        ,
     updated_at             DATETIME        NOT NULL DEFAULT CURRENT_TIMESTAMP,
     created_at             DATETIME        NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(username)
+    UNIQUE(username COLLATE NOCASE)
 );
diff --git a/backend/migrations/6_sessions.sql b/backend/migrations/6_sessions.sql
@@ -5,6 +5,6 @@ CREATE TABLE sessions
     expires_at         DATETIME             NOT NULL,
     created_at         DATETIME             NOT NULL DEFAULT CURRENT_TIMESTAMP,
 
-    FOREIGN KEY (user_id) REFERENCES users (id),
+    FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
     UNIQUE(session_key)
 );