Skip to content

Commit 6b5f3fd

Browse files
polyfloydpolyfloyd
committed
Make (*Client).request public
1 parent 25ba31c commit 6b5f3fd

File tree

2 files changed

+24
-23
lines changed

2 files changed

+24
-23
lines changed

‎callflow.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (callflow *CallFlow) UnmarshalJSON(data []byte) error {
113113
// An error is returned if no such call flow exists or is accessible.
114114
func (c *Client) CallFlowByID(id string) (*CallFlow, error) {
115115
callflow := &CallFlow{}
116-
err := c.request(callflow, "GET", "call-flow/"+id, nil)
116+
err := c.Request(callflow, "GET", "call-flow/"+id, nil)
117117
return callflow, err
118118
}
119119

@@ -124,7 +124,7 @@ func (c *Client) CallFlowByID(id string) (*CallFlow, error) {
124124
// Typically, a page contains 10 callflows.
125125
func (c *Client) CallFlows(page int) (*CallFlowList, error) {
126126
list := &CallFlowList{}
127-
err := c.request(list, "GET", fmt.Sprintf("call-flow/?page=%d", page), nil)
127+
err := c.Request(list, "GET", fmt.Sprintf("call-flow/?page=%d", page), nil)
128128
return list, err
129129
}
130130

@@ -135,7 +135,7 @@ func (c *Client) CreateCallFlow(callflow *CallFlow) (*CallFlow, error) {
135135
var data struct {
136136
Data []CallFlow `json:"data"`
137137
}
138-
if err := c.request(&data, "POST", "call-flow/", callflow); err != nil {
138+
if err := c.Request(&data, "POST", "call-flow/", callflow); err != nil {
139139
return nil, err
140140
}
141141
return &data.Data[0], nil
@@ -148,15 +148,15 @@ func (c *Client) UpdateCallFlow(callflow *CallFlow) (*CallFlow, error) {
148148
var data struct {
149149
Data []CallFlow `json:"data"`
150150
}
151-
if err := c.request(callflow, "PUT", "call-flow/"+callflow.ID, callflow); err != nil {
151+
if err := c.Request(callflow, "PUT", "call-flow/"+callflow.ID, callflow); err != nil {
152152
return nil, err
153153
}
154154
return &data.Data[0], nil
155155
}
156156

157157
// DeleteCallFlow deletes the specified CallFlow.
158158
func (c *Client) DeleteCallFlow(callflow *CallFlow) error {
159-
return c.request(nil, "DELETE", "call-flow/"+callflow.ID, nil)
159+
return c.Request(nil, "DELETE", "call-flow/"+callflow.ID, nil)
160160
}
161161

162162
// A CallFlowStep is a single step that can be taken in a callflow.

‎client.go

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ func New(AccessKey string) *Client {
6565
return &Client{AccessKey: AccessKey, HTTPClient: &http.Client{}}
6666
}
6767

68-
func (c *Client) request(v interface{}, method, path string, data interface{}) error {
68+
// Request is for internal use only and unstable.
69+
func (c *Client) Request(v interface{}, method, path string, data interface{}) error {
6970
uri, err := url.Parse(Endpoint + "/" + path)
7071
if err != nil {
7172
return err
@@ -137,7 +138,7 @@ func (c *Client) request(v interface{}, method, path string, data interface{}) e
137138
// with the access key.
138139
func (c *Client) Balance() (*Balance, error) {
139140
balance := &Balance{}
140-
if err := c.request(balance, "GET", "balance", nil); err != nil {
141+
if err := c.Request(balance, "GET", "balance", nil); err != nil {
141142
if err == ErrResponse {
142143
return balance, err
143144
}
@@ -152,7 +153,7 @@ func (c *Client) Balance() (*Balance, error) {
152153
// created by the NewHLR function.
153154
func (c *Client) HLR(id string) (*HLR, error) {
154155
hlr := &HLR{}
155-
if err := c.request(hlr, "GET", HLRPath+"/"+id, nil); err != nil {
156+
if err := c.Request(hlr, "GET", HLRPath+"/"+id, nil); err != nil {
156157
if err == ErrResponse {
157158
return hlr, err
158159
}
@@ -167,7 +168,7 @@ func (c *Client) HLR(id string) (*HLR, error) {
167168
// function.
168169
func (c *Client) HLRs() (*HLRList, error) {
169170
hlrList := &HLRList{}
170-
if err := c.request(hlrList, "GET", HLRPath, nil); err != nil {
171+
if err := c.Request(hlrList, "GET", HLRPath, nil); err != nil {
171172
if err == ErrResponse {
172173
return hlrList, err
173174
}
@@ -187,7 +188,7 @@ func (c *Client) NewHLR(msisdn string, reference string) (*HLR, error) {
187188

188189
hlr := &HLR{}
189190

190-
if err := c.request(hlr, "POST", HLRPath, requestData); err != nil {
191+
if err := c.Request(hlr, "POST", HLRPath, requestData); err != nil {
191192
if err == ErrResponse {
192193
return hlr, err
193194
}
@@ -201,7 +202,7 @@ func (c *Client) NewHLR(msisdn string, reference string) (*HLR, error) {
201202
// Message retrieves the information of an existing Message.
202203
func (c *Client) Message(id string) (*Message, error) {
203204
message := &Message{}
204-
if err := c.request(message, "GET", MessagePath+"/"+id, nil); err != nil {
205+
if err := c.Request(message, "GET", MessagePath+"/"+id, nil); err != nil {
205206
if err == ErrResponse {
206207
return message, err
207208
}
@@ -220,7 +221,7 @@ func (c *Client) Messages(msgListParams *MessageListParams) (*MessageList, error
220221
return messageList, err
221222
}
222223

223-
if err := c.request(messageList, "GET", MessagePath+"?"+params.Encode(), nil); err != nil {
224+
if err := c.Request(messageList, "GET", MessagePath+"?"+params.Encode(), nil); err != nil {
224225
if err == ErrResponse {
225226
return messageList, err
226227
}
@@ -239,7 +240,7 @@ func (c *Client) NewMessage(originator string, recipients []string, body string,
239240
}
240241

241242
message := &Message{}
242-
if err := c.request(message, "POST", MessagePath, requestData); err != nil {
243+
if err := c.Request(message, "POST", MessagePath, requestData); err != nil {
243244
if err == ErrResponse {
244245
return message, err
245246
}
@@ -253,7 +254,7 @@ func (c *Client) NewMessage(originator string, recipients []string, body string,
253254
// MMSMessage retrieves the information of an existing MmsMessage.
254255
func (c *Client) MMSMessage(id string) (*MMSMessage, error) {
255256
mmsMessage := &MMSMessage{}
256-
if err := c.request(mmsMessage, "GET", MMSPath+"/"+id, nil); err != nil {
257+
if err := c.Request(mmsMessage, "GET", MMSPath+"/"+id, nil); err != nil {
257258
if err == ErrResponse {
258259
return mmsMessage, err
259260
}
@@ -275,7 +276,7 @@ func (c *Client) NewMMSMessage(originator string, recipients []string, msgParams
275276
params.Set("recipients", strings.Join(recipients, ","))
276277

277278
mmsMessage := &MMSMessage{}
278-
if err := c.request(mmsMessage, "POST", MMSPath, params); err != nil {
279+
if err := c.Request(mmsMessage, "POST", MMSPath, params); err != nil {
279280
if err == ErrResponse {
280281
return mmsMessage, err
281282
}
@@ -289,7 +290,7 @@ func (c *Client) NewMMSMessage(originator string, recipients []string, msgParams
289290
// VoiceMessage retrieves the information of an existing VoiceMessage.
290291
func (c *Client) VoiceMessage(id string) (*VoiceMessage, error) {
291292
message := &VoiceMessage{}
292-
if err := c.request(message, "GET", VoiceMessagePath+"/"+id, nil); err != nil {
293+
if err := c.Request(message, "GET", VoiceMessagePath+"/"+id, nil); err != nil {
293294
if err == ErrResponse {
294295
return message, err
295296
}
@@ -303,7 +304,7 @@ func (c *Client) VoiceMessage(id string) (*VoiceMessage, error) {
303304
// VoiceMessages retrieves all VoiceMessages of the user.
304305
func (c *Client) VoiceMessages() (*VoiceMessageList, error) {
305306
messageList := &VoiceMessageList{}
306-
if err := c.request(messageList, "GET", VoiceMessagePath, nil); err != nil {
307+
if err := c.Request(messageList, "GET", VoiceMessagePath, nil); err != nil {
307308
if err == ErrResponse {
308309
return messageList, err
309310
}
@@ -322,7 +323,7 @@ func (c *Client) NewVoiceMessage(recipients []string, body string, params *Voice
322323
}
323324

324325
message := &VoiceMessage{}
325-
if err := c.request(message, "POST", VoiceMessagePath, requestData); err != nil {
326+
if err := c.Request(message, "POST", VoiceMessagePath, requestData); err != nil {
326327
if err == ErrResponse {
327328
return message, err
328329
}
@@ -341,7 +342,7 @@ func (c *Client) NewVerify(recipient string, params *VerifyParams) (*Verify, err
341342
}
342343

343344
verify := &Verify{}
344-
if err := c.request(verify, "POST", VerifyPath, requestData); err != nil {
345+
if err := c.Request(verify, "POST", VerifyPath, requestData); err != nil {
345346
if err == ErrResponse {
346347
return verify, err
347348
}
@@ -360,7 +361,7 @@ func (c *Client) VerifyToken(id, token string) (*Verify, error) {
360361
path := VerifyPath + "/" + id + "?" + params.Encode()
361362

362363
verify := &Verify{}
363-
if err := c.request(verify, "GET", path, nil); err != nil {
364+
if err := c.Request(verify, "GET", path, nil); err != nil {
364365
if err == ErrResponse {
365366
return verify, err
366367
}
@@ -377,7 +378,7 @@ func (c *Client) Lookup(phoneNumber string, params *LookupParams) (*Lookup, erro
377378
path := LookupPath + "/" + phoneNumber + "?" + urlParams.Encode()
378379

379380
lookup := &Lookup{}
380-
if err := c.request(lookup, "POST", path, nil); err != nil {
381+
if err := c.Request(lookup, "POST", path, nil); err != nil {
381382
if err == ErrResponse {
382383
return lookup, err
383384
}
@@ -394,7 +395,7 @@ func (c *Client) NewLookupHLR(phoneNumber string, params *LookupParams) (*HLR, e
394395
path := LookupPath + "/" + phoneNumber + "/" + HLRPath
395396

396397
hlr := &HLR{}
397-
if err := c.request(hlr, "POST", path, requestData); err != nil {
398+
if err := c.Request(hlr, "POST", path, requestData); err != nil {
398399
if err == ErrResponse {
399400
return hlr, err
400401
}
@@ -411,7 +412,7 @@ func (c *Client) LookupHLR(phoneNumber string, params *LookupParams) (*HLR, erro
411412
path := LookupPath + "/" + phoneNumber + "/" + HLRPath + "?" + urlParams.Encode()
412413

413414
hlr := &HLR{}
414-
if err := c.request(hlr, "GET", path, nil); err != nil {
415+
if err := c.Request(hlr, "GET", path, nil); err != nil {
415416
if err == ErrResponse {
416417
return hlr, err
417418
}

0 commit comments

Comments
 (0)