fixed configuration saving issues

10 files changed, 69 insertions, 123 deletions

diff --git a/MediaBrowser.Api/Api.cs b/MediaBrowser.Api/Api.cs
deleted file mode 100644
index fda9d1bd8..000000000
--- a/MediaBrowser.Api/Api.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api
-{
-    class Api
-    {
-    }
-}
diff --git a/MediaBrowser.Api/Javascript/ApiClient.js b/MediaBrowser.Api/Javascript/ApiClient.js
index 84e54597b..a57722e50 100644
--- a/MediaBrowser.Api/Javascript/ApiClient.js
+++ b/MediaBrowser.Api/Javascript/ApiClient.js
@@ -1126,7 +1126,29 @@ var ApiClient = {
 
         var url = ApiClient.getUrl("System/Configuration");
 
-        return $.post(url, JSON.stringify(configuration));
+        return $.ajax({
+            type: "POST",
+            url: url,
+            data: JSON.stringify(configuration),
+            dataType: "json",
+            contentType: "application/json"
+        });
+    },
+
+    /**
+     * Updates plugin security info
+     */
+    updatePluginSecurityInfo: function (info) {
+
+        var url = ApiClient.getUrl("Plugins/SecurityInfo");
+
+        return $.ajax({
+            type: "POST",
+            url: url,
+            data: JSON.stringify(info),
+            dataType: "json",
+            contentType: "application/json"
+        });
     },
 
     /**
@@ -1141,7 +1163,13 @@ var ApiClient = {
 
         var url = ApiClient.getUrl("Users");
 
-        return $.post(url, JSON.stringify(user));
+        return $.ajax({
+            type: "POST",
+            url: url,
+            data: JSON.stringify(user),
+            dataType: "json",
+            contentType: "application/json"
+        });
     },
 
     /**
@@ -1156,7 +1184,13 @@ var ApiClient = {
 
         var url = ApiClient.getUrl("Users/" + user.Id);
 
-        return $.post(url, JSON.stringify(user));
+        return $.ajax({
+            type: "POST",
+            url: url,
+            data: JSON.stringify(user),
+            dataType: "json",
+            contentType: "application/json"
+        });
     },
 
     /**
@@ -1176,7 +1210,13 @@ var ApiClient = {
 
         var url = ApiClient.getUrl("ScheduledTasks/" + id + "/Triggers");
 
-        return $.post(url, JSON.stringify(triggers));
+        return $.ajax({
+            type: "POST",
+            url: url,
+            data: JSON.stringify(triggers),
+            dataType: "json",
+            contentType: "application/json"
+        });
     },
 
     /**
@@ -1196,7 +1236,13 @@ var ApiClient = {
 
         var url = ApiClient.getUrl("Plugins/" + id + "/Configuration");
 
-        return $.post(url, JSON.stringify(configuration));
+        return $.ajax({
+            type: "POST",
+            url: url,
+            data: JSON.stringify(configuration),
+            dataType: "json",
+            contentType: "application/json"
+        });
     },
 
     /**
diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs
index 932a3e545..044f867ab 100644
--- a/MediaBrowser.Api/PluginService.cs
+++ b/MediaBrowser.Api/PluginService.cs
@@ -106,13 +106,8 @@ namespace MediaBrowser.Api
     /// Class UpdatePluginSecurityInfo
     /// </summary>
     [Route("/Plugins/SecurityInfo", "POST")]
-    public class UpdatePluginSecurityInfo : IReturnVoid, IRequiresRequestStream
+    public class UpdatePluginSecurityInfo : PluginSecurityInfo, IReturnVoid
     {
-        /// <summary>
-        /// The raw Http Request Input Stream
-        /// </summary>
-        /// <value>The request stream.</value>
-        public Stream RequestStream { get; set; }
     }
 
     /// <summary>
@@ -227,7 +222,7 @@ namespace MediaBrowser.Api
         /// <param name="request">The request.</param>
         public void Post(UpdatePluginSecurityInfo request)
         {
-            var info = _jsonSerializer.DeserializeFromStream<PluginSecurityInfo>(request.RequestStream);
+            var info = request;
 
             _securityManager.SupporterKey = info.SupporterKey;
             _securityManager.LegacyKey = info.LegacyKey;
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index 45d1ae14c..0c18725fa 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -64,19 +64,13 @@ namespace MediaBrowser.Api.ScheduledTasks
     /// Class UpdateScheduledTaskTriggers
     /// </summary>
     [Route("/ScheduledTasks/{Id}/Triggers", "POST")]
-    public class UpdateScheduledTaskTriggers : IRequiresRequestStream
+    public class UpdateScheduledTaskTriggers : List<TaskTriggerInfo>, IReturnVoid
     {
         /// <summary>
         /// Gets or sets the task id.
         /// </summary>
         /// <value>The task id.</value>
         public Guid Id { get; set; }
-
-        /// <summary>
-        /// The raw Http Request Input Stream
-        /// </summary>
-        /// <value>The request stream.</value>
-        public Stream RequestStream { get; set; }
     }
 
     /// <summary>
@@ -202,7 +196,7 @@ namespace MediaBrowser.Api.ScheduledTasks
                 throw new ResourceNotFoundException("Task not found");
             }
 
-            var triggerInfos = _jsonSerializer.DeserializeFromStream<TaskTriggerInfo[]>(request.RequestStream);
+            var triggerInfos = request;
 
             task.Triggers = triggerInfos.Select(ScheduledTaskHelpers.GetTrigger);
         }
diff --git a/MediaBrowser.Api/SystemService.cs b/MediaBrowser.Api/SystemService.cs
index 0d5d47e4b..96ed70b8f 100644
--- a/MediaBrowser.Api/SystemService.cs
+++ b/MediaBrowser.Api/SystemService.cs
@@ -49,13 +49,8 @@ namespace MediaBrowser.Api
     /// Class UpdateConfiguration
     /// </summary>
     [Route("/System/Configuration", "POST")]
-    public class UpdateConfiguration : IRequiresRequestStream
+    public class UpdateConfiguration : ServerConfiguration, IReturnVoid
     {
-        /// <summary>
-        /// The raw Http Request Input Stream
-        /// </summary>
-        /// <value>The request stream.</value>
-        public Stream RequestStream { get; set; }
     }
 
     /// <summary>
@@ -160,9 +155,13 @@ namespace MediaBrowser.Api
         /// <param name="request">The request.</param>
         public void Post(UpdateConfiguration request)
         {
-            var serverConfig = _jsonSerializer.DeserializeFromStream<ServerConfiguration>(request.RequestStream);
+            // Silly, but we need to serialize and deserialize or the XmlSerializer will write the xml with an element name of UpdateConfiguration
+
+            var json = _jsonSerializer.SerializeToString(request);
+
+            var config = _jsonSerializer.DeserializeFromString<ServerConfiguration>(json);
 
-            _configurationManager.ReplaceConfiguration(serverConfig);
+            _configurationManager.ReplaceConfiguration(config);
         }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index ad4d9f73e..c40e59998 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -62,25 +62,13 @@ namespace MediaBrowser.Api.UserLibrary
     /// </summary>
     [Route("/Users/{UserId}/Items/{Id}/DisplayPreferences", "POST")]
     [ServiceStack.ServiceHost.Api(("Updates a user's display preferences for an item"))]
-    public class UpdateDisplayPreferences : IReturnVoid, IRequiresRequestStream
+    public class UpdateDisplayPreferences : DisplayPreferences, IReturnVoid
     {
         /// <summary>
-        /// Gets or sets the user id.
-        /// </summary>
-        /// <value>The user id.</value>
-        public Guid UserId { get; set; }
-
-        /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
         public string Id { get; set; }
-
-        /// <summary>
-        /// The raw Http Request Input Stream
-        /// </summary>
-        /// <value>The request stream.</value>
-        public Stream RequestStream { get; set; }
     }
 
     /// <summary>
@@ -434,7 +422,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var item = (Folder)DtoBuilder.GetItemByClientId(itemId, _userManager, _libraryManager, user.Id);
 
-            var displayPreferences = _jsonSerializer.DeserializeFromStream<DisplayPreferences>(request.RequestStream);
+            var displayPreferences = request;
 
             var task = _libraryManager.SaveDisplayPreferencesForFolder(user, item, displayPreferences);
 
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index d43eded29..a2618c43c 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -102,32 +102,16 @@ namespace MediaBrowser.Api
     /// Class UpdateUser
     /// </summary>
     [Route("/Users/{Id}", "POST")]
-    public class UpdateUser : IRequiresRequestStream, IReturnVoid
+    public class UpdateUser : UserDto, IReturnVoid
     {
-        /// <summary>
-        /// The raw Http Request Input Stream
-        /// </summary>
-        /// <value>The request stream.</value>
-        public Stream RequestStream { get; set; }
-
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public Guid Id { get; set; }
     }
 
     /// <summary>
     /// Class CreateUser
     /// </summary>
     [Route("/Users", "POST")]
-    public class CreateUser : IRequiresRequestStream, IReturn<UserDto>
+    public class CreateUser : UserDto, IReturn<UserDto>
     {
-        /// <summary>
-        /// The raw Http Request Input Stream
-        /// </summary>
-        /// <value>The request stream.</value>
-        public Stream RequestStream { get; set; }
     }
 
     /// <summary>
@@ -292,7 +276,7 @@ namespace MediaBrowser.Api
             var pathInfo = PathInfo.Parse(Request.PathInfo);
             var id = new Guid(pathInfo.GetArgumentValue<string>(1));
 
-            var dtoUser = _jsonSerializer.DeserializeFromStream<UserDto>(request.RequestStream);
+            var dtoUser = request;
 
             var user = _userManager.GetUserById(id);
 
@@ -310,7 +294,7 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Post(CreateUser request)
         {
-            var dtoUser = _jsonSerializer.DeserializeFromStream<UserDto>(request.RequestStream);
+            var dtoUser = request;
 
             var newUser = _userManager.CreateUser(dtoUser.Name).Result;
 
diff --git a/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs b/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
index d01199f6f..06c60dacd 100644
--- a/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
+++ b/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
@@ -25,22 +25,6 @@ namespace MediaBrowser.Common.Implementations.Serialization
         /// <summary>
         /// Deserializes from stream.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="stream">The stream.</param>
-        /// <returns>``0.</returns>
-        public T DeserializeFromStream<T>(Stream stream)
-        {
-            using (var reader = new XmlTextReader(stream))
-            {
-                var netSerializer = new System.Xml.Serialization.XmlSerializer(typeof(T));
-
-                return (T)netSerializer.Deserialize(reader);
-            }
-        }
-
-        /// <summary>
-        /// Deserializes from stream.
-        /// </summary>
         /// <param name="type">The type.</param>
         /// <param name="stream">The stream.</param>
         /// <returns>System.Object.</returns>
@@ -68,20 +52,6 @@ namespace MediaBrowser.Common.Implementations.Serialization
         }
 
         /// <summary>
-        /// Deserializes from file.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="file">The file.</param>
-        /// <returns>``0.</returns>
-        public T DeserializeFromFile<T>(string file)
-        {
-            using (var stream = File.OpenRead(file))
-            {
-                return DeserializeFromStream<T>(stream);
-            }
-        }
-
-        /// <summary>
         /// Serializes to file.
         /// </summary>
         /// <param name="obj">The obj.</param>
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
index 1d0e0302b..177377350 100644
--- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
@@ -8,14 +8,6 @@ namespace MediaBrowser.Model.Serialization
         /// <summary>
         /// Deserializes from stream.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="stream">The stream.</param>
-        /// <returns>``0.</returns>
-        T DeserializeFromStream<T>(Stream stream);
-
-        /// <summary>
-        /// Deserializes from stream.
-        /// </summary>
         /// <param name="type">The type.</param>
         /// <param name="stream">The stream.</param>
         /// <returns>System.Object.</returns>
@@ -29,14 +21,6 @@ namespace MediaBrowser.Model.Serialization
         void SerializeToStream(object obj, Stream stream);
 
         /// <summary>
-        /// Deserializes from file.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="file">The file.</param>
-        /// <returns>``0.</returns>
-        T DeserializeFromFile<T>(string file);
-
-        /// <summary>
         /// Serializes to file.
         /// </summary>
         /// <param name="obj">The obj.</param>
diff --git a/MediaBrowser.WebDashboard/Html/scripts/SupporterKeyPage.js b/MediaBrowser.WebDashboard/Html/scripts/SupporterKeyPage.js
index 50da44331..cebc47764 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/SupporterKeyPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/SupporterKeyPage.js
@@ -37,9 +37,7 @@
                 LegacyKey: legacyKey
             };
 
-            var url = ApiClient.getUrl("Plugins/SecurityInfo");
-            console.log(url);
-            $.post(url, JSON.stringify(info)).done(function () {
+            ApiClient.updateSecurityInfo(info).done(function () {
                 Dashboard.resetPluginSecurityInfo();
                 Dashboard.hideLoadingMsg();
                 SupporterPage.load();