Compare commits
No commits in common. "2731a787e332fb04dbcfaaf51308a52632a985d8" and "8d4fbb9c2ef4bd29a36394afeb4572c8953515b0" have entirely different histories.
2731a787e3
...
8d4fbb9c2e
@ -27,18 +27,6 @@ var (
|
|||||||
logg = logging.NewVanilla().WithDomain("sarafu-api.devapi")
|
logg = logging.NewVanilla().WithDomain("sarafu-api.devapi")
|
||||||
)
|
)
|
||||||
|
|
||||||
type APIError struct {
|
|
||||||
Code string
|
|
||||||
Description string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *APIError) Error() string {
|
|
||||||
if e.Code != "" {
|
|
||||||
return fmt.Sprintf("[%s] %s", e.Code, e.Description)
|
|
||||||
}
|
|
||||||
return e.Description
|
|
||||||
}
|
|
||||||
|
|
||||||
type HTTPAccountService struct {
|
type HTTPAccountService struct {
|
||||||
SS storage.StorageService
|
SS storage.StorageService
|
||||||
UseApi bool
|
UseApi bool
|
||||||
@ -774,11 +762,7 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
|
|||||||
if err := json.Unmarshal(body, &errResponse); err != nil {
|
if err := json.Unmarshal(body, &errResponse); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
return nil, errors.New(errResponse.Description)
|
||||||
return nil, &APIError{
|
|
||||||
Code: errResponse.ErrCode,
|
|
||||||
Description: errResponse.Description,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := json.Unmarshal(body, &okResponse); err != nil {
|
if err := json.Unmarshal(body, &okResponse); err != nil {
|
||||||
@ -786,7 +770,7 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(okResponse.Result) == 0 {
|
if len(okResponse.Result) == 0 {
|
||||||
return nil, errors.New("empty api result")
|
return nil, errors.New("Empty api result")
|
||||||
}
|
}
|
||||||
|
|
||||||
v, err := json.Marshal(okResponse.Result)
|
v, err := json.Marshal(okResponse.Result)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user