From c393dcbe716eae00598b97aa0f240bec69fec4ad Mon Sep 17 00:00:00 2001
From: Mateusz Filipowicz <mateusz.filipowicz@roche.com>
Date: Thu, 6 Feb 2025 23:30:34 +0100
Subject: [PATCH] fix: WAN network support was broken

---
 .gitignore                 | 3 +++
 README.md                  | 4 ++--
 fields/generator.go        | 2 ++
 go.mod                     | 2 +-
 unifi/account_test.go      | 2 +-
 unifi/network.generated.go | 4 ++--
 unifi/network_test.go      | 2 +-
 unifi/version.generated.go | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85d135e..5c0a48c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 
 # goreleaser
 /dist/
+
+.idea
+*.iml
diff --git a/README.md b/README.md
index b1a23a7..9300bdd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Unifi Go SDK [![GoDoc](https://godoc.org/github.com/paultyng/go-unifi?status.svg)](https://godoc.org/github.com/paultyng/go-unifi)
+# Unifi Go SDK [![GoDoc](https://godoc.org/github.com/filipowm/go-unifi?status.svg)](https://godoc.org/github.com/filipowm/go-unifi)
 
-This was written primarily for use in my [Terraform provider for Unifi](https://github.com/paultyng/terraform-provider-unifi).
+This was written primarily for use in my [Terraform provider for Unifi](https://github.com/filipowm/terraform-provider-unifi).
 
 ## Versioning
 
diff --git a/fields/generator.go b/fields/generator.go
index 9ad580a..c20c96c 100644
--- a/fields/generator.go
+++ b/fields/generator.go
@@ -431,6 +431,8 @@ func generateCode(fieldsDir string, outDir string) error {
 						f.CustomUnmarshalType = "*bool"
 						f.CustomUnmarshalFunc = "emptyBoolToTrue"
 					}
+				case "WANUsername", "XWANPassword":
+					f.OmitEmpty = true
 				}
 				return nil
 			}
diff --git a/go.mod b/go.mod
index 8b11662..b67491f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/paultyng/go-unifi
+module github.com/filipowm/go-unifi
 
 go 1.22.1
 
diff --git a/unifi/account_test.go b/unifi/account_test.go
index 6e8d178..4615324 100644
--- a/unifi/account_test.go
+++ b/unifi/account_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/paultyng/go-unifi/unifi"
+	"github.com/filipowm/go-unifi/unifi"
 	"github.com/tj/assert"
 )
 
diff --git a/unifi/network.generated.go b/unifi/network.generated.go
index 520f299..8c5af25 100644
--- a/unifi/network.generated.go
+++ b/unifi/network.generated.go
@@ -231,7 +231,7 @@ type Network struct {
 	WANSmartqUpRate                               int                             `json:"wan_smartq_up_rate,omitempty"` // [0-9]{1,6}|1000000
 	WANType                                       string                          `json:"wan_type,omitempty"`           // disabled|dhcp|static|pppoe|dslite
 	WANTypeV6                                     string                          `json:"wan_type_v6,omitempty"`        // disabled|slaac|dhcpv6|static
-	WANUsername                                   string                          `json:"wan_username"`                 // [^"' ]+|^$
+	WANUsername                                   string                          `json:"wan_username,omitempty"`       // [^"' ]+|^$
 	WANVLAN                                       int                             `json:"wan_vlan,omitempty"`           // [0-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-4]|^$
 	WANVLANEnabled                                bool                            `json:"wan_vlan_enabled"`
 	WireguardClientConfigurationFile              string                          `json:"wireguard_client_configuration_file,omitempty"`
@@ -257,7 +257,7 @@ type Network struct {
 	XServerKey                                    string                          `json:"x_server_key,omitempty"`
 	XSharedClientCrt                              string                          `json:"x_shared_client_crt,omitempty"`
 	XSharedClientKey                              string                          `json:"x_shared_client_key,omitempty"`
-	XWANPassword                                  string                          `json:"x_wan_password"` // [^"' ]+|^$
+	XWANPassword                                  string                          `json:"x_wan_password,omitempty"` // [^"' ]+|^$
 	XWireguardPrivateKey                          string                          `json:"x_wireguard_private_key,omitempty"`
 }
 
diff --git a/unifi/network_test.go b/unifi/network_test.go
index d83973b..5c1d7d4 100644
--- a/unifi/network_test.go
+++ b/unifi/network_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/paultyng/go-unifi/unifi"
+	"github.com/filipowm/go-unifi/unifi"
 )
 
 func TestNetworkUnmarshalJSON(t *testing.T) {
diff --git a/unifi/version.generated.go b/unifi/version.generated.go
index 0f38928..3720618 100644
--- a/unifi/version.generated.go
+++ b/unifi/version.generated.go
@@ -2,4 +2,4 @@
 
 package unifi
 
-const UnifiVersion = "9.0.108"
+const UnifiVersion = "9.0.114"