Use new API for uploading files

Better handling around empty responses from the new API

file.go

@@ -29,62 +29,50 @@ func (c *UserContext) CheckFileExists(filePath string) error {
 }
 
 // CreateFile (user) creates the provided file for the session user
-func (c *UserContext) CreateFile(uploadToPath string, filePath string) error {
-	return c.CreateFiles(uploadToPath, filePath)
-}
-
-// CreateFiles (user) creates the provided files for the session user
-func (c *UserContext) CreateFiles(uploadToPath string, filePaths ...string) error {
-	if len(filePaths) == 0 {
-		return fmt.Errorf("no files provided")
-	}
-
-	counter := 0
+//
+// Example: CreateFile("/domains/domain.tld/public_html/file.zip", "file.zip")
+func (c *UserContext) CreateFile(uploadToPath string, localFilePath string) error {
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
-
 	writer.FormDataContentType()
 
-	for _, filePath := range filePaths {
-		var err error
-		filePath, err = filepath.Abs(filePath)
-		if err != nil {
-			return fmt.Errorf("failed to resolve file: %w", err)
-		}
+	var err error
 
-		file, err := os.Open(filePath)
-		if err != nil {
-			return fmt.Errorf("failed to open file: %w", err)
-		}
-		defer file.Close()
+	localFilePath, err = filepath.Abs(localFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to resolve file: %w", err)
+	}
 
-		part, err := writer.CreateFormFile("file"+cast.ToString(counter), filepath.Base(file.Name()))
-		if err != nil {
-			return fmt.Errorf("failed to create file in form: %w", err)
-		}
+	file, err := os.Open(localFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to open file: %w", err)
+	}
+	defer file.Close()
 
-		if _, err = io.Copy(part, file); err != nil {
-			return fmt.Errorf("failed to create file: %w", err)
-		}
+	part, err := writer.CreateFormFile("file", filepath.Base(file.Name()))
+	if err != nil {
+		return fmt.Errorf("failed to create file in form: %w", err)
 	}
 
-	writer.Close()
+	if _, err = io.Copy(part, file); err != nil {
+		return fmt.Errorf("failed to create file: %w", err)
+	}
 
-	var response apiGenericResponse
+	if err = writer.Close(); err != nil {
+		return err
+	}
+
+	var response apiGenericResponseN
 
 	// add / to the beginning of uploadToPath if it doesn't exist
 	if uploadToPath[0] != '/' {
 		uploadToPath = "/" + uploadToPath
 	}
 
-	if _, err := c.uploadFile(http.MethodPost, "/CMD_FILE_MANAGER?action=upload&path="+uploadToPath, body.Bytes(), &response, writer.FormDataContentType()); err != nil {
+	if _, err = c.uploadFile(http.MethodPost, "/api/filemanager/upload?path="+uploadToPath, body.Bytes(), &response, writer.FormDataContentType()); err != nil {
 		return err
 	}
 
-	if response.Success != "Upload successful" {
-		return fmt.Errorf("failed to create file: %v", response.Result)
-	}
-
 	return nil
 }
 

http.go

@@ -188,7 +188,7 @@ func (c *UserContext) uploadFile(method string, endpoint string, data []byte, ob
 		return nil, fmt.Errorf("error making request: %w", err)
 	}
 
-	if resp != nil && object != nil {
+	if resp != nil && len(resp) > 0 && object != nil {
 		if err = json.Unmarshal(resp, &object); err != nil {
 			return nil, fmt.Errorf("error unmarshalling response: %w", err)
 		}