Pārlūkot izejas kodu

review comments

Tobias Cudnik 2 gadi atpakaļ
vecāks
revīzija
90bebb0974
1 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. 5 5
      controllers/user.go

+ 5 - 5
controllers/user.go

@@ -290,16 +290,16 @@ func updateUserNetworks(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 		return
 	}
 	}
-	var userchange models.User
+	var userChange *models.User
 	// we decode our body request params
 	// we decode our body request params
-	err = json.NewDecoder(r.Body).Decode(&userchange)
+	err = json.NewDecoder(r.Body).Decode(userChange)
 	if err != nil {
 	if err != nil {
 		logger.Log(0, username, "error decoding request body: ",
 		logger.Log(0, username, "error decoding request body: ",
 			err.Error())
 			err.Error())
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 		return
 	}
 	}
-	err = logic.UpdateUserNetworks(userchange.Networks, userchange.Groups, userchange.IsAdmin, &models.ReturnUser{
+	err = logic.UpdateUserNetworks(userChange.Networks, userChange.Groups, userChange.IsAdmin, &models.ReturnUser{
 		Groups:   user.Groups,
 		Groups:   user.Groups,
 		IsAdmin:  user.IsAdmin,
 		IsAdmin:  user.IsAdmin,
 		Networks: user.Networks,
 		Networks: user.Networks,
@@ -314,14 +314,14 @@ func updateUserNetworks(w http.ResponseWriter, r *http.Request) {
 	}
 	}
 	logger.Log(1, username, "status was updated")
 	logger.Log(1, username, "status was updated")
 	// re-read and return the new user struct
 	// re-read and return the new user struct
-	userUpdated, err := logic.GetUser(username)
+	userChange, err = logic.GetUser(username)
 	if err != nil {
 	if err != nil {
 		logger.Log(0, username,
 		logger.Log(0, username,
 			"failed to fetch user: ", err.Error())
 			"failed to fetch user: ", err.Error())
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 		return
 	}
 	}
-	json.NewEncoder(w).Encode(userUpdated)
+	json.NewEncoder(w).Encode(userChange)
 }
 }
 
 
 // swagger:route PUT /api/users/{username} user updateUser
 // swagger:route PUT /api/users/{username} user updateUser