Fix adding of roles

.devcontainer/devcontainer.json

@@ -15,7 +15,7 @@
 	// "features": {},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [5432],
+	"forwardPorts": [5432],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "rustc --version",

backend/src/main.rs

@@ -16,7 +16,7 @@ use error_handling::AppError;
 use middlewares::inject_user_data;
 use google_oauth::{login, logout, google_auth_return};
 use routes::{dashboard, index, about, profile, user_profile, useradmin};
-use user::UserData;
+use user::{add_user_role, delete_user_role, UserData};
 
 #[derive(Clone)]
 pub struct AppState {
@@ -50,6 +50,8 @@ async fn main() {
         .route("/profile", get(profile))
         .route("/useradmin", get(useradmin))
         .route("/users/:user_id", get(user_profile))
+        .route("/roles/:user_id/:role_id/add", get(add_user_role))
+        .route("/roles/:user_role_id/delete", get(delete_user_role))
         .nest_service("/assets", ServeDir::new("templates/assets")
             .fallback(get_service(ServeDir::new("templates/assets"))))
         .route("/", get(index))

backend/src/middlewares.rs

@@ -85,7 +85,7 @@ pub async fn is_authorized(path: &str, user_data: Option<UserData>, db_pool: Sql
                 // loop through path to find a permission
                 let mut remaining_path = Path::new(path);
                 loop {
-                    let query: Result<(String,), _> = sqlx::query_as(r#"select r.item from role_permissions r join user_roles ur on ur.role_id = r.role_id left join users u on u.id = ur.user_id where item = ?"#)
+                    let query: Result<(String,), _> = sqlx::query_as(r#"select r.item from role_permissions r where item = ?"#)
                     .bind(remaining_path.to_str().unwrap())
                     .fetch_one(&db_pool)
                     .await;

backend/src/routes.rs

@@ -3,7 +3,7 @@ use axum::{extract::{Path, State}, response::{Html, IntoResponse, Redirect}, Ext
 use http::StatusCode;
 use sqlx::SqlitePool;
 
-use crate::{middlewares::is_authorized, user::{get_user_roles, get_user_roles_display}, UserData};
+use crate::{middlewares::is_authorized, user::{get_other_roles_display, get_user_roles_display}, UserData};
 
 #[derive(Template)]
 #[template(path = "profile.html")]
@@ -19,7 +19,8 @@ struct UserProfileTemplate {
     logged_in: bool,
     name: String,
     user: UserData,
-    user_roles: Vec<crate::user::UserRolesDisplay>
+    user_roles: Vec<crate::user::UserRolesDisplay>,
+    non_user_roles: Vec<crate::user::UserRolesDisplay>
 }
 
 struct HtmlTemplate<T>(T);
@@ -136,8 +137,11 @@ pub async fn profile(
         // Get user roles
         let user_roles = get_user_roles_display(user_id, &db_pool.clone()).await;
 
+        // Get roles user does not have
+        let non_user_roles = get_other_roles_display(user_id, &db_pool.clone()).await;
+
         // Create the profile template.
-        let template = UserProfileTemplate { logged_in, name, user: user, user_roles };
+        let template = UserProfileTemplate { logged_in, name, user: user, user_roles , non_user_roles};
         return HtmlTemplate(template).into_response()
     } else {
         Redirect::to("/").into_response()

backend/src/user.rs

@@ -1,7 +1,16 @@
+use askama_axum::IntoResponse;
+use axum::{
+    extract::{Path, State},
+    response::Redirect,
+    Extension,
+};
+use chrono::Utc;
 ///User related structs and functions
 use serde::{Deserialize, Serialize};
 use sqlx::{prelude::FromRow, SqlitePool};
 
+use crate::middlewares::is_authorized;
+
 #[derive(Default, Clone, Debug, FromRow, Serialize, Deserialize)]
 pub struct UserData {
     pub id: i64,
@@ -44,9 +53,12 @@ pub struct UserRolesDisplay {
     pub created_by: i64,
     pub updated_at: i64,
     pub updated_by: i64,
-    pub role: String,
+    pub user_id: i64,
+    pub user_name: String,
+    pub role_id: i64,
+    pub role_name: String,
 }
-
+/* 
 pub async fn get_user_roles(user_id: i64, db_pool: &SqlitePool) -> Vec<UserRoles> {
     // Get user roles
     let user_roles = sqlx::query_as(
@@ -58,12 +70,12 @@ pub async fn get_user_roles(user_id: i64, db_pool: &SqlitePool) -> Vec<UserRoles
     .unwrap();
 
     user_roles
-}
+} */
 
 pub async fn get_user_roles_display(user_id: i64, db_pool: &SqlitePool) -> Vec<UserRolesDisplay> {
     // Get user roles
     let user_roles = sqlx::query_as(
-        r#"select r.id, r.name as role, r.created_at, r.created_by, r.updated_at, r.updated_by from roles r join user_roles ur on ur.role_id = r.id WHERE ur.user_id = ?"#
+        r#"select ur.id, u.id as user_id, u.name as user_name, r.id as role_id, r.name as role_name, r.created_at, r.created_by, r.updated_at, r.updated_by from roles r join user_roles ur on ur.role_id = r.id join users u on u.id = ur.user_id WHERE ur.user_id = ?"#
     )
     .bind(user_id)
     .fetch_all(db_pool)
@@ -71,4 +83,57 @@ pub async fn get_user_roles_display(user_id: i64, db_pool: &SqlitePool) -> Vec<U
     .unwrap();
 
     user_roles
-}
+}
+
+pub async fn get_other_roles_display(user_id: i64, db_pool: &SqlitePool) -> Vec<UserRolesDisplay> {
+    // Get roles user does not have
+    let user_roles = sqlx::query_as(
+        r#"select 0 as id, r.created_at, r.created_by, r.updated_at, r.updated_by, ? as user_id, '' as user_name, r.id as role_id, r.name as role_name from roles r where r.id not in (select ur.role_id from user_roles ur where ur.user_id = ?)"#
+    )
+    .bind(user_id.clone())
+    .bind(user_id)
+    .fetch_all(db_pool)
+    .await
+    .unwrap();
+
+    user_roles
+}
+
+pub async fn add_user_role(
+    Path((user_id, role_id)): Path<(i64, i64)>,
+    State(db_pool): State<SqlitePool>,
+    Extension(user_data): Extension<Option<UserData>>,
+) -> impl IntoResponse {
+    if is_authorized("/roles", user_data.clone(), db_pool.clone()).await {
+        let now = Utc::now().timestamp();
+
+        println!("Adding role {} to user {}", role_id, user_id);
+
+        sqlx::query("INSERT INTO user_roles (created_at, created_by, updated_at, updated_by, user_id, role_id) VALUES (?, ?, ?, ?, ?, ?)")
+        .bind(now)// Created now
+        .bind(user_data.as_ref().unwrap().id)// Created by current user
+            .bind(now) // Updated now
+            .bind(user_data.as_ref().unwrap().id) // Updated by current user
+            .bind(user_id)
+            .bind(role_id)
+            .execute(&db_pool)
+            .await
+            .unwrap();
+    }
+    Redirect::to("/").into_response()
+}
+
+pub async fn delete_user_role(
+    Path(user_role_id): Path<i64>,
+    State(db_pool): State<SqlitePool>,
+    Extension(user_data): Extension<Option<UserData>>,
+) -> impl IntoResponse {
+    if is_authorized("/roles", user_data, db_pool.clone()).await {
+        sqlx::query("DELETE FROM user_roles WHERE id = ?")
+            .bind(user_role_id)
+            .execute(&db_pool)
+            .await
+            .unwrap();
+    }
+    Redirect::to("/").into_response()
+}

backend/templates/user.html

@@ -8,18 +8,29 @@ Family name: {{ user.family_name }}<br/>
 Your email address: {{ user.email }}<br/>
 <br/>
 <h2>User Roles</h2>
-<table>
+<button type="button" class="btn btn-primary">Edit</button>
+<button type="button" class="btn btn-primary">Add</button>
+<table class="table table-striped table-bordered">
     <thead>
         <tr>
             <th scope="col">ID</th>
             <th scope="col">Name</th>
+            <th scope="col"></th>
         </tr>
     </thead>
     <tbody>
         {% for user_role in user_roles %}
         <tr>
-            <td><a href="/roles/{{ user_role.id }}">{{ user_role.id }}</a></td>
-            <td>{{ user_role.role }}</td>
+            <td><a href="/roles/{{ user_role.role_id }}">{{ user_role.id }}</a></td>
+            <td>{{ user_role.role_name }}</td>
+            <td><a href="/roles/{{ user_role.id }}/delete">Delete</a></td>
+        </tr>
+        {% endfor %}
+        {% for non_user_role in non_user_roles %}
+        <tr>
+            <td>New</td>
+            <td>{{ non_user_role.role_name }}</td>
+            <td><a href="/roles/{{ non_user_role.user_id }}/{{ non_user_role.role_id }}/add">Add</a></td>
         </tr>
         {% endfor %}
     </tbody>

backend/templates/useradmin.html

@@ -2,7 +2,7 @@
 {% block title %}User Administration{% endblock %}
 {% block center %}
 <h1>Users</h1>
-<table class="table table-striped">
+<table class="table table-striped table-bordered">
     <thead>
         <tr>
             <th scope="col">ID</th>