Compare commits

..

6 Commits

Author SHA1 Message Date
ec43083868 Add do_versioned and make do wrap do_versioned 2025-04-14 12:32:13 +02:00
babe9757a6 Merge pull request #11 from vegardengen/10-fix-module-name
Switch to my branch
2025-04-14 12:19:20 +02:00
225c79703f Switch to my branch 2025-04-14 12:17:32 +02:00
b0d58766fc Merge pull request #9 from vegardengen/8-fix-ipsec-lifetimes
Change ipsec lifetimes to int
2025-04-14 12:08:32 +02:00
8721daf90a Change ipsec lifetimes to int 2025-04-14 12:08:08 +02:00
14f0897119 Merge pull request #7 from vegardengen/6-update-to-90114
Update to network version 9.0.114
2025-04-14 12:04:17 +02:00
4 changed files with 16 additions and 4 deletions

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/ubiquiti-community/go-unifi module github.com/vegardengen/go-unifi
go 1.21 go 1.21

View File

@@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/tj/assert" "github.com/tj/assert"
"github.com/ubiquiti-community/go-unifi/unifi" "github.com/vegardengen/go-unifi/unifi"
) )
func TestAccountMarshalJSON(t *testing.T) { func TestAccountMarshalJSON(t *testing.T) {

View File

@@ -5,7 +5,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/ubiquiti-community/go-unifi/unifi" "github.com/vegardengen/go-unifi/unifi"
) )
func TestNetworkUnmarshalJSON(t *testing.T) { func TestNetworkUnmarshalJSON(t *testing.T) {

View File

@@ -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)