Add submenu and icons for debug functionality, move admin pages into main sidedraw, reuse lachlans password change dialog

Author: NHAS

adminui/structs.go

@@ -26,8 +26,8 @@ type LogLinesDTO struct {
 }
 
 type ChangePasswordRequestDTO struct {
-	CurrentPassword string
-	NewPassword     string
+	CurrentPassword string `json:"current_password"`
+	NewPassword     string `json:"new_password"`
 }
 
 type RegistrationTokenRequestDTO struct {
@@ -38,11 +38,6 @@ type RegistrationTokenRequestDTO struct {
 	Uses       int
 }
 
-type ChangePasswordResponseDTO struct {
-	Message string
-	Type    int
-}
-
 type UsersData struct {
 	Username  string   `json:"username"`
 	Devices   int      `json:"devices"`

adminui/ui_webserver.go

@@ -477,40 +477,33 @@ func (au *AdminUI) changePassword(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var d ChangePasswordResponseDTO
-	d.Type = 0
-	d.Message = "Success!"
-
-	defer func() {
-		w.Header().Set("content-type", "application/json")
-		json.NewEncoder(w).Encode(d)
-	}()
+	var (
+		err error
+	)
+	defer func() { au.respond(err, w) }()
 
 	var req ChangePasswordRequestDTO
-	err := json.NewDecoder(r.Body).Decode(&r)
+	err = json.NewDecoder(r.Body).Decode(&r)
 	r.Body.Close()
 	if err != nil {
-		d.Message = "Failed"
-		d.Type = 1
-
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
 	err = data.CompareAdminKeys(u.Username, req.CurrentPassword)
 	if err != nil {
 		log.Println("bad password for admin")
-
-		d.Message = "Current password is incorrect"
-		d.Type = 1
+		err = errors.New("current password is incorrect")
+		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
 
 	err = data.SetAdminPassword(u.Username, req.NewPassword)
 	if err != nil {
 		log.Println("unable to set new admin password for ", u.Username)
 
-		d.Message = "Error: " + err.Error()
-		d.Type = 1
+		err = fmt.Errorf("error setting password: %w", err)
+		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}