Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pkg/keycloak/rest.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ func (client *KeycloakClient) GetJSON(ctx context.Context, url string, result an
return resp, err
}

contentType, _, _ := strings.Cut(resp.Header.Get("Content-Type"), ";")
var parseErr error
if resp.Header.Get("Content-Type") == jsonContentType {
if contentType == jsonContentType {
parseErr = tryParseResponse(resp, result)
} else {
return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
Expand Down Expand Up @@ -60,8 +61,9 @@ func (client *KeycloakClient) PostJSON(ctx context.Context, url string, body any
return resp, err
}

contentType, _, _ := strings.Cut(resp.Header.Get("Content-Type"), ";")
var parseErr error
if resp.Header.Get("Content-Type") == jsonContentType {
if contentType == jsonContentType {
parseErr = tryParseResponse(resp, result)
} else if resp.StatusCode == 204 {
// No content
Expand Down Expand Up @@ -91,8 +93,9 @@ func (client *KeycloakClient) PostForm(ctx context.Context, url string, data url
return resp, err
}

contentType, _, _ := strings.Cut(resp.Header.Get("Content-Type"), ";")
var parseErr error
if resp.Header.Get("Content-Type") == jsonContentType {
if contentType == jsonContentType {
parseErr = tryParseResponse(resp, result)
} else {
return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
Expand Down
6 changes: 4 additions & 2 deletions pkg/renkuapi/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,9 @@ func (auth *RenkuApiAuth) get(ctx context.Context, url string, result any) (resp
return resp, err
}

contentType, _, _ := strings.Cut(resp.Header.Get("Content-Type"), ";")
var parseErr error
if resp.Header.Get("Content-Type") == jsonContentType {
if contentType == jsonContentType {
parseErr = tryParseResponse(resp, result)
} else {
return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
Expand All @@ -351,8 +352,9 @@ func (auth *RenkuApiAuth) postForm(ctx context.Context, url string, data url.Val
return resp, err
}

contentType, _, _ := strings.Cut(resp.Header.Get("Content-Type"), ";")
var parseErr error
if resp.Header.Get("Content-Type") == jsonContentType {
if contentType == jsonContentType {
parseErr = tryParseResponse(resp, result)
} else {
return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
Expand Down
Loading