Merge pull request #49 from nyaruka/stop-twilio-contacts

twilio returns 400s when sending to twilio, do the right thing in tha…
nyaruka · Oct 6, 2017 · de0945c · de0945c
2 parents a7c4553 + 3b5fef8
commit de0945c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/handlers/twilio/twilio.go b/handlers/twilio/twilio.go
@@ -232,19 +232,21 @@ func (h *handler) SendMsg(msg courier.Msg) (courier.MsgStatus, error) {
 		log := courier.NewChannelLogFromRR("Message Sent", msg.Channel(), msg.ID(), rr).WithError("Message Send Error", err)
 		status.AddLog(log)
 
-		// fail if we received an error
-		if err != nil {
-			return status, nil
+		// parse the response if we had one
+		if rr.Body != nil {
+			errorCode, _ := jsonparser.GetInt([]byte(rr.Body), "error_code")
+			if errorCode != 0 {
+				if errorCode == errorStopped {
+					status.SetStatus(courier.MsgFailed)
+					h.Backend().StopMsgContact(msg)
+				}
+				log.WithError("Message Send Error", errors.Errorf("received error code from twilio '%d'", errorCode))
+				return status, nil
+			}
 		}
 
-		// was this request successful?
-		errorCode, _ := jsonparser.GetInt([]byte(rr.Body), "error_code")
-		if errorCode != 0 {
-			if errorCode == errorStopped {
-				status.SetStatus(courier.MsgFailed)
-				h.Backend().StopMsgContact(msg)
-			}
-			log.WithError("Message Send Error", errors.Errorf("received error code from twilio '%d'", errorCode))
+		// fail if we received an error
+		if err != nil {
 			return status, nil
 		}
 

diff --git a/handlers/twilio/twilio_test.go b/handlers/twilio/twilio_test.go
@@ -116,7 +116,7 @@ var defaultSendTestCases = []ChannelSendTestCase{
 	{Label: "Stopped Contact Code",
 		Text: "Stopped Contact", URN: "tel:+250788383383",
 		Status:       "F",
-		ResponseBody: `{ "error_code": 21610 }`, ResponseStatus: 200,
+		ResponseBody: `{ "error_code": 21610 }`, ResponseStatus: 400,
 		PostParams: map[string]string{"Body": "Stopped Contact", "To": "+250788383383"},
 		SendPrep:   setSendURL,
 		Stopped:    true},