in preparation to moving userdata into app, we switched to arbitrary groups

src/tera/admin/boat.rs

@@ -1,7 +1,7 @@
 use crate::model::{
     boat::{Boat, BoatToAdd, BoatToUpdate},
     location::Location,
-    user::{AdminUser, User},
+    user::{AdminUser, User, UserWithRoles},
 };
 use rocket::{
     form::Form,
@@ -30,7 +30,10 @@ async fn index(
     context.insert("boats", &boats);
     context.insert("locations", &locations);
     context.insert("users", &users);
-    context.insert("loggedin_user", &admin.user);
+    context.insert(
+        "loggedin_user",
+        &UserWithRoles::from_user(admin.user, db).await,
+    );
 
     Template::render("admin/boat/index", context.into_json())
 }

src/tera/admin/user.rs

@@ -1,4 +1,10 @@
-use crate::model::user::{AdminUser, User};
+use std::collections::HashMap;
+
+use crate::model::{
+    role::Role,
+    user::{AdminUser, User, UserWithRoles},
+};
+use futures::future::join_all;
 use rocket::{
     form::Form,
     get, post,
@@ -15,14 +21,26 @@ async fn index(
     admin: AdminUser,
     flash: Option<FlashMessage<'_>>,
 ) -> Template {
-    let users = User::all(db).await;
+    let user_futures: Vec<_> = User::all(db)
+        .await
+        .into_iter()
+        .map(|u| async move { UserWithRoles::from_user(u, db).await })
+        .collect();
+
+    let users: Vec<UserWithRoles> = join_all(user_futures).await;
+
+    let roles = Role::all(db).await;
 
     let mut context = Context::new();
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
     context.insert("users", &users);
-    context.insert("loggedin_user", &admin.user);
+    context.insert("roles", &roles);
+    context.insert(
+        "loggedin_user",
+        &UserWithRoles::from_user(admin.user, db).await,
+    );
 
     Template::render("admin/user/index", context.into_json())
 }
@@ -57,16 +75,13 @@ async fn delete(db: &State<SqlitePool>, _admin: AdminUser, user: i32) -> Flash<R
     }
 }
 
-#[derive(FromForm)]
+#[derive(FromForm, Debug)]
 pub struct UserEditForm {
     pub(crate) id: i32,
-    pub(crate) is_guest: bool,
-    pub(crate) is_cox: bool,
-    pub(crate) is_admin: bool,
-    pub(crate) is_tech: bool,
     pub(crate) dob: Option<String>,
     pub(crate) weight: Option<String>,
     pub(crate) sex: Option<String>,
+    pub(crate) roles: HashMap<String, String>,
 }
 
 #[post("/user", data = "<data>")]
@@ -91,7 +106,6 @@ async fn update(
 #[derive(FromForm)]
 struct UserAddForm<'r> {
     name: &'r str,
-    is_guest: bool,
 }
 
 #[post("/user/new", data = "<data>")]
