Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

Fixes bug in getUsers(). Adds helper funnction.

Browse source
This commit is contained in:
smavros 2019-06-10 16:47:46 +02:00
parent 8e2bfe3f47
commit b74b5f3a44
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/utilities.go
View file

@ -125,3 +125,12 @@ func AuthenticateForTest(t *testing.T, router *gin.Engine, url string, method st
return body_data["token"].(string) return body_data["token"].(string)
} }
// Read the parameter with name paramName from the gin Context and
// return it as uint variable
func UintParamFromCtx(c *gin.Context, paramName string) (uint, error) {
param, err := strconv.Atoi(c.Param(paramName))
return uint(param), err
}

15
routes/user/userEndpoints.go
View file

@ -5,7 +5,6 @@ import (
"github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"net/http" "net/http"
"strconv"
"time" "time"
"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/common" "git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/common"
@ -238,7 +237,7 @@ func addUser(c *gin.Context) {
// @Router /users/{userID} [put] // @Router /users/{userID} [put]
func updateUser(c *gin.Context) { func updateUser(c *gin.Context) {
err := common.ValidateRole(c, common.ModelUser, common.Read) err := common.ValidateRole(c, common.ModelUser, common.Update)
if err != nil { if err != nil {
c.JSON(http.StatusUnprocessableEntity, fmt.Sprintf("%v", err)) c.JSON(http.StatusUnprocessableEntity, fmt.Sprintf("%v", err))
return return
@ -246,8 +245,8 @@ func updateUser(c *gin.Context) {
// Find the user // Find the user
var user User var user User
toBeUpdatedID, _ := strconv.ParseInt(c.Param("UserID"), 10, 64) toBeUpdatedID, _ := common.UintParamFromCtx(c, "UserID")
err = user.ByID(uint(toBeUpdatedID)) err = user.ByID(toBeUpdatedID)
if err != nil { if err != nil {
c.JSON(http.StatusNotFound, fmt.Sprintf("%v", err)) c.JSON(http.StatusNotFound, fmt.Sprintf("%v", err))
return return
@ -258,11 +257,13 @@ func updateUser(c *gin.Context) {
// in the context from the Authentication middleware) // in the context from the Authentication middleware)
userID, _ := c.Get(common.UserIDCtx) userID, _ := c.Get(common.UserIDCtx)
userRole, _ := c.Get(common.UserRoleCtx) userRole, _ := c.Get(common.UserRoleCtx)
if toBeUpdatedID != userID && userRole != "Admin" { if toBeUpdatedID != userID && userRole != "Admin" {
c.JSON(http.StatusForbidden, gin.H{ c.JSON(http.StatusForbidden, gin.H{
"success": false, "success": false,
"message": "Invalid authorization", "message": "Invalid authorization",
}) })
return
} }
// Bind the (context) with the User struct // Bind the (context) with the User struct
@ -335,9 +336,9 @@ func getUser(c *gin.Context) {
} }
var user User var user User
id, _ := strconv.ParseInt(c.Param("UserID"), 10, 64) id, _ := common.UintParamFromCtx(c, "UserID")
err = user.ByID(uint(id)) err = user.ByID(id)
if err != nil { if err != nil {
c.JSON(http.StatusNotFound, fmt.Sprintf("%v", err)) c.JSON(http.StatusNotFound, fmt.Sprintf("%v", err))
return return
@ -370,7 +371,7 @@ func deleteUser(c *gin.Context) {
} }
var user User var user User
id, _ := strconv.ParseInt(c.Param("UserID"), 10, 64) id, _ := common.UintParamFromCtx(c, "UserID")
// Check that the user exist // Check that the user exist
err = user.ByID(uint(id)) err = user.ByID(uint(id))