Getting device name from user in URL instead of request body suring d…

…evice edit.
gluster · Aug 2, 2018 · 4e15ee9 · 4e15ee9
1 parent 05a2531
commit 4e15ee9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/plugins/device/api/req.go b/plugins/device/api/req.go
@@ -15,6 +15,5 @@ type AddDeviceReq struct {
 
 // EditDeviceReq structure
 type EditDeviceReq struct {
-	DeviceName string `json:"device-name"`
-	State      string `json:"state"`
+	State string `json:"state"`
 }
diff --git a/plugins/device/rest.go b/plugins/device/rest.go
@@ -148,6 +148,12 @@ func deviceEditHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	deviceName := r.URL.Query().Get("device")
+	if deviceName == "" {
+		restutils.SendHTTPError(ctx, w, http.StatusBadRequest, "Device name not provided in URL")
+		return
+	}
+
 	txn, err := transaction.NewTxnWithLocks(ctx, peerID)
 	if err != nil {
 		status, err := restutils.ErrToStatusCode(err)
@@ -156,7 +162,7 @@ func deviceEditHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	defer txn.Done()
 
-	err = deviceutils.SetDeviceState(peerID, req.DeviceName, req.State)
+	err = deviceutils.SetDeviceState(peerID, deviceName, req.State)
 	if err != nil {
 		logger.WithError(err).WithField("peerid", peerID).Error("Failed to update device state in store")
 		status, err := restutils.ErrToStatusCode(err)