diff --git a/src/model/user/mod.rs b/src/model/user/mod.rs index 2b8bd75..5aa18a1 100644 --- a/src/model/user/mod.rs +++ b/src/model/user/mod.rs @@ -577,10 +577,6 @@ ASKÖ Ruderverein Donau Linz", self.name), .execute(db) .await .unwrap(); //Okay, because we can only create a User of a valid id - ActivityBuilder::new(&format!("User {self} hat sich eingeloggt.")) - .relevant_for_user(self) - .save(db) - .await; } pub async fn delete(&self, db: &SqlitePool, deleted_by: &ManageUserUser) { diff --git a/src/tera/auth.rs b/src/tera/auth.rs index d9f3317..d820d7b 100644 --- a/src/tera/auth.rs +++ b/src/tera/auth.rs @@ -1,5 +1,4 @@ use rocket::{ - FromForm, Request, Route, State, form::Form, get, http::{Cookie, CookieJar}, @@ -9,11 +8,13 @@ use rocket::{ response::{Flash, Redirect}, routes, time::{Duration, OffsetDateTime}, + FromForm, Request, Route, State, }; -use rocket_dyn_templates::{Template, context, tera}; +use rocket_dyn_templates::{context, tera, Template}; use sqlx::SqlitePool; use crate::model::{ + activity::ActivityBuilder, log::Log, user::{LoginError, User}, }; @@ -82,13 +83,12 @@ async fn login( cookies.add_private(Cookie::new("loggedin_user", format!("{}", user.id))); - Log::create( - db, - format!( - "Succ login of {} with this useragent: {}", - login.name, agent.0 - ), - ) + ActivityBuilder::new(&format!( + "{user} hat sich eingeloggt (User-Agent: {})", + agent.0 + )) + .relevant_for_user(&user) + .save(db) .await; // Check for redirect_url cookie and redirect accordingly