Change ipsec lifetimes to int

go.mod

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

unifi/account_test.go

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

unifi/firewall_zone.go

@@ -1,48 +0,0 @@
-package unifi
-
-import (
-	"context"
-	"fmt"
-)
-
-type FirewallZone struct {
-	ID string `json:"_id,omitempty"`
-
-	// Hidden   bool   `json:"attr_hidden,omitempty"`
-	// HiddenID string `json:"attr_hidden_id,omitempty"`
-	// NoDelete bool   `json:"attr_no_delete,omitempty"`
-	// NoEdit   bool   `json:"attr_no_edit,omitempty"`
-
-	Name        string   `json:"name"`
-	DefaultZone bool     `json:"default_zone,omitempty"`
-	NetworkIDs  []string `json:"network_ids,omitempty"`
-	ZoneKey     string   `json:"zone_key,omitempty"`
-
-	// Role string `json:"role"`
-}
-
-func (c *Client) ListFirewallZones(ctx context.Context, site string) ([]FirewallZone, error) {
-	var respBody []FirewallZone
-
-	err := c.do_versioned(ctx, "V2", "GET", fmt.Sprintf("site/%s/firewall/zone", site), nil, &respBody)
-	if err != nil {
-		return nil, err
-	}
-
-	return respBody, nil
-}
-
-func (c *Client) GetFirewallZone(ctx context.Context, site, id string) (*FirewallZone, error) {
-	firewallzones, err := c.ListFirewallZones(ctx, site)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, z := range firewallzones {
-		if z.ID == id {
-			return &z, nil
-		}
-	}
-
-	return nil, &NotFoundError{}
-}

unifi/network_test.go

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

unifi/unifi.go

@@ -191,22 +191,10 @@ 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
@@ -225,7 +213,7 @@ func (c *Client) do_versioned(ctx context.Context, version, method, relativeURL
 		return fmt.Errorf("unable to parse URL: %s %s %w", method, relativeURL, err)
 	}
 	if !strings.HasPrefix(relativeURL, "/") && !reqURL.IsAbs() {
-		reqURL.Path = path.Join(apiPath, reqURL.Path)
+		reqURL.Path = path.Join(c.apiPath, reqURL.Path)
 	}
 
 	url := c.baseURL.ResolveReference(reqURL)