From 6bbf3e5efb80a115e024109b4de71bdb2291c61b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 26 Jul 2013 15:19:25 -0400
Subject: [PATCH] fixes #408 - Apostrophes in profile names are bad.

---
 MediaBrowser.Api/UserService.cs           | 8 ++++----
 MediaBrowser.WebDashboard/ApiClient.js    | 5 +++--
 MediaBrowser.WebDashboard/packages.config | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index b987abcc04..1a12c54390 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -88,7 +88,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class AuthenticateUser
     /// </summary>
-    [Route("/Users/{Name}/AuthenticateByName", "POST")]
+    [Route("/Users/AuthenticateByName", "POST")]
     [Api(Description = "Authenticates a user")]
     public class AuthenticateUserByName : IReturn<AuthenticationResult>
     {
@@ -96,8 +96,8 @@ namespace MediaBrowser.Api
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ApiMember(Name = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Name { get; set; }
+        [ApiMember(Name = "Username", IsRequired = true, DataType = "string", ParameterType = "body", Verb = "POST")]
+        public string Username { get; set; }
 
         /// <summary>
         /// Gets or sets the password.
@@ -279,7 +279,7 @@ namespace MediaBrowser.Api
 
         public object Post(AuthenticateUserByName request)
         {
-            var user = _userManager.Users.FirstOrDefault(i => string.Equals(request.Name, i.Name, StringComparison.OrdinalIgnoreCase));
+            var user = _userManager.Users.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
 
             var result = AuthenticateUser(new AuthenticateUser { Id = user.Id, Password = request.Password }).Result;
 
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 7a2fae3e93..64c2667753 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -1898,10 +1898,11 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
             }
 
-            var url = self.getUrl("Users/" + name + "/authenticatebyname");
+            var url = self.getUrl("Users/authenticatebyname");
 
             var postData = {
-                password: MediaBrowser.SHA1(password || "")
+                password: MediaBrowser.SHA1(password || ""),
+                Username: name
             };
 
             return self.ajax({
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index ab301bbe11..d09994b2a8 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.145" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.146" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.56" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.55" targetFramework="net45" />
 </packages>
\ No newline at end of file