Add do_versioned and make do wrap do_versioned

Switch to my branch

go.mod

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

unifi/account_test.go

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

unifi/network.generated.go

@@ -95,12 +95,12 @@ type Network struct {
 	IPSecEspDhGroup                               int                             `json:"ipsec_esp_dh_group,omitempty"`   // 1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32
 	IPSecEspEncryption                            string                          `json:"ipsec_esp_encryption,omitempty"` // aes128|aes192|aes256|3des
 	IPSecEspHash                                  string                          `json:"ipsec_esp_hash,omitempty"`       // sha1|md5|sha256|sha384|sha512
-	IPSecEspLifetime                              string                          `json:"ipsec_esp_lifetime,omitempty"`   // ^(?:3[0-9]|[4-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$
+	IPSecEspLifetime                              int                             `json:"ipsec_esp_lifetime,omitempty"`   // ^(?:3[0-9]|[4-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$
 	IPSecHash                                     string                          `json:"ipsec_hash,omitempty"`           // sha1|md5|sha256|sha384|sha512
 	IPSecIkeDhGroup                               int                             `json:"ipsec_ike_dh_group,omitempty"`   // 1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32
 	IPSecIkeEncryption                            string                          `json:"ipsec_ike_encryption,omitempty"` // aes128|aes192|aes256|3des
 	IPSecIkeHash                                  string                          `json:"ipsec_ike_hash,omitempty"`       // sha1|md5|sha256|sha384|sha512
-	IPSecIkeLifetime                              string                          `json:"ipsec_ike_lifetime,omitempty"`   // ^(?:3[0-9]|[4-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$
+	IPSecIkeLifetime                              int                             `json:"ipsec_ike_lifetime,omitempty"`   // ^(?:3[0-9]|[4-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$
 	IPSecInterface                                string                          `json:"ipsec_interface,omitempty"`      // wan|wan2
 	IPSecKeyExchange                              string                          `json:"ipsec_key_exchange,omitempty"`   // ikev1|ikev2
 	IPSecLocalIDentifier                          string                          `json:"ipsec_local_identifier,omitempty"`

unifi/network_test.go

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

unifi/unifi.go

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