11//
2- // Copyright (c) 2014 MessageBird B.V.
2+ // Copyright (c) 2022 MessageBird B.V.
33// All rights reserved.
44//
55// Author: Maurice Nonnekes <[email protected] > @@ -20,13 +20,12 @@ import (
2020 "net/url"
2121 "runtime"
2222 "strings"
23- "sync"
2423 "time"
2524)
2625
2726const (
2827 // ClientVersion is used in User-Agent request header to provide server with API level.
29- ClientVersion = "8.0 .0"
28+ ClientVersion = "8.1 .0"
3029
3130 // Endpoint points you to MessageBird REST API.
3231 Endpoint = "https://rest.messagebird.com"
@@ -40,20 +39,22 @@ const (
4039
4140var (
4241 // ErrUnexpectedResponse is used when there was an internal server error and nothing can be done at this point.
43- ErrUnexpectedResponse = errors .New ("The MessageBird API is currently unavailable" )
42+ ErrUnexpectedResponse = errors .New ("the MessageBird API is currently unavailable" )
4443)
4544
4645// A Feature can be enabled
4746type Feature int
4847
48+ type MessageBirdClient interface {
49+ Request (v interface {}, method , path string , data interface {}) error
50+ }
51+
4952// Client is used to access API with a given key.
5053// Uses standard lib HTTP client internally, so should be reused instead of created as needed and it is safe for concurrent use.
5154type Client struct {
52- AccessKey string // The API access key.
53- HTTPClient * http.Client // The HTTP client to send requests on.
54- DebugLog * log.Logger // Optional logger for debugging purposes.
55- features map [Feature ]bool // Enabled features.
56- featuresMutex sync.RWMutex // Mutex for accessing feature map.
55+ AccessKey string // The API access key.
56+ HTTPClient * http.Client // The HTTP client to send requests on.
57+ DebugLog * log.Logger // Optional logger for debugging purposes.
5758}
5859
5960type contentType string
@@ -76,7 +77,6 @@ func New(accessKey string) *Client {
7677 HTTPClient : & http.Client {
7778 Timeout : httpClientTimeout ,
7879 },
79- features : make (map [Feature ]bool ),
8080 }
8181}
8282
@@ -86,30 +86,6 @@ func SetVoiceErrorReader(r errorReader) {
8686 voiceErrorReader = r
8787}
8888
89- // EnableFeatures enables a feature.
90- func (c * Client ) EnableFeatures (feature Feature ) {
91- c .featuresMutex .Lock ()
92- defer c .featuresMutex .Unlock ()
93- c .features [feature ] = true
94- }
95-
96- // DisableFeatures disables a feature.
97- func (c * Client ) DisableFeatures (feature Feature ) {
98- c .featuresMutex .Lock ()
99- defer c .featuresMutex .Unlock ()
100- c .features [feature ] = false
101- }
102-
103- // IsFeatureEnabled checks if a feature is enabled.
104- func (c * Client ) IsFeatureEnabled (feature Feature ) bool {
105- c .featuresMutex .RLock ()
106- defer c .featuresMutex .RUnlock ()
107- if enabled , ok := c .features [feature ]; ok {
108- return enabled
109- }
110- return false
111- }
112-
11389// Request is for internal use only and unstable.
11490func (c * Client ) Request (v interface {}, method , path string , data interface {}) error {
11591 if ! strings .HasPrefix (path , "https://" ) && ! strings .HasPrefix (path , "http://" ) {
@@ -162,7 +138,7 @@ func (c *Client) Request(v interface{}, method, path string, data interface{}) e
162138 }
163139
164140 switch response .StatusCode {
165- case http .StatusOK , http .StatusCreated :
141+ case http .StatusOK , http .StatusCreated , http . StatusAccepted :
166142 // Status codes 200 and 201 are indicative of being able to convert the
167143 // response body to the struct that was specified.
168144 if err := json .Unmarshal (responseBody , & v ); err != nil {
0 commit comments