Merge pull request #69 from mariuspot/master

Add WhatsApp Sandbox support to Conversations API

Author: marcelcorso

README.md

@@ -108,6 +108,14 @@ if err != nil {
 }
 ```
 
+Conversations WhatsApp Sandbox
+-------------
+To use the whatsapp sandbox you need to enable the `FeatureConversationsAPIWhatsAppSandbox` feature.
+
+```go
+	client.EnableFeatures(messagebird.FeatureConversationsAPIWhatsAppSandbox)
+```
+
 Documentation
 -------------
 Complete documentation, instructions, and examples are available at:

client.go

@@ -20,6 +20,7 @@ import (
 	"net/url"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -42,12 +43,22 @@ var (
 	ErrUnexpectedResponse = errors.New("The MessageBird API is currently unavailable")
 )
 
+// A Feature can be enabled
+type Feature int
+
+const (
+	// FeatureConversationsAPIWhatsAppSandbox Enables the WhatsApp sandbox for conversations API.
+	FeatureConversationsAPIWhatsAppSandbox Feature = iota
+)
+
 // Client is used to access API with a given key.
 // Uses standard lib HTTP client internally, so should be reused instead of created as needed and it is safe for concurrent use.
 type Client struct {
-	AccessKey  string       // The API access key
-	HTTPClient *http.Client // The HTTP client to send requests on
-	DebugLog   *log.Logger  // Optional logger for debugging purposes
+	AccessKey     string           // The API access key.
+	HTTPClient    *http.Client     // The HTTP client to send requests on.
+	DebugLog      *log.Logger      // Optional logger for debugging purposes.
+	features      map[Feature]bool // Enabled features.
+	featuresMutex sync.RWMutex     // Mutex for accessing feature map.
 }
 
 type contentType string
@@ -70,6 +81,7 @@ func New(accessKey string) *Client {
 		HTTPClient: &http.Client{
 			Timeout: httpClientTimeout,
 		},
+		features: make(map[Feature]bool),
 	}
 }
 
@@ -79,6 +91,30 @@ func SetVoiceErrorReader(r errorReader) {
 	voiceErrorReader = r
 }
 
+// EnableFeatures enables a feature.
+func (c *Client) EnableFeatures(feature Feature) {
+	c.featuresMutex.Lock()
+	defer c.featuresMutex.Unlock()
+	c.features[feature] = true
+}
+
+// DisableFeatures disables a feature.
+func (c *Client) DisableFeatures(feature Feature) {
+	c.featuresMutex.Lock()
+	defer c.featuresMutex.Unlock()
+	c.features[feature] = false
+}
+
+// IsFeatureEnabled checks if a feature is enabled.
+func (c *Client) IsFeatureEnabled(feature Feature) bool {
+	c.featuresMutex.RLock()
+	defer c.featuresMutex.RUnlock()
+	if enabled, ok := c.features[feature]; ok {
+		return enabled
+	}
+	return false
+}
+
 // Request is for internal use only and unstable.
 func (c *Client) Request(v interface{}, method, path string, data interface{}) error {
 	if !strings.HasPrefix(path, "https://") && !strings.HasPrefix(path, "http://") {

conversation/api.go

@@ -16,6 +16,8 @@ const (
 	// https://conversations.messagebird.com/v1/webhooks).
 	apiRoot = "https://conversations.messagebird.com/v1"
 
+	whatsappSandboxAPIRoot = "https://whatsapp-sandbox.messagebird.com/v1"
+
 	// path is the path for the Conversation resource, relative to apiRoot.
 	path = "conversations"
 
@@ -218,7 +220,13 @@ const (
 // prefix the path with the Conversation API's root. This ensures the client
 // doesn't "handle" this for us: by default, it uses the REST API.
 func request(c *messagebird.Client, v interface{}, method, path string, data interface{}) error {
-	return c.Request(v, method, fmt.Sprintf("%s/%s", apiRoot, path), data)
+	var root string
+	if c.IsFeatureEnabled(messagebird.FeatureConversationsAPIWhatsAppSandbox) {
+		root = whatsappSandboxAPIRoot
+	} else {
+		root = apiRoot
+	}
+	return c.Request(v, method, fmt.Sprintf("%s/%s", root, path), data)
 }
 
 // paginationQuery builds the query string for paginated endpoints.

internal/mbtest/test_client.go

@@ -36,14 +36,11 @@ func client(t *testing.T, accessKey string) *messagebird.Client {
 			})
 		},
 	}
+	client := messagebird.New(accessKey)
+	client.HTTPClient.Transport = transport
+	client.DebugLog = testLogger(t)
 
-	return &messagebird.Client{
-		AccessKey: accessKey,
-		HTTPClient: &http.Client{
-			Transport: transport,
-		},
-		DebugLog: testLogger(t),
-	}
+	return client
 }
 
 // testLogger creates a new logger that writes to the test's output.