limit users to proper role, Fixes #135

src/tera/log.rs

@@ -23,7 +23,7 @@ use crate::model::{
         LogbookUpdateError,
     },
     logtype::LogType,
-    user::{NonGuestUser, User, UserWithRoles, UserWithWaterStatus},
+    user::{DonauLinzUser, User, UserWithRoles, UserWithWaterStatus},
 };
 
 pub struct KioskCookie(String);
@@ -44,9 +44,9 @@ impl<'r> FromRequest<'r> for KioskCookie {
 async fn index(
     db: &State<SqlitePool>,
     flash: Option<FlashMessage<'_>>,
-    user: NonGuestUser,
+    user: DonauLinzUser,
 ) -> Template {
-    let boats = Boat::for_user(db, &user.user).await;
+    let boats = Boat::for_user(db, &user).await;
 
     let coxes: Vec<UserWithWaterStatus> = futures::future::join_all(
         User::cox(db)
@@ -78,7 +78,7 @@ async fn index(
     context.insert("logtypes", &logtypes);
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(user.user, db).await,
+        &UserWithRoles::from_user(user.into(), db).await,
     );
     context.insert("on_water", &on_water);
     context.insert("distances", &distances);
@@ -87,12 +87,12 @@ async fn index(
 }
 
 #[get("/show", rank = 2)]
-async fn show(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
+async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     let logs = Logbook::completed(db).await;
 
     Template::render(
         "log.completed",
-        context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await),
+        context!(logs, loggedin_user: &UserWithRoles::from_user(user.into(), db).await),
     )
 }
 
@@ -166,12 +166,12 @@ async fn kiosk(
 async fn create_logbook(
     db: &SqlitePool,
     data: Form<LogToAdd>,
-    user: &NonGuestUser,
+    user: &DonauLinzUser,
 ) -> Flash<Redirect> {
     match Logbook::create(
         db,
         data.into_inner(),
-        &user.user
+        &user
     )
     .await
     {
@@ -197,14 +197,11 @@ async fn create_logbook(
 async fn create(
     db: &State<SqlitePool>,
     data: Form<LogToAdd>,
-    user: NonGuestUser,
+    user: DonauLinzUser,
 ) -> Flash<Redirect> {
     Log::create(
         db,
-        format!(
-            "User {} tries to create log entry={:?}",
-            user.user.name, data
-        ),
+        format!("User {} tries to create log entry={:?}", &user.name, data),
     )
     .await;
 
@@ -238,14 +235,14 @@ async fn create_kiosk(
     )
     .await;
 
-    create_logbook(db, data, &NonGuestUser { user: creator }).await //TODO: fixme
+    create_logbook(db, data, &DonauLinzUser(creator)).await //TODO: fixme
 }
 
 async fn home_logbook(
     db: &SqlitePool,
     data: Form<LogToFinalize>,
     logbook_id: i32,
-    user: &NonGuestUser,
+    user: &DonauLinzUser,
 ) -> Flash<Redirect> {
     let logbook: Option<Logbook> = Logbook::find_by_id(db, logbook_id).await;
     let Some(logbook) = logbook else {
@@ -255,7 +252,7 @@ async fn home_logbook(
         );
     };
 
-    match logbook.home(db, &user.user, data.into_inner()).await {
+    match logbook.home(db, &user, data.into_inner()).await {
         Ok(_) => Flash::success(Redirect::to("/log"), "Ausfahrt korrekt eingetragen"),
         Err(LogbookUpdateError::TooManyRowers(expected, actual)) => Flash::error(Redirect::to("/log"), format!("Zu viele Ruderer (Boot fasst maximal {expected}, es wurden jedoch {actual} Ruderer ausgewählt)")),
         Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday) => Flash::error(Redirect::to("/log"), "Nur Ausfahrten, die heute enden dürfen eingetragen werden. Für einen Nachtrag schreibe alle Daten Philipp (Tel. nr. siehe Signal oder it@rudernlinz.at)."),
@@ -285,11 +282,11 @@ async fn home_kiosk(
         db,
         data,
         logbook_id,
-        &NonGuestUser {
-            user: User::find_by_id(db, logbook.shipmaster as i32)
+        &DonauLinzUser(
+            User::find_by_id(db, logbook.shipmaster as i32)
                 .await
-                .unwrap(), //TODO: fixme
-        },
+                .unwrap(),
+        ), //TODO: fixme
     )
     .await
 }
@@ -299,13 +296,13 @@ async fn home(
     db: &State<SqlitePool>,
     data: Form<LogToFinalize>,
     logbook_id: i32,
-    user: NonGuestUser,
+    user: DonauLinzUser,
 ) -> Flash<Redirect> {
     Log::create(
         db,
         format!(
             "User {} tries to finish log entry {logbook_id} {data:?}",
-            user.user.name
+            &user.name
         ),
     )
     .await;
@@ -314,12 +311,12 @@ async fn home(
 }
 
 #[get("/<logbook_id>/delete", rank = 2)]
-async fn delete(db: &State<SqlitePool>, logbook_id: i32, user: User) -> Flash<Redirect> {
+async fn delete(db: &State<SqlitePool>, logbook_id: i32, user: DonauLinzUser) -> Flash<Redirect> {
     let logbook = Logbook::find_by_id(db, logbook_id).await;
     if let Some(logbook) = logbook {
         Log::create(
             db,
-            format!("User {} tries to delete log entry {logbook_id}", user.name),
+            format!("User {} tries to delete log entry {logbook_id}", &user.name),
         )
         .await;
         match logbook.delete(db, &user).await {