Merge pull request #18 from abapguruger/master

Added list of networks and wireless networks
KoenZomers · Feb 1, 2021 · 15a9883 · 15a9883
2 parents a702ef4 + 0ecc52e
commit 15a9883
Show file tree

Hide file tree

Showing 9 changed files with 605 additions and 38 deletions.
diff --git a/Api/Api.cs b/Api/Api.cs
diff --git a/Api/Api.csproj b/Api/Api.csproj
@@ -6,17 +6,19 @@
     <RootNamespace>KoenZomers.UniFi.Api</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <Version>1.1.8.0</Version>
+    <Version>1.1.9.0</Version>
     <Authors>Koen Zomers</Authors>
     <Company>Koen Zomers</Company>
     <Description>API in .NET Standard to fetch data from an on premises Ubiquiti UniFi Controller</Description>
     <Copyright>Koen Zomers</Copyright>
     <PackageProjectUrl>https://github.com/KoenZomers/UniFiApi</PackageProjectUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>- Added `RenameClient` option to change the friendly name of a client</PackageReleaseNotes>
+    <PackageReleaseNotes>- Added ability to get a list of wireless networks [PR 18](https://github.com/KoenZomers/UniFiApi/pull/18)
+- Added ability to get a list of configured networks [PR 18](https://github.com/KoenZomers/UniFiApi/pull/18)
+- Added a validation if the session has been authenticated before and now receives a HTTP 401 Unauthorized response, that it will try to reauthenticate to deal wEnsureAuthenticatedPostRequestEnsureAuthenticatedPostRequestth the cookie token expired scenario</PackageReleaseNotes>
     <PackageLicenseUrl>https://github.com/KoenZomers/UniFiApi/blob/master/LICENSE</PackageLicenseUrl>
-    <AssemblyVersion>1.1.8.0</AssemblyVersion>
-    <FileVersion>1.1.8.0</FileVersion>
+    <AssemblyVersion>1.1.9.0</AssemblyVersion>
+    <FileVersion>1.1.9.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Api/HttpUtility.cs b/Api/HttpUtility.cs
@@ -44,7 +44,7 @@ public async static Task<string> GetRequestResult(Uri url, CookieContainer cooki
             request.KeepAlive = false;
 
             // Send the request to the webserver
-            using (var response = await request.GetResponseAsync())
+            using (var response = await request.GetResponseAsync())            
             {
                 // Get the stream containing content returned by the server.
                 using (var dataStream = response.GetResponseStream())

diff --git a/Api/KoenZomers.UniFi.Api.xml b/Api/KoenZomers.UniFi.Api.xml
diff --git a/Api/Responses/Network.cs b/Api/Responses/Network.cs
@@ -0,0 +1,100 @@
+using Newtonsoft.Json;
+
+namespace KoenZomers.UniFi.Api.Responses
+{
+    /// <summary>
+    /// Details of a UniFi network definition
+    /// </summary>
+    public class Network : BaseResponse
+    {
+        /// <summary>
+        /// Unique network ID
+        /// </summary>
+        [JsonProperty(PropertyName = "_id")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Name of the network
+        /// </summary>
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Identifier of the site in UniFi to which this client is connected
+        /// </summary>
+        [JsonProperty(PropertyName = "site_id")]
+        public string SiteId { get; set; }
+
+        /// <summary>
+        /// Is VLAN enabled?
+        /// </summary>
+        [JsonProperty(PropertyName = "vlan_enabled")]
+        public bool IsVLANEnabled { get; set; }
+
+        /// <summary>
+        /// If VLAN is enabled, VLAN number
+        /// </summary>
+        [JsonProperty(PropertyName = "vlan")]
+        public string VLAN { get; set; }
+
+        /// <summary>
+        /// Purpose of this network (corporate, guest, vlan only, etc.)
+        /// </summary>
+        [JsonProperty(PropertyName = "purpose")]
+        public string Purpose { get; set; }
+
+        /// <summary>
+        /// IP-Subnet (CIDR)
+        /// </summary>
+        [JsonProperty(PropertyName = "ip_subnet")]
+        public string IpSubnet { get; set; }
+
+        /// <summary>
+        /// Domain Name of this Network
+        /// </summary>
+        [JsonProperty(PropertyName = "domain_name")]
+        public string DomainName { get; set; }
+
+        /// <summary>
+        /// Is NAT enabled?
+        /// </summary>
+        [JsonProperty(PropertyName = "is_nat")]
+        public bool? IsNAT { get; set; }
+
+        /// <summary>
+        /// Is DHCP enabled?
+        /// </summary>
+        [JsonProperty(PropertyName = "dhcpd_enabled")]
+        public bool? IsDHCPEnabled { get; set; }
+
+        /// <summary>
+        /// DHCP Start IP Address
+        /// </summary>
+        [JsonProperty(PropertyName = "dhcpd_start")]
+        public string DHCPStart { get; set; }
+
+        /// <summary>
+        /// DHCP End IP Address
+        /// </summary>
+        [JsonProperty(PropertyName = "dhcpd_stop")]
+        public string DHCPStop { get; set; }
+
+        /// <summary>
+        /// Network Group
+        /// </summary>
+        [JsonProperty(PropertyName = "networkgroup")]
+        public string NetworkGroup { get; set; }
+
+        /// <summary>
+        /// Internal identifier of the site
+        /// </summary>
+        [JsonProperty(PropertyName = "attr_hidden_id")]
+        public string HiddenId { get; set; }
+
+        /// <summary>
+        /// Boolean indicating if deletion of this site is being disallowed
+        /// </summary>
+        [JsonProperty(PropertyName = "attr_no_delete")]
+        public bool? DontAllowDeletion { get; set; }
+    }
+}