philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Issues Pull Requests Actions Activity

Merge pull request 'improve logging' (#1021) from improve-logging into staging

Browse Source 
Reviewed-on: Ruderverein-Donau-Linz/rowt#1021
This commit is contained in:
philipp 2025-05-14 23:01:12 +02:00
commit 4906b757b8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/model/user/mod.rs
View File

@ -532,17 +532,19 @@ ASKÖ Ruderverein Donau Linz", self.name),
} }
} }
pub async fn reset_pw(&self, db: &SqlitePool) { pub async fn reset_pw(&self, db: &SqlitePool, changed_by: &ManageUserUser) {
sqlx::query!("UPDATE user SET pw = null where id = ?", self.id) sqlx::query!("UPDATE user SET pw = null where id = ?", self.id)
.execute(db) .execute(db)
.await .await
.unwrap(); //Okay, because we can only create a User of a valid id .unwrap(); //Okay, because we can only create a User of a valid id
// TODO: add responsible person // TODO: add responsible person
ActivityBuilder::new(&format!("Passwort von User {self} wurde zurückgesetzt.")) ActivityBuilder::new(&format!(
.relevant_for_user(self) "{changed_by} hat das Passwort von User {self} zurückgesetzt."
.save(db) ))
.await; .relevant_for_user(self)
.save(db)
.await;
} }
pub async fn update_pw(&self, db: &SqlitePool, pw: &str) { pub async fn update_pw(&self, db: &SqlitePool, pw: &str) {
@ -551,12 +553,10 @@ ASKÖ Ruderverein Donau Linz", self.name),
.execute(db) .execute(db)
.await .await
.unwrap(); //Okay, because we can only create a User of a valid id .unwrap(); //Okay, because we can only create a User of a valid id
ActivityBuilder::new(&format!( ActivityBuilder::new(&format!("{self} hat sein Passwort geändert."))
"Passwort von User {self} wurde erfolgreich geändert." .relevant_for_user(self)
)) .save(db)
.relevant_for_user(self) .await;
.save(db)
.await;
} }
fn get_hashed_pw(pw: &str) -> String { fn get_hashed_pw(pw: &str) -> String {

2
src/tera/admin/user.rs
View File

@ -276,7 +276,7 @@ async fn resetpw(db: &State<SqlitePool>, admin: ManageUserUser, user: i32) -> Fl
format!("{} has resetted the pw for {}", admin.user.name, user.name), format!("{} has resetted the pw for {}", admin.user.name, user.name),
) )
.await; .await;
user.reset_pw(db).await; user.reset_pw(db, &admin).await;
Flash::success( Flash::success(
Redirect::to("/admin/user"), Redirect::to("/admin/user"),
format!("Passwort von {} zurückgesetzt", user.name), format!("Passwort von {} zurückgesetzt", user.name),