Gestion des utilisateurs

controllers/lists.go

@@ -45,7 +45,7 @@ func ListShow(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -122,7 +122,7 @@ func ListEdit(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -191,7 +191,7 @@ func ListDelete(c *fiber.Ctx) error {
 
 	result := db.Delete(&models.List{}, id)
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	return c.Redirect("/admin/lists")
@@ -213,7 +213,7 @@ func ListItemAdd(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -285,7 +285,7 @@ func ListItemEdit(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	var listItem models.ListItem
@@ -296,7 +296,7 @@ func ListItemEdit(c *fiber.Ctx) error {
 	}
 
 	if result2.Error != nil {
-		return err
+		return result2.Error
 	}
 
 	title := fmt.Sprintf(
@@ -364,12 +364,12 @@ func ListItemDelete(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	result2 := db.Delete(&models.ListItem{}, itemid)
 	if result2.Error != nil {
-		return err
+		return result2.Error
 	}
 
 	return c.Redirect(fmt.Sprintf(

controllers/mfa.go

@@ -28,10 +28,10 @@ func TotpEnrollPage(c *fiber.Ctx) error {
 	result := db.First(&user, "id = ?", userid)
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
-	if user.TotpSercet.Valid {
+	if user.TotpSecret.Valid {
 		return fiber.NewError(fiber.StatusForbidden, "Forbidden")
 	}
 
@@ -79,7 +79,7 @@ func TotpEnrollPage(c *fiber.Ctx) error {
 	if c.Method() == "POST" {
 		otp := c.FormValue("otp")
 		if totp.Validate(otp, key.Secret()) {
-			err = user.TotpSercet.Scan(key.Secret())
+			err = user.TotpSecret.Scan(key.Secret())
 			if err != nil {
 				return err
 			}
@@ -152,17 +152,17 @@ func TotpVerifyPage(c *fiber.Ctx) error {
 	result := db.First(&user, "id = ?", userid)
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
-	if !user.TotpSercet.Valid {
+	if !user.TotpSecret.Valid {
 		return fiber.NewError(fiber.StatusForbidden, "Forbidden")
 	}
 
 	var mfaError string
 	if c.Method() == "POST" {
 		otp := c.FormValue("otp")
-		if totp.Validate(otp, user.TotpSercet.String) {
+		if totp.Validate(otp, user.TotpSecret.String) {
 			redirectId := c.Query("redirect")
 			redirectUrl := "/"
 

controllers/roles.go

@@ -45,7 +45,7 @@ func RoleShow(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -134,7 +134,7 @@ func RoleEdit(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -203,7 +203,7 @@ func RoleDelete(c *fiber.Ctx) error {
 
 	result := db.Delete(&models.Role{}, id)
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	return c.Redirect("/admin/roles")

controllers/sections.go

@@ -46,7 +46,7 @@ func SectionShow(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -143,7 +143,7 @@ func SectionEdit(c *fiber.Ctx) error {
 	}
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	title := fmt.Sprintf(
@@ -220,7 +220,7 @@ func SectionDelete(c *fiber.Ctx) error {
 
 	result := db.Delete(&models.Section{}, id)
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	return c.Redirect("/admin/sections")

controllers/users.go

@@ -0,0 +1,281 @@
+package controllers
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+
+	"git.readonly.ch/bouzoure/popvaud-people/helpers"
+	"git.readonly.ch/bouzoure/popvaud-people/models"
+	"github.com/go-playground/validator"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+)
+
+type UserValidation struct {
+	Email    string `validate:"required,min=6,max=100,email"`
+	Name     string `validate:"required,min=2,max=100"`
+	Password string `validate:"required,min=10,max=100"`
+}
+
+func Users(c *fiber.Ctx) error {
+	db, err := helpers.GetDatabase()
+	if err != nil {
+		return err
+	}
+
+	var users []models.User
+	result := db.Order("name collate nocase asc").Find(&users)
+
+	if result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) {
+		return err
+	}
+
+	return c.Render("users", fiber.Map{
+		"PageTitle": "Utilisateurs",
+		"Users":     users,
+	})
+}
+
+func UserShow(c *fiber.Ctx) error {
+	id := c.Params("id")
+
+	db, err := helpers.GetDatabase()
+	if err != nil {
+		return err
+	}
+
+	var user models.User
+	result := db.Find(&user, "id = ?", id)
+
+	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+		return fiber.NewError(fiber.StatusNotFound, "Not found")
+	}
+
+	if result.Error != nil {
+		return result.Error
+	}
+
+	title := fmt.Sprintf(
+		"%s | Utilisateurs",
+		user.Name,
+	)
+
+	return c.Render("user", fiber.Map{
+		"PageTitle": title,
+		"User":      user,
+	})
+}
+
+func UserAdd(c *fiber.Ctx) error {
+	var user models.User
+	var errors []string
+
+	db, err := helpers.GetDatabase()
+	if err != nil {
+		return err
+	}
+
+	if c.Method() == "POST" {
+		data := UserValidation{
+			Email:    c.FormValue("email"),
+			Name:     c.FormValue("name"),
+			Password: c.FormValue("password"),
+		}
+
+		validate := validator.New()
+		validErrs := validate.Struct(data)
+
+		if validErrs != nil {
+			for _, validErr := range validErrs.(validator.ValidationErrors) {
+				switch validErr.Field() {
+				case "Email":
+					errors = append(errors, "L'adresse email doit être valide")
+				case "Name":
+					errors = append(errors, "Le nom doit contenir entre 2 et 100 caractères")
+				case "Password":
+					errors = append(errors, "Le mot de passe doit contenir entre 10 et 100 caractères")
+				}
+			}
+		}
+
+		user.Name = data.Name
+		user.Email = data.Email
+
+		passwordHash, err := helpers.HashPassword(data.Password)
+		if err != nil {
+			return err
+		}
+
+		user.Password = passwordHash
+		user.SkipWelcome = false
+
+		user.IsAdmin = (c.FormValue("is_admin") == "on")
+
+		if len(errors) == 0 {
+			result := db.Create(&user)
+			if result.Error != nil {
+				return result.Error
+			} else {
+				c.Redirect(fmt.Sprintf(
+					"/admin/users/%d",
+					user.ID,
+				))
+			}
+		}
+	}
+
+	return c.Render("user_form", fiber.Map{
+		"PageTitle": "Ajouter un utilisateur",
+		"User":      user,
+		"Errors":    errors,
+	})
+}
+
+func UserEdit(c *fiber.Ctx) error {
+	id := c.Params("id")
+
+	db, err := helpers.GetDatabase()
+	if err != nil {
+		return err
+	}
+
+	var user models.User
+	result := db.Find(&user, "id = ?", id)
+
+	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+		return fiber.NewError(fiber.StatusNotFound, "Not found")
+	}
+
+	if result.Error != nil {
+		return result.Error
+	}
+
+	title := fmt.Sprintf(
+		"%s | Modifier utilisateur",
+		user.Name,
+	)
+
+	var errors []string
+	if c.Method() == "POST" {
+		data := UserValidation{
+			Email:    c.FormValue("email"),
+			Name:     c.FormValue("name"),
+			Password: c.FormValue("password"),
+		}
+
+		validate := validator.New()
+		validErrs := validate.Struct(data)
+
+		if validErrs != nil {
+			for _, validErr := range validErrs.(validator.ValidationErrors) {
+				switch validErr.Field() {
+				case "Email":
+					errors = append(errors, "L'adresse email doit être valide")
+				case "Name":
+					errors = append(errors, "Le nom doit contenir entre 2 et 100 caractères")
+				case "Password":
+					if len(data.Password) > 0 {
+						errors = append(errors, "Le mot de passe doit contenir entre 10 et 100 caractères")
+					}
+				}
+			}
+		}
+
+		user.Name = data.Name
+		user.Email = data.Email
+
+		if len(data.Password) > 0 {
+			passwordHash, err := helpers.HashPassword(data.Password)
+			if err != nil {
+				return err
+			}
+
+			user.Password = passwordHash
+			user.SkipWelcome = false
+		}
+
+		if c.FormValue("reset_totp") == "on" {
+			user.TotpSecret.Valid = false
+		}
+
+		user.IsAdmin = (c.FormValue("is_admin") == "on")
+
+		var users []models.User
+		result := db.Find(&users, "is_admin = ?", true)
+		if result.Error != nil {
+			return result.Error
+		}
+
+		if !user.IsAdmin && result.RowsAffected < 2 {
+			errors = append(errors, "Il doit y avoir au moins un administrateur")
+		}
+
+		if len(errors) == 0 {
+			result2 := db.Save(&user)
+			if result2.Error != nil {
+				return result2.Error
+			} else {
+				c.Redirect(fmt.Sprintf(
+					"/admin/users/%d",
+					user.ID,
+				))
+			}
+		}
+	}
+
+	return c.Render("user_form", fiber.Map{
+		"PageTitle": title,
+		"User":      user,
+		"Errors":    errors,
+	})
+}
+
+func UserDelete(c *fiber.Ctx) error {
+	id := c.Params("id")
+
+	sess, err := helpers.GetSessionStore(c)
+	if err != nil {
+		return err
+	}
+
+	deleteUser, err := strconv.ParseUint(id, 10, 0)
+	if err != nil {
+		return err
+	}
+
+	currentUser := sess.Get("userid")
+	if deleteUser == uint64(currentUser.(uint)) {
+		return fiber.NewError(fiber.StatusForbidden, "Forbidden")
+	}
+
+	db, err := helpers.GetDatabase()
+	if err != nil {
+		return err
+	}
+
+	var user models.User
+	result := db.Find(&user, "id = ?", id)
+	if result.Error != nil {
+		return result.Error
+	}
+
+	user.Name = "Disabled Account"
+	user.Email = "disabled-account@invlalid.tld"
+	user.Password = ""
+	user.TotpSecret.Valid = false
+	user.IsAdmin = false
+	user.SkipWelcome = false
+
+	result2 := db.Save(&user)
+	if result2.Error != nil {
+		return result2.Error
+	}
+
+	result3 := db.Delete(&models.User{}, id)
+	if result3.Error != nil {
+		return result3.Error
+	}
+
+	return c.Redirect("/admin/users")
+}

controllers/welcome.go

@@ -31,7 +31,7 @@ func WelcomePage(c *fiber.Ctx) error {
 	result := db.First(&user, "id = ?", userid)
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	if user.SkipWelcome {

main.go

@@ -135,6 +135,15 @@ func main() {
 	app.Post("/admin/lists/:id<int;min(0)>/items/:itemid<int;min(0)>", controllers.ListItemEdit)
 	app.Post("/admin/lists/:id<int;min(0)>/items/:itemid<int;min(0)>/delete", controllers.ListItemDelete)
 
+	// Admin: Users
+	app.Get("/admin/users", controllers.Users)
+	app.Get("/admin/users/:id<int;min(0)>", controllers.UserShow)
+	app.Get("/admin/users/add", controllers.UserAdd)
+	app.Post("/admin/users/add", controllers.UserAdd)
+	app.Get("/admin/users/:id<int;min(0)>/edit", controllers.UserEdit)
+	app.Post("/admin/users/:id<int;min(0)>/edit", controllers.UserEdit)
+	app.Post("/admin/users/:id<int;min(0)>/delete", controllers.UserDelete)
+
 	// Admin: Roles
 	app.Get("/admin/roles", controllers.Roles)
 	app.Get("/admin/roles/:id<int;min(0)>", controllers.RoleShow)

middlewares/mfa.go

@@ -29,10 +29,10 @@ func MfaEnrollMiddleware(c *fiber.Ctx) error {
 	result := db.First(&user, "id = ?", userid)
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
-	if user.TotpSercet.Valid {
+	if user.TotpSecret.Valid {
 		return c.Next()
 	}
 

middlewares/welcome.go

@@ -28,7 +28,7 @@ func WelcomeMiddleware(c *fiber.Ctx) error {
 	result := db.First(&user, "id = ?", userid)
 
 	if result.Error != nil {
-		return err
+		return result.Error
 	}
 
 	if user.SkipWelcome {

models/users.go

@@ -11,7 +11,7 @@ type User struct {
 	Name        string
 	Email       string
 	Password    string
-	TotpSercet  sql.NullString
+	TotpSecret  sql.NullString
 	IsAdmin     bool
 	SkipWelcome bool
 }

static/main.css

@@ -23,7 +23,7 @@ img#header-logo {
 }
 
 .user-photo {
-	background-color: purple;
+	background-color: #555;
 	color: #fff;
 	display: inline-block;
 	width: 25px;

views/user.html

@@ -0,0 +1,75 @@
+{% extends "layouts/main.html" %}
+
+{% block main %}
+<div class="container mt-4">
+	<div class="mb-4">
+		<nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">Accueil</a></li>
+				<li class="breadcrumb-item"><a href="/admin">Administration</a></li>
+				<li class="breadcrumb-item"><a href="/admin/users">Utilisateurs</a></li>
+				<li class="breadcrumb-item active">{{ User.Name }}</li>
+			</ol>
+		</nav>
+		<hr>
+	</div>
+
+	<div class="mb-3">
+			<b>Nom complet</b><br>
+			{{ User.Name }}
+	</div>
+
+	<div class="mb-3">
+		<b>Email</b><br>
+		{{ User.Email }}
+	</div>
+
+	<div class="mb-3">
+		<b>Administrateur</b><br>
+		{% if User.IsAdmin %}
+			Oui
+		{% else %}
+			Non
+		{% endif %}
+	</div>	
+
+	<div class="mb-3">
+		<b>Ecran de bienvenue à la prochaine connexion</b><br>
+		{% if User.SkipWelcome %}
+			Non
+		{% else %}
+			Oui
+		{% endif %}
+	</div>
+
+	<div class="mb-3">
+		<b>Double facteur (TOTP)</b><br>
+		{% if User.TotpSecret.Valid %}
+			Enrollé
+		{% else %}
+			Enrollement lors de la prochaine connexion
+		{% endif %}
+	</div>
+
+	<div class="mt-3">
+		<a class="btn btn-md btn-primary" href="/admin/users/{{ User.ID }}/edit">
+			<i class="feather" data-feather="edit-2"></i>
+			Modifier
+		</a>
+
+		{% if User.ID != Globals.UserID %}
+		<form
+			action="/admin/users/{{ User.ID }}/delete"
+			method="post"
+			class="d-inline p-0"
+		>
+			<button class="btn btn-md btn-danger areyousure" type="submit">
+				<i class="feather" data-feather="trash-2"></i>
+				Supprimer
+			</button>
+		</form>
+		{% endif %}
+	</div>
+
+</div>
+{% endblock %}

views/user_form.html

@@ -0,0 +1,121 @@
+{% extends "layouts/main.html" %}
+
+{% block main %}
+<div class="container mt-4">
+	<div class="mb-4">
+		<nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">Accueil</a></li>
+				<li class="breadcrumb-item"><a href="/admin">Administration</a></li>
+				<li class="breadcrumb-item"><a href="/admin/users">Utilisateurs</a></li>
+
+				{% if User.ID %}				
+					<li class="breadcrumb-item"><a href="/admin/users/{{ User.ID }}">{{ User.Name }}</a></li>
+					<li class="breadcrumb-item active">Modifier</li>
+				{% else %}
+					<li class="breadcrumb-item active">Ajouter</li>
+				{% endif %}
+			</ol>
+		</nav>
+		<hr>
+	</div>
+
+	{% if Errors %}
+	<div class="alert alert-danger">
+		<ul class="m-0">
+			{% for Error in Errors %}
+				<li>{{ Error }}</li>
+			{% endfor %}
+		</ul>
+	</div>
+	{% endif %}
+	
+	<form id="user" method="post">
+
+		<div class="mb-3">
+			<label for="name" class="form-label">
+				Nom complet
+			</label>
+			<input
+				id="name"
+				class="form-control"
+				type="text"
+				name="name"
+				required
+				value="{{ User.Name }}"
+			>
+		</div>
+
+		<div class="mb-3">
+			<label for="email" class="form-label">
+				Email
+			</label>
+			<input
+				id="email"
+				class="form-control"
+				type="email"
+				name="email"
+				required
+				value="{{ User.Email }}"
+			>
+		</div>
+
+		<div class="mb-3">
+			<input
+				type="checkbox"
+				class="form-check-input me-2"
+				id="is_admin"
+				name="is_admin"
+				{% if User.IsAdmin %}checked{% endif %}
+			>
+			<label for="is_admin" class="form-label">
+				Administrateur
+			</label>
+		</div>
+
+		<div class="mb-3">
+			<label for="password" class="form-label">
+				Mot de passe
+			</label>
+			<input
+				id="password"
+				class="form-control"
+				type="password"
+				name="password"
+				{% if !User.ID %}required{% endif %}
+			>
+			{% if User.ID %}	
+			<div class="form-text">
+				Laisser vide pour ne pas changer
+			</div>
+			{% endif %}
+		</div>
+
+		{% if User.ID %}	
+		<div class="mb-3">
+			<input
+				type="checkbox"
+				class="form-check-input me-2"
+				id="reset_totp"
+				name="reset_totp"
+			>
+			<label for="reset_totp" class="form-label">
+				Réinitialiser le double facteur (TOTP)
+			</label>
+			<div class="form-text">
+				Si la case est cochée, l'utilisateur devra effectuer
+				un enrollement TOTP à la prochaine connexion.
+			</div>
+		</div>
+		{% endif %}
+
+		<div class="mt-3">
+			<button class="btn btn-primary" type="submit">
+				<i class="me-1" data-feather="save"></i>
+				Enregistrer
+			</button>
+		</div>
+	</form>
+
+</div>
+{% endblock %}

views/users.html

@@ -0,0 +1,64 @@
+{% extends "layouts/main.html" %}
+
+{% block main %}
+<div class="container mt-4">
+	<div class="mb-4">
+		<nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">Accueil</a></li>
+				<li class="breadcrumb-item"><a href="/admin">Administration</a></li>
+				<li class="breadcrumb-item active">Utilisateurs</li>
+			</ol>
+		</nav>
+		<hr>
+	</div>
+
+	{% if Users %}
+	<div class="table-responsive">
+		<table class="table">
+			<thead>
+				<tr>
+					<th>Nom complet</th>
+					<th>Email</th>
+					<th>Administrateur</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for User in Users %}
+				<tr>
+					<td>
+						<span class="user-photo me-2">{{ User.Name|first }}</span>
+						<a href="/admin/users/{{ User.ID }}">
+							{{ User.Name }}
+						</a>
+					</td>
+					<td>
+						{{ User.Email }}
+					</td>
+					<td>
+						{% if User.IsAdmin %}
+							Oui
+						{% else %}
+							Non
+						{% endif %}					
+					</td>
+				</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	</div>
+	{% else %}
+	<div class="my-4">
+		Pas d'utilisateurs pour le moment
+	</div>
+	{% endif %}
+
+	<div class="mt-3">
+		<a class="btn btn-md btn-primary" href="/admin/users/add">
+			<i class="feather" data-feather="plus"></i>
+			Ajouter
+		</a>
+	</div>
+
+</div>
+{% endblock %}