Skip to content

Commit 97f3ea8

Browse files
AchoArnoldAchoArnold
committed
Fix response
1 parent 5e62077 commit 97f3ea8

File tree

5 files changed

+34
-9
lines changed

5 files changed

+34
-9
lines changed

‎client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"encoding/json"
77
"io"
8-
"io/ioutil"
98
"net/http"
109
"sync"
1110
)
@@ -127,7 +126,7 @@ func (client *Client) do(req *http.Request) (*Response, error) {
127126
return resp, err
128127
}
129128

130-
_, err = io.Copy(ioutil.Discard, httpResponse.Body)
129+
_, err = io.Copy(io.Discard, httpResponse.Body)
131130
if err != nil {
132131
return resp, err
133132
}
@@ -140,7 +139,7 @@ func (client *Client) newResponse(httpResponse *http.Response) (*Response, error
140139
response := new(Response)
141140
response.HTTPResponse = httpResponse
142141

143-
buf, err := ioutil.ReadAll(response.HTTPResponse.Body)
142+
buf, err := io.ReadAll(response.HTTPResponse.Body)
144143
if err != nil {
145144
return nil, err
146145
}

‎collection_service.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func (service *collectionService) Token(ctx context.Context) (*AuthToken, *Respo
2323

2424
response, err := service.client.do(request)
2525
if err != nil {
26-
return nil, nil, err
26+
return nil, response, err
2727
}
2828

2929
authToken := new(AuthToken)
@@ -87,7 +87,7 @@ func (service *collectionService) GetRequestToPayStatus(
8787

8888
response, err := service.client.do(request)
8989
if err != nil {
90-
return nil, nil, err
90+
return nil, response, err
9191
}
9292

9393
status := new(CollectionTransactionStatus)
@@ -118,7 +118,7 @@ func (service *collectionService) GetAccountBalance(ctx context.Context) (*Accou
118118

119119
response, err := service.client.do(request)
120120
if err != nil {
121-
return nil, nil, err
121+
return nil, response, err
122122
}
123123

124124
balance := new(AccountBalance)

‎disbursement_service.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func (service *disbursementsService) Token(ctx context.Context) (*AuthToken, *Re
2323

2424
response, err := service.client.do(request)
2525
if err != nil {
26-
return nil, nil, err
26+
return nil, response, err
2727
}
2828

2929
authToken := new(AuthToken)
@@ -87,7 +87,7 @@ func (service *disbursementsService) GetTransferStatus(
8787

8888
response, err := service.client.do(request)
8989
if err != nil {
90-
return nil, nil, err
90+
return nil, response, err
9191
}
9292

9393
status := new(DisbursementTransactionStatus)
@@ -118,7 +118,7 @@ func (service *disbursementsService) GetAccountBalance(ctx context.Context) (*Ac
118118

119119
response, err := service.client.do(request)
120120
if err != nil {
121-
return nil, nil, err
121+
return nil, response, err
122122
}
123123

124124
balance := new(AccountBalance)

‎go.mod

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,20 @@ module github.com/NdoleStudio/mtnmomo-go
33
go 1.17
44

55
require (
6+
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2
67
github.com/davecgh/go-spew v1.1.1
8+
github.com/dustin/go-humanize v1.0.1
9+
github.com/fatih/color v1.17.0
710
github.com/google/uuid v1.3.0
811
github.com/stretchr/testify v1.8.1
912
)
1013

14+
require (
15+
github.com/mattn/go-colorable v0.1.13 // indirect
16+
github.com/mattn/go-isatty v0.0.20 // indirect
17+
golang.org/x/sys v0.24.0 // indirect
18+
)
19+
1120
require (
1221
github.com/NdoleStudio/orangemoney-go v0.0.1
1322
github.com/pmezard/go-difflib v1.0.0 // indirect

‎go.sum

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
github.com/NdoleStudio/orangemoney-go v0.0.1 h1:VRCPb18BlSOwAy106t8k3mz95FT6w5fTwtJnt1vlW3A=
22
github.com/NdoleStudio/orangemoney-go v0.0.1/go.mod h1:FIed5i5iG+NHrItYivX1fX7nxMLXyPeHB57CrOHC7zU=
3+
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4=
4+
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2/go.mod h1:VSw57q4QFiWDbRnjdX8Cb3Ow0SFncRw+bA/ofY6Q83w=
35
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
46
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
57
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
68
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
10+
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
11+
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
12+
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
713
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
814
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
15+
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
16+
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
17+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
18+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
19+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
920
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1021
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1122
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -17,6 +28,12 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
1728
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
1829
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
1930
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
31+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
32+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
34+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
35+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
36+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2037
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2138
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2239
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

0 commit comments

Comments
 (0)