fix: rename sms field

Author: gsanchietti

api/routes.go

@@ -39,18 +39,18 @@ func (h handler) sendMessage(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, "invalid payload")
 	}
 
-	logger.Debug().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.SMSTo).Msg("processing send message request")
-	logger.Debug().Str("endpoint", "send_message").Str("raw_from", req.From).Str("raw_to", req.SMSTo).Msg("raw identifiers for recipient resolution")
+	logger.Debug().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.To).Msg("processing send message request")
+	logger.Debug().Str("endpoint", "send_message").Str("raw_from", req.From).Str("raw_to", req.To).Msg("raw identifiers for recipient resolution")
 
 	resp, err := h.svc.SendMessage(c.Request().Context(), &req)
 	if err != nil {
-		logger.Error().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.SMSTo).Err(err).Msg("failed to send message")
+		logger.Error().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.To).Err(err).Msg("failed to send message")
 		// Add extra context to help debugging recipient resolution
-		logger.Debug().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.SMSTo).Msg("send_message handler returning error to client; check mapping store and AS configuration")
+		logger.Debug().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.To).Msg("send_message handler returning error to client; check mapping store and AS configuration")
 		return mapServiceError(err)
 	}
 
-	logger.Info().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.SMSTo).Str("sms_id", resp.SMSID).Msg("message sent successfully")
+	logger.Info().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.To).Str("sms_id", resp.SMSID).Msg("message sent successfully")
 	return c.JSON(http.StatusOK, resp)
 }
 

docs/DEPLOY_NS8.md

@@ -131,8 +131,8 @@ After the above logins, you can send a message from giacomo to mario:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "@giacomo:synapse.gs.nethserver.net",
-    "sms_to": "@mario:synapse.gs.nethserver.net",
-    "sms_body": "Hello Mario — this is Giacomo (curl test)",
+    "to": "@mario:synapse.gs.nethserver.net",
+    "body": "Hello Mario — this is Giacomo (curl test)",
     "content_type": "text/plain"
   }'
 ```
@@ -146,8 +146,8 @@ Mario reply:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "@mario:synapse.gs.nethserver.net",
-    "sms_to": "@giacomo:synapse.gs.nethserver.net",
-    "sms_body": "Hello Giacomo — this is Mario reply (curl test)",
+    "to": "@giacomo:synapse.gs.nethserver.net",
+    "body": "Hello Giacomo — this is Mario reply (curl test)",
     "content_type": "text/plain"
   }'
 ```
@@ -180,8 +180,8 @@ Send message using mapped SMS number (91201) - Giacomo to Mario:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "@giacomo:synapse.gs.nethserver.net",
-    "sms_to": "91202",
-    "sms_body": "Hello Mario — this is Giacomo (curl test using mapped number)",
+    "to": "91202",
+    "body": "Hello Mario — this is Giacomo (curl test using mapped number)",
     "content_type": "text/plain"
   }'
 ```
@@ -190,8 +190,8 @@ Send message using mapped SMS number (91202) - Mario to Giacomo:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "@mario:synapse.gs.nethserver.net",
-    "sms_to": "91201",
-    "sms_body": "Hello Giacomo — this is Mario reply (curl test using mapped number)",
+    "to": "91201",
+    "body": "Hello Giacomo — this is Mario reply (curl test using mapped number)",
     "content_type": "text/plain"
   }'
 ```