@@ -100,7 +114,7 @@ async fn create(
     data: Form<UserAddForm<'_>>,
     _admin: AdminUser,
 ) -> Flash<Redirect> {
-    if User::create(db, data.name, data.is_guest).await {
+    if User::create(db, data.name).await {
         Flash::success(Redirect::to("/admin/user"), "Successfully created user")
     } else {
         Flash::error(

src/tera/boatdamage.rs

@@ -13,7 +13,7 @@ use crate::{
     model::{
         boat::Boat,
         boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
-        user::{CoxUser, NonGuestUser, TechUser, User},
+        user::{CoxUser, NonGuestUser, TechUser, User, UserWithRoles},
     },
     tera::log::KioskCookie,
 };
@@ -57,7 +57,10 @@ async fn index(
 
     context.insert("boatdamages", &boatdamages);
     context.insert("boats", &boats);
-    context.insert("loggedin_user", &user.user);
+    context.insert(
+        "loggedin_user",
+        &UserWithRoles::from_user(user.user, db).await,
+    );
 
     Template::render("boatdamages", context.into_json())
 }

src/tera/ergo.rs

@@ -18,7 +18,7 @@ use tera::Context;
 
 use crate::model::{
     log::Log,
-    user::{AdminUser, User},
+    user::{AdminUser, User, UserWithRoles},
 };
 
 #[derive(Serialize)]
@@ -51,7 +51,7 @@ async fn send(db: &State<SqlitePool>, _user: AdminUser) -> Template {
 
     Template::render(
         "ergo.final",
-        context!(loggedin_user: &_user.user, thirty, dozen),
+        context!(loggedin_user: &UserWithRoles::from_user(_user.user, db).await, thirty, dozen),
     )
 }
 
@@ -120,7 +120,7 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
-    context.insert("loggedin_user", &user);
+    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
     context.insert("users", &users);
     context.insert("thirty", &thirty);
     context.insert("dozen", &dozen);

src/tera/log.rs

@@ -23,7 +23,7 @@ use crate::model::{
         LogbookUpdateError,
     },
     logtype::LogType,
-    user::{NonGuestUser, User, UserWithWaterStatus},
+    user::{NonGuestUser, User, UserWithRoles, UserWithWaterStatus},
 };
 
 pub struct KioskCookie(String);
@@ -76,7 +76,10 @@ async fn index(
     context.insert("coxes", &coxes);
     context.insert("users", &users);
     context.insert("logtypes", &logtypes);
-    context.insert("loggedin_user", &user.user);
+    context.insert(
+        "loggedin_user",
+        &UserWithRoles::from_user(user.user, db).await,
+    );
     context.insert("on_water", &on_water);
     context.insert("distances", &distances);
 
@@ -87,7 +90,10 @@ async fn index(
 async fn show(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
     let logs = Logbook::completed(db).await;
 
-    Template::render("log.completed", context!(logs, loggedin_user: &user.user))
+    Template::render(
+        "log.completed",
+        context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await),
+    )
 }
 
 #[get("/show")]
@@ -232,7 +238,7 @@ async fn create_kiosk(
     )
     .await;
 
-    create_logbook(db, data, &NonGuestUser::try_from(creator).unwrap()).await //TODO: fixme
+    create_logbook(db, data, &NonGuestUser { user: creator }).await //TODO: fixme
 }
 
 async fn home_logbook(
@@ -279,12 +285,11 @@ async fn home_kiosk(
         db,
         data,
         logbook_id,
-        &NonGuestUser::try_from(
-            User::find_by_id(db, logbook.shipmaster as i32)
+        &NonGuestUser {
+            user: User::find_by_id(db, logbook.shipmaster as i32)
                 .await
                 .unwrap(), //TODO: fixme
-        )
-        .unwrap(),
+        },
     )
     .await
 }

src/tera/mod.rs

@@ -16,7 +16,7 @@ use crate::model::{
     log::Log,
     tripdetails::TripDetails,
     triptype::TripType,
-    user::User,
+    user::{User, UserWithRoles},
     usertrip::{UserTrip, UserTripDeleteError, UserTripError},
 };
 
@@ -47,7 +47,7 @@ async fn wikiauth(db: &State<SqlitePool>, login: Form<LoginForm<'_>>) -> String
 async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_>>) -> Template {
     let mut context = Context::new();
 
-    if user.is_cox || user.is_admin {
+    if user.has_role(db, "cox").await || user.has_role(db, "admin").await {
         let triptypes = TripType::all(db).await;
         context.insert("trip_types", &triptypes);
     }
@@ -57,8 +57,8 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
+    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
 
-    context.insert("loggedin_user", &user);
     context.insert("days", &days);
     Template::render("index", context.into_json())
 }

src/tera/stat.rs

@@ -4,7 +4,7 @@ use sqlx::SqlitePool;
 
 use crate::model::{
     stat::{self, Stat},
-    user::NonGuestUser,
+    user::{NonGuestUser, UserWithRoles},
 };
 
 use super::log::KioskCookie;
@@ -16,7 +16,7 @@ async fn index_boat(db: &State<SqlitePool>, user: NonGuestUser, year: Option<i32
 
     Template::render(
         "stat.boats",
-        context!(loggedin_user: &user.user, stat, kiosk),
+        context!(loggedin_user: &UserWithRoles::from_user(user.user, db).await, stat, kiosk),
     )
 }
 
@@ -41,7 +41,7 @@ async fn index(db: &State<SqlitePool>, user: NonGuestUser, year: Option<i32>) ->
 
     Template::render(
         "stat.people",
-        context!(loggedin_user: &user.user, stat, personal, kiosk, guest_km),
+        context!(loggedin_user: &UserWithRoles::from_user(user.user, db).await, stat, personal, kiosk, guest_km),
     )
 }