Merge pull request #707 from nyaruka/send-errors

Make sure we handle connection error properly for WAC
nyaruka · Feb 27, 2024 · eadf5a7 · eadf5a7
2 parents e733583 + eb07c98
commit eadf5a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/handlers/meta/handlers.go b/handlers/meta/handlers.go
@@ -1071,7 +1071,11 @@ func (h *handler) requestWAC(payload whatsapp.SendRequest, accessToken string, r
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "application/json")
 
-	_, respBody, _ := h.RequestHTTP(req, clog)
+	resp, respBody, err := h.RequestHTTP(req, clog)
+	if err != nil || resp.StatusCode/100 == 5 {
+		return courier.ErrConnectionFailed
+	}
+
 	respPayload := &whatsapp.SendResponse{}
 	err = json.Unmarshal(respBody, respPayload)
 	if err != nil {

diff --git a/handlers/meta/whataspp_test.go b/handlers/meta/whataspp_test.go
@@ -615,6 +615,17 @@ var whatsappOutgoingTests = []OutgoingTestCase{
 		},
 		ExpectedError: courier.ErrFailedWithReason("130429", "(#130429) Rate limit hit"),
 	},
+	{
+		Label:   "Error Connection",
+		MsgText: "Error",
+		MsgURN:  "whatsapp:250788123123",
+		MockResponses: map[string][]*httpx.MockResponse{
+			"*/12345_ID/messages": {
+				httpx.NewMockResponse(500, nil, []byte(`Bad Gateway`)),
+			},
+		},
+		ExpectedError: courier.ErrConnectionFailed,
+	},
 }
 
 func TestWhatsAppOutgoing(t *testing.T) {