@@ -200,8 +200,8 @@ Send message using mapped numbers - Giacomo to Mario:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "91201",
-    "sms_to": "91202",
-    "sms_body": "Hello Mario — this is Giacomo (curl test using both mapped numbers)",
+    "to": "91202",
+    "body": "Hello Mario — this is Giacomo (curl test using both mapped numbers)",
     "content_type": "text/plain"
   }'
 ```

docs/openapi.yaml

@@ -71,19 +71,19 @@ paths:
               type: object
               required:
                 - from
-                - sms_to
-                - sms_body
+                - to
+                - body
               properties:
                 from:
                   type: string
                   description: The sender - either a full Matrix ID (e.g., @user:server.com) or a phone number (e.g., +1234567890).
                 password:
                   type: string
                   description: This field is ignored. Kept for client compatibility.
-                sms_to:
+                to:
                   type: string
                   description: Recipient Matrix ID, Alias, or mapped phone number.
-                sms_body:
+                body:
                   type: string
                   description: The message content.
                 content_type:

main_test.go

@@ -365,9 +365,9 @@ func TestIntegration_SendAndFetchMessages(t *testing.T) {
 	// Step 1: Send message from USER1 to USER2
 	t.Run("SendMessage", func(t *testing.T) {
 		sendReq := models.SendMessageRequest{
-			From:    user1MatrixID,
-			SMSTo:   user2MatrixID, // Send directly to user2's Matrix ID to create a DM
-			SMSBody: fmt.Sprintf("Hello from integration test %d", time.Now().Unix()),
+			From: user1MatrixID,
+			To:   user2MatrixID, // Send directly to user2's Matrix ID to create a DM
+			Body: fmt.Sprintf("Hello from integration test %d", time.Now().Unix()),
 		}
 
 		resp, body, err := doRequest("POST", baseURL+"/api/client/send_message", sendReq, nil)
@@ -593,7 +593,7 @@ func attemptMappingsAndRetrySend(t *testing.T, baseURL, adminToken string, origS
 	// First attempt: try common variants for the From field (phone numbers)
 	fromVariants := generateMappingVariants(origSendReq.From)
 	for _, fv := range fromVariants {
-		_, err := ensureMappingVariants(t, baseURL, adminToken, fv, origSendReq.From, origSendReq.SMSTo)
+		_, err := ensureMappingVariants(t, baseURL, adminToken, fv, origSendReq.From, origSendReq.To)
 		if err == nil {
 			// Retry send with the same original request (server will resolve mapping)
 			resp, body, err := doRequest("POST", baseURL+"/api/client/send_message", origSendReq, nil)
@@ -608,9 +608,9 @@ func attemptMappingsAndRetrySend(t *testing.T, baseURL, adminToken string, origS
 
 	// Try mapping localpart@server variants for the recipient if it's not a Matrix ID
 	// (covers earlier cases where the identifier might be localpart-only)
-	if !strings.HasPrefix(origSendReq.SMSTo, "@") {
-		candidate := fmt.Sprintf("@%s:%s", getLocalpart(origSendReq.SMSTo), strings.Split(strings.TrimPrefix(origSendReq.SMSTo, "@"), ":")[0])
-		_, err := ensureMappingVariants(t, baseURL, adminToken, origSendReq.SMSTo, candidate, origSendReq.SMSTo)
+	if !strings.HasPrefix(origSendReq.To, "@") {
+		candidate := fmt.Sprintf("@%s:%s", getLocalpart(origSendReq.To), strings.Split(strings.TrimPrefix(origSendReq.To, "@"), ":")[0])
+		_, err := ensureMappingVariants(t, baseURL, adminToken, origSendReq.To, candidate, origSendReq.To)
 		if err == nil {
 			resp, body, err := doRequest("POST", baseURL+"/api/client/send_message", origSendReq, nil)
 			return resp, body, err
@@ -674,9 +674,9 @@ func TestIntegration_SendMessageWithPhoneNumberMapping(t *testing.T) {
 
 		// Step 4: Send a message using the phone number as the 'from' field
 		sendReq := models.SendMessageRequest{
-			From:    phoneNumber, // Using phone number instead of Matrix ID
-			SMSTo:   string(roomID),
-			SMSBody: fmt.Sprintf("Message from phone number %d", time.Now().Unix()),
+			From: phoneNumber, // Using phone number instead of Matrix ID
+			To:   string(roomID),
+			Body: fmt.Sprintf("Message from phone number %d", time.Now().Unix()),
 		}
 		resp, body, err := doRequest("POST", baseURL+"/api/client/send_message", sendReq, nil)
 		if err != nil {
@@ -769,9 +769,9 @@ func TestIntegration_RoomMessaging(t *testing.T) {
 
 		// Step 3: User1 sends a message to the room
 		sendReq1 := models.SendMessageRequest{
-			From:    user1MatrixID,
-			SMSTo:   string(roomID), // Send to room ID
-			SMSBody: fmt.Sprintf("Hello from user1 %d", time.Now().Unix()),
+			From: user1MatrixID,
+			To:   string(roomID), // Send to room ID
+			Body: fmt.Sprintf("Hello from user1 %d", time.Now().Unix()),
 		}
 		resp, body, err := doRequest("POST", baseURL+"/api/client/send_message", sendReq1, nil)
 		if err != nil {
@@ -795,9 +795,9 @@ func TestIntegration_RoomMessaging(t *testing.T) {
 
 		// Step 4: User2 sends a message to the room
 		sendReq2 := models.SendMessageRequest{
-			From:    user2MatrixID,
-			SMSTo:   string(roomID), // Send to room ID
-			SMSBody: fmt.Sprintf("Hello from user2 %d", time.Now().Unix()),
+			From: user2MatrixID,
+			To:   string(roomID), // Send to room ID
+			Body: fmt.Sprintf("Hello from user2 %d", time.Now().Unix()),
 		}
 		resp, body, err = doRequest("POST", baseURL+"/api/client/send_message", sendReq2, nil)
 		if err != nil {

models/messages.go

@@ -4,8 +4,8 @@ package models
 type SendMessageRequest struct {
 	From                    string `json:"from"`
 	Password                string `json:"password"`
-	SMSTo                   string `json:"sms_to"`
-	SMSBody                 string `json:"sms_body"`
+	To                      string `json:"to"`
+	Body                    string `json:"body"`
 	ContentType             string `json:"content_type"`
 	DispositionNotification string `json:"disposition_notification"`
 }

models/models_test.go

@@ -11,8 +11,8 @@ func TestSendMessageRequest_Marshal(t *testing.T) {
 	req := SendMessageRequest{
 		From:        "@user:example.com",
 		Password:    "secret",
-		SMSTo:       "@recipient:example.com",
-		SMSBody:     "Hello World",
+		To:          "@recipient:example.com",
+		Body:        "Hello World",
 		ContentType: "text/plain",
 	}
 
@@ -25,8 +25,8 @@ func TestSendMessageRequest_Marshal(t *testing.T) {
 	err = json.Unmarshal(data, &req2)
 	assert.NoError(t, err)
 	assert.Equal(t, req.From, req2.From)
-	assert.Equal(t, req.SMSTo, req2.SMSTo)
-	assert.Equal(t, req.SMSBody, req2.SMSBody)
+	assert.Equal(t, req.To, req2.To)
+	assert.Equal(t, req.Body, req2.Body)
 }
 
 func TestFetchMessagesRequest_Marshal(t *testing.T) {

service/messages.go

@@ -67,7 +67,7 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 		return nil, ErrInvalidSender
 	}
 
-	recipientStr := strings.TrimSpace(req.SMSTo)
+	recipientStr := strings.TrimSpace(req.To)
 	if recipientStr == "" {
 		logger.Warn().Msg("send message: empty recipient")
 		return nil, ErrInvalidRecipient
@@ -107,7 +107,7 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 
 	content := &event.MessageEventContent{
 		MsgType: event.MsgText,
-		Body:    req.SMSBody,
+		Body:    req.Body,
 	}
 
 	resp, err := s.matrixClient.SendMessage(ctx, sender, roomID, content)