Fix error with creating new devices after login

oxtyped · Nov 28, 2022 · bab2086 · bab2086
1 parent 3eaf882
commit bab2086
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/pkg/apis/handlers.go b/pkg/apis/handlers.go
@@ -194,11 +194,18 @@ func (d *DeviceAPI) HandleGetDevices(w http.ResponseWriter, r *http.Request) {
 
 	}
 
-	devicesOutput, err := json.Marshal(deviceSlice)
-	if err != nil {
-		log.Printf("error marshalling devices: %#v", err)
-		w.WriteHeader(400)
-		return
+	var devicesOutput []byte
+
+	if len(deviceSlice) == 0 {
+		devicesOutput = []byte("[]")
+	} else {
+
+		devicesOutput, err = json.Marshal(deviceSlice)
+		if err != nil {
+			log.Printf("error marshalling devices: %#v", err)
+			w.WriteHeader(400)
+			return
+		}
 	}
 
 	w.Write(devicesOutput)