From 6c7af68bfde34250bff08cd895707dcecb0ba98e Mon Sep 17 00:00:00 2001 From: gilgameshskytrooper Date: Tue, 14 Apr 2020 15:00:42 -0500 Subject: [PATCH] RELEASEPATCH --- go.mod | 2 +- go.sum | 5 +++++ voiceit2.go | 11 +++++------ voiceit2_test.go | 19 +++++++++---------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 8f305d0..765f0ae 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.12 require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/stretchr/testify v1.3.0 + github.com/stretchr/testify v1.5.1 ) diff --git a/go.sum b/go.sum index 4f89841..82f4dcd 100644 --- a/go.sum +++ b/go.sum @@ -6,3 +6,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/voiceit2.go b/voiceit2.go index 7a57b93..9bc17cb 100644 --- a/voiceit2.go +++ b/voiceit2.go @@ -1600,13 +1600,13 @@ func (vi VoiceIt2) RegenerateSubAccountAPIToken(subAccountAPIKey string) ([]byte if err != nil { return []byte{}, errors.New("RegenerateSubAccountAPIToken error: " + err.Error()) } + req.SetBasicAuth(vi.APIKey, vi.APIToken) req.Header.Add("platformId", PlatformId) req.Header.Add("platformVersion", PlatformVersion) - client := &http.Client{ - // Timeout: 30 * time.Second, - } + client := &http.Client{} + resp, err := client.Do(req) if err != nil { return []byte{}, errors.New("RegenerateSubAccountAPIToken error: " + err.Error()) @@ -1629,9 +1629,8 @@ func (vi VoiceIt2) DeleteSubAccount(subAccountAPIKey string) ([]byte, error) { req.Header.Add("platformId", PlatformId) req.Header.Add("platformVersion", PlatformVersion) - client := &http.Client{ - // Timeout: 30 * time.Second, - } + client := &http.Client{} + resp, err := client.Do(req) if err != nil { return []byte{}, errors.New("DeleteSubAccount error: " + err.Error()) diff --git a/voiceit2_test.go b/voiceit2_test.go index d6166d3..171ff94 100644 --- a/voiceit2_test.go +++ b/voiceit2_test.go @@ -844,12 +844,12 @@ func TestSubAccounts(t *testing.T) { ret, err := myVoiceIt.CreateManagedSubAccount(structs.CreateSubAccountRequest{}) assert.Equal(err, nil) - var cmsa structs.CreateSubAccountReturn - json.Unmarshal(ret, &cmsa) - assert.Equal("SUCC", cmsa.ResponseCode) - assert.Equal(201, cmsa.Status) + var csa structs.CreateSubAccountReturn + json.Unmarshal(ret, &csa) + assert.Equal("SUCC", csa.ResponseCode) + assert.Equal(201, csa.Status) - managed := VoiceIt2{APIKey: cmsa.APIKey, APIToken: cmsa.APIToken, BaseUrl: "https://api.voiceit.io"} + managed := VoiceIt2{APIKey: csa.APIKey, APIToken: csa.APIToken, BaseUrl: "https://api.voiceit.io"} ret, err = managed.CreateUser() assert.Equal(err, nil) var cu structs.CreateUserReturn @@ -883,12 +883,11 @@ func TestSubAccounts(t *testing.T) { ret, err = myVoiceIt.CreateUnmanagedSubAccount(structs.CreateSubAccountRequest{}) assert.Equal(err, nil) - var cusa structs.CreateSubAccountReturn - json.Unmarshal(ret, &cusa) - assert.Equal("SUCC", cmsa.ResponseCode) - assert.Equal(201, cmsa.Status) + json.Unmarshal(ret, &csa) + assert.Equal("SUCC", csa.ResponseCode) + assert.Equal(201, csa.Status) - unmanaged := VoiceIt2{APIKey: cusa.APIKey, APIToken: cusa.APIToken, BaseUrl: "https://api.voiceit.io"} + unmanaged := VoiceIt2{APIKey: csa.APIKey, APIToken: csa.APIToken, BaseUrl: "https://api.voiceit.io"} ret, err = unmanaged.CreateUser() assert.Equal(err, nil) json.Unmarshal(ret, &cu)