start replacing activitybuilder
All checks were successful
CI/CD Pipeline / test (push) Successful in 18m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped

This commit is contained in:
2025-05-12 23:08:45 +02:00
parent e4a8caf632
commit 3ab1dbd1f1
3 changed files with 56 additions and 37 deletions

View File

@@ -1,5 +1,4 @@
use rocket::{
FromForm, Request, Route, State,
form::Form,
get,
http::{Cookie, CookieJar},
@@ -9,12 +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,
activity::{self, ActivityBuilder},
log::Log,
user::{LoginError, User},
};
@@ -83,13 +83,9 @@ async fn login(
cookies.add_private(Cookie::new("loggedin_user", format!("{}", user.id)));
ActivityBuilder::new(&format!(
"{user} hat sich eingeloggt (User-Agent: {})",
agent.0
))
.relevant_for_user(&user)
.save(db)
.await;
ActivityBuilder::from(activity::Reason::SuccLogin(&user, agent.0))
.save(db)
.await;
// Check for redirect_url cookie and redirect accordingly
match cookies.get_private("redirect_url") {