Compare commits
2 Commits
10-fix-mod
...
12-support
| Author | SHA1 | Date | |
|---|---|---|---|
| ec43083868 | |||
| babe9757a6 |
@@ -191,10 +191,22 @@ func (c *Client) Login(ctx context.Context, user, pass string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody any, respBody any) error {
|
func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody any, respBody any) error {
|
||||||
|
return c.do_versioned(ctx, "V1", method, relativeURL, reqBody, respBody)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) do_versioned(ctx context.Context, version, method, relativeURL string, reqBody any, respBody any) error {
|
||||||
// single threading requests, this is mostly to assist in CSRF token propagation
|
// single threading requests, this is mostly to assist in CSRF token propagation
|
||||||
c.Lock()
|
c.Lock()
|
||||||
defer c.Unlock()
|
defer c.Unlock()
|
||||||
|
|
||||||
|
var apiPath string
|
||||||
|
|
||||||
|
if version == "V2" {
|
||||||
|
apiPath = c.apiV2Path
|
||||||
|
} else {
|
||||||
|
apiPath = c.apiPath
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
reqReader io.Reader
|
reqReader io.Reader
|
||||||
err error
|
err error
|
||||||
@@ -213,7 +225,7 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody any
|
|||||||
return fmt.Errorf("unable to parse URL: %s %s %w", method, relativeURL, err)
|
return fmt.Errorf("unable to parse URL: %s %s %w", method, relativeURL, err)
|
||||||
}
|
}
|
||||||
if !strings.HasPrefix(relativeURL, "/") && !reqURL.IsAbs() {
|
if !strings.HasPrefix(relativeURL, "/") && !reqURL.IsAbs() {
|
||||||
reqURL.Path = path.Join(c.apiPath, reqURL.Path)
|
reqURL.Path = path.Join(apiPath, reqURL.Path)
|
||||||
}
|
}
|
||||||
|
|
||||||
url := c.baseURL.ResolveReference(reqURL)
|
url := c.baseURL.ResolveReference(reqURL)
|
||||||
|
|||||||
Reference in New Issue
Block a user