Skip to content

Commit 544d6fc

Browse files
committed
fix MytokenError type
1 parent 5d93388 commit 544d6fc

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

error.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ type MytokenError struct {
77
}
88

99
// Error implements the error interface and returns a string representation of this MytokenError
10-
func (err *MytokenError) Error() string {
10+
func (err MytokenError) Error() string {
1111
e := err.err
1212
if err.errorDetails != "" {
1313
e += ": " + err.errorDetails
1414
}
1515
return e
1616
}
1717

18-
func newMytokenErrorFromError(e string, err error) *MytokenError {
19-
return &MytokenError{
18+
func newMytokenErrorFromError(e string, err error) MytokenError {
19+
return MytokenError{
2020
err: e,
2121
errorDetails: err.Error(),
2222
}

http.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ const (
1717

1818
const mimetypeJSON = "application/json"
1919

20-
func doHTTPRequest(method, url string, reqBody interface{}, responseData interface{}) *MytokenError {
20+
func doHTTPRequest(method, url string, reqBody interface{}, responseData interface{}) error {
21+
return doHTTPRequestWithAuth(method, url, reqBody, responseData, "")
22+
}
23+
24+
func doHTTPRequestWithAuth(method, url string, reqBody interface{}, responseData interface{},
25+
bearerAuth string) error {
2126
b := new(bytes.Buffer)
2227
if err := json.NewEncoder(b).Encode(reqBody); err != nil {
2328
return newMytokenErrorFromError(errEncodingRequest, err)
@@ -32,6 +37,9 @@ func doHTTPRequest(method, url string, reqBody interface{}, responseData interfa
3237
if responseData != nil {
3338
req.Header.Set("Accept", mimetypeJSON)
3439
}
40+
if bearerAuth != "" {
41+
req.Header.Set("Authorization", "Bearer "+bearerAuth)
42+
}
3543
resp, err := httpClient.Do(req)
3644
if err != nil {
3745
return newMytokenErrorFromError(errSendingHttpRequest, err)
@@ -42,7 +50,7 @@ func doHTTPRequest(method, url string, reqBody interface{}, responseData interfa
4250
if err = json.NewDecoder(resp.Body).Decode(&apiError); err != nil {
4351
return newMytokenErrorFromError(errDecodingErrorResponse, err)
4452
}
45-
return &MytokenError{
53+
return MytokenError{
4654
err: apiError.Error,
4755
errorDetails: apiError.ErrorDescription,
4856
}

0 commit comments

Comments
 (0)