Compare commits
4 Commits
8-fix-ipse
...
12-support
| Author | SHA1 | Date | |
|---|---|---|---|
| ec43083868 | |||
| babe9757a6 | |||
| 225c79703f | |||
| b0d58766fc |
2
go.mod
2
go.mod
@@ -1,4 +1,4 @@
|
||||
module github.com/ubiquiti-community/go-unifi
|
||||
module github.com/vegardengen/go-unifi
|
||||
|
||||
go 1.21
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/tj/assert"
|
||||
"github.com/ubiquiti-community/go-unifi/unifi"
|
||||
"github.com/vegardengen/go-unifi/unifi"
|
||||
)
|
||||
|
||||
func TestAccountMarshalJSON(t *testing.T) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/ubiquiti-community/go-unifi/unifi"
|
||||
"github.com/vegardengen/go-unifi/unifi"
|
||||
)
|
||||
|
||||
func TestNetworkUnmarshalJSON(t *testing.T) {
|
||||
|
||||
@@ -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 {
|
||||
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
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
var apiPath string
|
||||
|
||||
if version == "V2" {
|
||||
apiPath = c.apiV2Path
|
||||
} else {
|
||||
apiPath = c.apiPath
|
||||
}
|
||||
|
||||
var (
|
||||
reqReader io.Reader
|
||||
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)
|
||||
}
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user