Auto-commit 2026-04-27 19:13

internal/mail/client.go

@@ -24,32 +24,39 @@ func NewClient(apiClient *api.ProtonMailClient) *Client {
 }
 
 func (c *Client) ListMessages(req ListMessagesRequest) (*ListMessagesResponse, error) {
-	params := url.Values{}
-	params.Set("Page", fmt.Sprintf("%d", req.Page))
-	params.Set("PageSize", fmt.Sprintf("%d", req.PageSize))
-	params.Set("Passphrase", req.Passphrase)
+	body := map[string]interface{}{
+		"Page":       req.Page,
+		"PageSize":   req.PageSize,
+		"Passphrase": req.Passphrase,
+	}
 
 	if req.Folder != FolderInbox {
-		params.Set("Type", fmt.Sprintf("%d", req.Folder))
+		body["Type"] = int(req.Folder)
 	}
 
 	if req.Starred != nil {
-		params.Set("Starred", fmt.Sprintf("%t", *req.Starred))
+		body["Starred"] = *req.Starred
 	}
 
 	if req.Read != nil {
-		params.Set("Read", fmt.Sprintf("%t", *req.Read))
+		body["Read"] = *req.Read
 	}
 
 	if req.Since > 0 {
-		params.Set("Since", fmt.Sprintf("%d", req.Since))
+		body["Since"] = req.Since
 	}
 
-	reqURL := fmt.Sprintf("%s/api/messages?%s", c.baseURL, params.Encode())
-	httpReq, err := http.NewRequest("GET", reqURL, nil)
+	jsonBody, err := json.Marshal(body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	reqURL := fmt.Sprintf("%s/api/messages", c.baseURL)
+	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
+	httpReq.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.apiClient.Do(httpReq)
 	if err != nil {
@@ -57,13 +64,13 @@ func (c *Client) ListMessages(req ListMessagesRequest) (*ListMessagesResponse, e
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read response: %w", err)
 	}
 
 	var result ListMessagesResponse
-	if err := json.Unmarshal(body, &result); err != nil {
+	if err := json.Unmarshal(respBody, &result); err != nil {
 		return nil, fmt.Errorf("failed to parse response: %w", err)
 	}
 
@@ -71,14 +78,21 @@ func (c *Client) ListMessages(req ListMessagesRequest) (*ListMessagesResponse, e
 }
 
 func (c *Client) GetMessage(messageID string, passphrase string) (*Message, error) {
-	params := url.Values{}
-	params.Set("Passphrase", passphrase)
+	body := map[string]string{
+		"Passphrase": passphrase,
+	}
 
-	reqURL := fmt.Sprintf("%s/api/messages/%s?%s", c.baseURL, url.QueryEscape(messageID), params.Encode())
-	httpReq, err := http.NewRequest("GET", reqURL, nil)
+	jsonBody, err := json.Marshal(body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	reqURL := fmt.Sprintf("%s/api/messages/%s", c.baseURL, url.QueryEscape(messageID))
+	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
+	httpReq.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.apiClient.Do(httpReq)
 	if err != nil {
@@ -86,7 +100,7 @@ func (c *Client) GetMessage(messageID string, passphrase string) (*Message, erro
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read response: %w", err)
 	}
@@ -94,7 +108,7 @@ func (c *Client) GetMessage(messageID string, passphrase string) (*Message, erro
 	var result struct {
 		Data Message `json:"Data"`
 	}
-	if err := json.Unmarshal(body, &result); err != nil {
+	if err := json.Unmarshal(respBody, &result); err != nil {
 		return nil, fmt.Errorf("failed to parse response: %w", err)
 	}
 
@@ -102,34 +116,34 @@ func (c *Client) GetMessage(messageID string, passphrase string) (*Message, erro
 }
 
 func (c *Client) Send(req SendRequest) error {
-	formData := url.Values{}
-	formData.Set("Type", "0")
-	formData.Set("Passphrase", req.Passphrase)
-	formData.Set("Subject", req.Subject)
-	formData.Set("HTML", fmt.Sprintf("%t", req.HTML))
-
-	toJSON, _ := json.Marshal(req.To)
-	formData.Set("To", string(toJSON))
+	body := map[string]interface{}{
+		"Type":       "0",
+		"Passphrase": req.Passphrase,
+		"Subject":    req.Subject,
+		"HTML":       req.HTML,
+		"To":         req.To,
+		"Body":       req.Body,
+	}
 
 	if len(req.CC) > 0 {
-		ccJSON, _ := json.Marshal(req.CC)
-		formData.Set("CC", string(ccJSON))
+		body["CC"] = req.CC
 	}
 
 	if len(req.BCC) > 0 {
-		bccJSON, _ := json.Marshal(req.BCC)
-		formData.Set("BCC", string(bccJSON))
+		body["BCC"] = req.BCC
 	}
 
-	bodyData := req.Body
-	formData.Set("Body", bodyData)
+	jsonBody, err := json.Marshal(body)
+	if err != nil {
+		return fmt.Errorf("failed to marshal request: %w", err)
+	}
 
 	reqURL := fmt.Sprintf("%s/api/messages", c.baseURL)
-	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBufferString(formData.Encode()))
+	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return fmt.Errorf("failed to create request: %w", err)
 	}
-	httpReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	httpReq.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.apiClient.Do(httpReq)
 	if err != nil {
@@ -190,32 +204,33 @@ func (c *Client) PermanentlyDelete(messageID string) error {
 }
 
 func (c *Client) SaveDraft(draft Draft, passphrase string) (string, error) {
-	formData := url.Values{}
-	formData.Set("Type", "2")
-	formData.Set("Passphrase", passphrase)
-	formData.Set("Subject", draft.Subject)
-
-	toJSON, _ := json.Marshal(draft.To)
-	formData.Set("To", string(toJSON))
+	body := map[string]interface{}{
+		"Type":       "2",
+		"Passphrase": passphrase,
+		"Subject":    draft.Subject,
+		"To":         draft.To,
+		"Body":       draft.Body,
+	}
 
 	if len(draft.CC) > 0 {
-		ccJSON, _ := json.Marshal(draft.CC)
-		formData.Set("CC", string(ccJSON))
+		body["CC"] = draft.CC
 	}
 
 	if len(draft.BCC) > 0 {
-		bccJSON, _ := json.Marshal(draft.BCC)
-		formData.Set("BCC", string(bccJSON))
+		body["BCC"] = draft.BCC
 	}
 
-	formData.Set("Body", draft.Body)
+	jsonBody, err := json.Marshal(body)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal request: %w", err)
+	}
 
 	reqURL := fmt.Sprintf("%s/api/messages", c.baseURL)
-	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBufferString(formData.Encode()))
+	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return "", fmt.Errorf("failed to create request: %w", err)
 	}
-	httpReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	httpReq.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.apiClient.Do(httpReq)
 	if err != nil {
@@ -241,26 +256,28 @@ func (c *Client) SaveDraft(draft Draft, passphrase string) (string, error) {
 }
 
 func (c *Client) UpdateDraft(messageID string, draft Draft, passphrase string) error {
-	formData := url.Values{}
-	formData.Set("Passphrase", passphrase)
-	formData.Set("Subject", draft.Subject)
-
-	toJSON, _ := json.Marshal(draft.To)
-	formData.Set("To", string(toJSON))
-
-	if len(draft.CC) > 0 {
-		ccJSON, _ := json.Marshal(draft.CC)
-		formData.Set("CC", string(ccJSON))
+	body := map[string]interface{}{
+		"Passphrase": passphrase,
+		"Subject":    draft.Subject,
+		"To":         draft.To,
+		"Body":       draft.Body,
 	}
 
-	formData.Set("Body", draft.Body)
+	if len(draft.CC) > 0 {
+		body["CC"] = draft.CC
+	}
+
+	jsonBody, err := json.Marshal(body)
+	if err != nil {
+		return fmt.Errorf("failed to marshal request: %w", err)
+	}
 
 	reqURL := fmt.Sprintf("%s/api/messages/%s", c.baseURL, url.QueryEscape(messageID))
-	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBufferString(formData.Encode()))
+	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return fmt.Errorf("failed to create request: %w", err)
 	}
-	httpReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	httpReq.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.apiClient.Do(httpReq)
 	if err != nil {
@@ -310,17 +327,24 @@ func (c *Client) ListDrafts(page int, pageSize int, passphrase string) (*ListMes
 }
 
 func (c *Client) SearchMessages(req SearchRequest) (*SearchResponse, error) {
-	params := url.Values{}
-	params.Set("Query", req.Query)
-	params.Set("Page", fmt.Sprintf("%d", req.Page))
-	params.Set("PageSize", fmt.Sprintf("%d", req.PageSize))
-	params.Set("Passphrase", req.Passphrase)
+	body := map[string]interface{}{
+		"Query":      req.Query,
+		"Page":       req.Page,
+		"PageSize":   req.PageSize,
+		"Passphrase": req.Passphrase,
+	}
 
-	reqURL := fmt.Sprintf("%s/api/messages/search?%s", c.baseURL, params.Encode())
-	httpReq, err := http.NewRequest("GET", reqURL, nil)
+	jsonBody, err := json.Marshal(body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	reqURL := fmt.Sprintf("%s/api/messages/search", c.baseURL)
+	httpReq, err := http.NewRequest("POST", reqURL, bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
+	httpReq.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.apiClient.Do(httpReq)
 	if err != nil {
@@ -328,13 +352,13 @@ func (c *Client) SearchMessages(req SearchRequest) (*SearchResponse, error) {
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read response: %w", err)
 	}
 
 	var result SearchResponse
-	if err := json.Unmarshal(body, &result); err != nil {
+	if err := json.Unmarshal(respBody, &result); err != nil {
 		return nil, fmt.Errorf("failed to parse response: %w", err)
 	}