Merge

fix

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/firewall_zone.go

@@ -0,0 +1,51 @@
+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 struct {
+		Meta meta           `json:"meta"`
+		Data []FirewallZone `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("site/%s/firewall/zone", site), nil, &respBody)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBody.Data, 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.generated.go

@@ -92,12 +92,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"`
@@ -126,12 +126,13 @@ type Network struct {
 	IPV6SettingPreference                         string                          `json:"ipv6_setting_preference,omitempty"`    // auto|manual
 	IPV6SingleNetworkInterface                    string                          `json:"ipv6_single_network_interface,omitempty"`
 	IPV6Subnet                                    string                          `json:"ipv6_subnet,omitempty"`
+	IPV6Subnets                                   []string                        `json:"ipv6_subnets,omitempty"`
 	IPV6WANDelegationType                         string                          `json:"ipv6_wan_delegation_type,omitempty"` // pd|single_network|none
 	InterfaceMtu                                  int                             `json:"interface_mtu,omitempty"`            // ^(6[89]|[7-9][0-9]|[1-9][0-9]{2,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|65500)$
 	InterfaceMtuEnabled                           bool                            `json:"interface_mtu_enabled"`
 	InternetAccessEnabled                         bool                            `json:"internet_access_enabled"`
 	IsNAT                                         bool                            `json:"is_nat"`
-	L2TpAllowWeakCiphers                          bool                            `json:"l2tp_allow_weak_ciphers"`
+	L4TpAllowWeakCiphers                          bool                            `json:"l2tp_allow_weak_ciphers"`
 	L2TpInterface                                 string                          `json:"l2tp_interface,omitempty"`    // wan|wan2
 	L2TpLocalWANIP                                string                          `json:"l2tp_local_wan_ip,omitempty"` // ^any$|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
 	LocalPort                                     int                             `json:"local_port,omitempty"`        // ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$
@@ -421,7 +422,7 @@ func (c *Client) listNetwork(ctx context.Context, site string) ([]Network, error
 	if err != nil {
 		return nil, err
 	}
-
+        fmt.Printf("%+v",respBody.Data)
 	return respBody.Data, nil
 }
 

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

@@ -213,8 +213,12 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
 		return fmt.Errorf("unable to parse URL: %s %s %w", method, relativeURL, err)
 	}
 	if !strings.HasPrefix(relativeURL, "/") && !reqURL.IsAbs() {
+	        if strings.Contains(relativeURL, "firewall/zone") {
+		     reqURL.Path = path.Join(c.apiV2Path, reqURL.Path)
+		} else {
 		     reqURL.Path = path.Join(c.apiPath, reqURL.Path)
 		}
+	}
 
 	url := c.baseURL.ResolveReference(reqURL)
 	req, err := http.NewRequestWithContext(ctx, method, url.String(), reqReader)