extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-06-21 10:27:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from anxdpanic/error-responses

Browse Source 
update error reporting for custom-api JSON validation
This commit is contained in:
Svilen Markov 2025-04-24 09:06:05 +01:00 committed by GitHub
commit 272bf1d2ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/glance/widget-custom-api.go
View File

@ -203,6 +203,7 @@ func fetchCustomAPIRequest(ctx context.Context, req *CustomAPIRequest) (*customA
body := strings.TrimSpace(string(bodyBytes)) body := strings.TrimSpace(string(bodyBytes))
if !req.SkipJSONValidation && body != "" && !gjson.Valid(body) { if !req.SkipJSONValidation && body != "" && !gjson.Valid(body) {
if 200 <= resp.StatusCode && resp.StatusCode < 300 {
truncatedBody, isTruncated := limitStringLength(body, 100) truncatedBody, isTruncated := limitStringLength(body, 100)
if isTruncated { if isTruncated {
truncatedBody += "... <truncated>" truncatedBody += "... <truncated>"
@ -212,6 +213,10 @@ func fetchCustomAPIRequest(ctx context.Context, req *CustomAPIRequest) (*customA
return nil, errors.New("invalid response JSON") return nil, errors.New("invalid response JSON")
} }
return nil, errors.New(fmt.Sprintf("%d %s", resp.StatusCode, http.StatusText(resp.StatusCode)))
}
data := &customAPIResponseData{ data := &customAPIResponseData{
JSON: decoratedGJSONResult{gjson.Parse(body)}, JSON: decoratedGJSONResult{gjson.Parse(body)},
Response: resp, Response: resp,