From d4f6b9b42b7d6a39be8edcecf909a867586542db Mon Sep 17 00:00:00 2001
From: Daniel Swarbrick <daniel.swarbrick@gmail.com>
Date: Tue, 18 Sep 2018 21:25:01 +0200
Subject: [PATCH] Address review comments in PR #49

Signed-off-by: Daniel Swarbrick <daniel.swarbrick@gmail.com>
---
 examples/config.yaml        |  1 -
 provider/sipgate/sipgate.go | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/examples/config.yaml b/examples/config.yaml
index 8fcdaec..5b323b4 100644
--- a/examples/config.yaml
+++ b/examples/config.yaml
@@ -40,7 +40,6 @@ providers:
   sipgate:
     username: 'username'
     password: 'password'
-    url: "https://api.sipgate.com/v2/sessions/sms"
 
 receivers:
   - name: 'team-sms'
diff --git a/provider/sipgate/sipgate.go b/provider/sipgate/sipgate.go
index cadb9b9..c58304a 100644
--- a/provider/sipgate/sipgate.go
+++ b/provider/sipgate/sipgate.go
@@ -10,13 +10,14 @@ import (
 	"github.com/messagebird/sachet"
 )
 
+const sipgateURL = "https://api.sipgate.com/v2/sessions/sms"
+
 var sipgateHTTPClient = &http.Client{Timeout: time.Second * 20}
 
 // Config is the configuration struct for Sipgate provider
 type Config struct {
 	Username string `yaml:"username"`
 	Password string `yaml:"password"`
-	URL      string `yaml:"url"`
 }
 
 // Sipgate contains the necessary values for the Sipgate provider
@@ -26,9 +27,6 @@ type Sipgate struct {
 
 // NewSipgate creates and returns a new Sipgate struct
 func NewSipgate(config Config) *Sipgate {
-	if config.URL == "" {
-		config.URL = "https://api.sipgate.com/v2/sessions/sms"
-	}
 	return &Sipgate{config}
 }
 
@@ -41,20 +39,18 @@ type payload struct {
 // Send sends SMS to user registered in configuration
 func (c *Sipgate) Send(message sachet.Message) error {
 	for _, recipient := range message.To {
-		var body bytes.Buffer
-
 		params := payload{
 			SmsID:     message.From,
 			Recipient: recipient,
 			Message:   message.Text,
 		}
 
-		enc := json.NewEncoder(&body)
-		if err := enc.Encode(params); err != nil {
+		data, err := json.Marshal(params)
+		if err != nil {
 			return err
 		}
 
-		request, err := http.NewRequest("POST", c.URL, &body)
+		request, err := http.NewRequest("POST", sipgateURL, bytes.NewBuffer(data))
 		if err != nil {
 			return err
 		}