Package update

Updates RestSharp to 106.12.0 (latest) Removed manual adding the contentType, and added DataFormat.Json to constructor call of RestRequest
PeterHagen · Aug 15, 2021 · 7e20839 · 7e20839
1 parent 2aeb6c0
commit 7e20839
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 22 deletions.
diff --git a/UniFiSharp/DefaultUniFiRestClient.cs b/UniFiSharp/DefaultUniFiRestClient.cs
@@ -15,12 +15,15 @@ internal class DefaultUniFiRestClient : RestClient, IUniFiRestClient
         private string _username, _password, _code;
         private bool _useModernApi;
 
-        internal DefaultUniFiRestClient(Uri baseUrl, string username, string password, string code, bool ignoreSslValidation, bool useModernApi) : 
+        internal DefaultUniFiRestClient(Uri baseUrl, string username, string password, string code,
+            bool ignoreSslValidation, bool useModernApi) :
             this(baseUrl, username, password, ignoreSslValidation, useModernApi)
         {
             _code = code;
         }
-        internal DefaultUniFiRestClient(Uri baseUrl, string username, string password, bool ignoreSslValidation, bool useModernApi) : base(baseUrl)
+
+        internal DefaultUniFiRestClient(Uri baseUrl, string username, string password, bool ignoreSslValidation,
+            bool useModernApi) : base(baseUrl)
         {
             _username = username;
             _password = password;
@@ -97,27 +100,25 @@ public async Task UnifiFileUpload(string url, string name, string fileName, stri
 
         private async Task UniFiRequest(Method method, string url, object jsonBody = null)
         {
-            var request = new RestRequest(url, method);
-            request.JsonSerializer.ContentType = $"application/json; charset={Encoding.BodyName}";
+            var request = new RestRequest(url, method, DataFormat.Json);
             if ((method == Method.POST || method == Method.PUT) && jsonBody != null)
                 request.AddJsonBody(jsonBody);
             await ExecuteRequest<object>(request);
         }
 
         private async Task<T> UniFiRequest<T>(Method method, string url, object jsonBody = null) where T : new()
         {
-            var request = new RestRequest(url, method);
-            request.JsonSerializer.ContentType = $"application/json; charset={Encoding.BodyName}";
+            var request = new RestRequest(url, method, DataFormat.Json);
             if ((method == Method.POST || method == Method.PUT) && jsonBody != null)
                 request.AddJsonBody(jsonBody);
             var envelope = await ExecuteRequest<T>(request);
             return (envelope.Data == null) ? default(T) : envelope.Data[0];
         }
 
-        private async Task<IList<T>> UniFiRequestMany<T>(Method method, string url, object jsonBody = null) where T : new()
+        private async Task<IList<T>> UniFiRequestMany<T>(Method method, string url, object jsonBody = null)
+            where T : new()
         {
-            var request = new RestRequest(url, method);
-            request.JsonSerializer.ContentType = $"application/json; charset={Encoding.BodyName}";
+            var request = new RestRequest(url, method, DataFormat.Json);
             if ((method == Method.POST || method == Method.PUT) && jsonBody != null)
                 request.AddJsonBody(jsonBody);
             var envelope = await ExecuteRequest<T>(request);
@@ -128,8 +129,7 @@ public async Task<JsonLoginResult> Authenticate()
         {
             if (_useModernApi)
             {
-                var request = new RestRequest("api/auth/login", Method.POST);
-                request.JsonSerializer.ContentType = $"application/json; charset={Encoding.BodyName}";
+                var request = new RestRequest("api/auth/login", Method.POST, DataFormat.Json);
                 request.AddJsonBody(new
                 {
                     username = _username,
@@ -157,7 +157,8 @@ public async Task<JsonLoginResult> Authenticate()
             }
         }
 
-        private async Task<JsonMessageEnvelope<T>> ExecuteRequest<T>(IRestRequest request, bool attemptReauthentication = true) where T : new()
+        private async Task<JsonMessageEnvelope<T>> ExecuteRequest<T>(IRestRequest request,
+            bool attemptReauthentication = true) where T : new()
         {
             if (_useModernApi)
                 request.Resource = "proxy/network/" + request.Resource;
@@ -167,8 +168,14 @@ public async Task<JsonLoginResult> Authenticate()
 
             if (this.CookieContainer.GetCookies(this.BaseUrl).Count > 0)
             {
-                try { this.AddDefaultHeader("X-Csrf-Token", this.CookieContainer.GetCookies(this.BaseUrl)["csrf_token"].Value); }
-                catch { }
+                try
+                {
+                    this.AddDefaultHeader("X-Csrf-Token",
+                        this.CookieContainer.GetCookies(this.BaseUrl)["csrf_token"].Value);
+                }
+                catch
+                {
+                }
             }
 
             request.RequestFormat = DataFormat.Json;
@@ -201,7 +208,8 @@ public async Task<JsonLoginResult> Authenticate()
         /// <param name="data"></param>
         /// <param name="attemptReauthentication"></param>
         /// <returns></returns>
-        private async Task UnifiMultipartFormRequest(string url, string name, string fileName, string contentType, byte[] data, bool attemptReauthentication = true)
+        private async Task UnifiMultipartFormRequest(string url, string name, string fileName, string contentType,
+            byte[] data, bool attemptReauthentication = true)
         {
             // Note the UniFi controller will return 404 when uploading a file - however the file *is* successfully uploaded. 
 
@@ -212,8 +220,14 @@ private async Task UnifiMultipartFormRequest(string url, string name, string fil
 
             if (this.CookieContainer.GetCookies(this.BaseUrl).Count > 0)
             {
-                try { this.AddDefaultHeader("X-Csrf-Token", this.CookieContainer.GetCookies(this.BaseUrl)["csrf_token"].Value); }
-                catch { }
+                try
+                {
+                    this.AddDefaultHeader("X-Csrf-Token",
+                        this.CookieContainer.GetCookies(this.BaseUrl)["csrf_token"].Value);
+                }
+                catch
+                {
+                }
             }
 
             var request = new RestRequest(url, Method.POST)
@@ -238,7 +252,5 @@ private async Task UnifiMultipartFormRequest(string url, string name, string fil
                 }
             }
         }
-
-
     }
-}
+}
diff --git a/UniFiSharp/UniFiApi.NetworkDevices.cs b/UniFiSharp/UniFiApi.NetworkDevices.cs
@@ -90,7 +90,7 @@ public async Task NetworkDeviceForget(string macAddress)
         {
             await RestClient.UniFiPost($"api/s/{Site}/cmd/sitemgr", new
             {
-                cmd = "delete-device",
+                cmd = "forget-sta", //"delete-device",
                 mac = macAddress
             });
         }

diff --git a/UniFiSharp/UniFiSharp.csproj b/UniFiSharp/UniFiSharp.csproj
@@ -33,7 +33,8 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestSharp" Version="106.2.2" />
+    <PackageReference Include="RestSharp" Version="106.12.0" />
+    <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="106.12.0" />
   </ItemGroup>
 
 </Project>