π The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
Fix /users/id, work with @me and /:id with the same controller, better errors handler
Smaug#6739fd2ea48be227
diff --git a/backend/controllers/users.controller.go b/backend/controllers/users.controller.goindex 18f4eb73..1e848595 100644--- a/backend/controllers/users.controller.go+++ b/backend/controllers/users.controller.go@@ -15,7 +15,6 @@ import (type UserController interface {GetUsers(c *gin.Context) (int, any)- GetMe(c *gin.Context) (int, any)GetUserById(c *gin.Context) (int, any)CreateUser(c *gin.Context) (int, any)UpdateUser(c *gin.Context) (int, any)@@ -52,26 +51,6 @@ func (ctr *UserControllerImpl) GetUsers(c *gin.Context) (int, any) {return http.StatusOK, users}-// GetMe-// @Summary Get current user information-// @Method GET-// @Router /users/@me [get]-// @Security Authenfification: Auth-// @Success 200 {object} Success(models.User)-// @Failure 400 {object} Error-// @Failure 401 {object} Error-func (ctr *UserControllerImpl) GetMe(c *gin.Context) (int, any) {- userId, exists := c.Get("user_id")- if !exists {- return http.StatusUnauthorized, errors.New("user ID not found in context")- }- user, err := ctr.user_service.GetUserById(userId.(int64))- if err != nil {- return http.StatusInternalServerError, err- }- return http.StatusOK, user-}-// Get User by ID// @Summary Get user by ID// @Method GET@@ -82,9 +61,9 @@ func (ctr *UserControllerImpl) GetMe(c *gin.Context) (int, any) {// @Failure 400 {object} Error// @Failure 401 {object} Errorfunc (ctr *UserControllerImpl) GetUserById(c *gin.Context) (int, any) {- id, err := utils.GetUserIdParam(c.Param("id"), c)+ id, err := utils.SelfOrPermission(c, utils.ADMINISTRATOR)if err != nil {- return http.StatusBadRequest, errors.New("invalid user ID")+ return http.StatusBadRequest, err}user, err := ctr.user_service.GetUserById(id)if err != nil {diff --git a/backend/router/routes/users.go b/backend/router/routes/users.goindex 57b1da90..d0dc9e5b 100644--- a/backend/router/routes/users.go+++ b/backend/router/routes/users.go@@ -16,8 +16,7 @@ func Users(app *app.App, router *gin.RouterGroup) {usr.Use()usr.GET("/", middlewares.Auth(), middlewares.Admin(), utils.WP(usrCtrl.GetUsers))- usr.GET("/@me", middlewares.Auth(), utils.WP(usrCtrl.GetMe))- usr.GET("/:id", middlewares.Auth(), middlewares.Admin(), utils.WP(usrCtrl.GetUserById))+ usr.GET("/:id", middlewares.Auth(), utils.WP(usrCtrl.GetUserById))usr.POST("/", utils.WP(usrCtrl.CreateUser))usr.PATCH("/:id", middlewares.Auth(), utils.WP(usrCtrl.UpdateUser))usr.PATCH("/:id/password", middlewares.Auth(), utils.WP(usrCtrl.UpdatePassword))