aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs2
-rw-r--r--MediaBrowser.ApiInteraction/ApiClient.cs4
2 files changed, 4 insertions, 2 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
index 0905016c4..c0ee2ff0e 100644
--- a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Api.HttpHandlers
{
protected override async Task<AuthenticationResult> GetObjectToSerialize()
{
- Guid userId = Guid.Parse(QueryString["userid"]);
+ Guid userId = Guid.Parse(await GetFormValue("userId").ConfigureAwait(false));
User user = Kernel.Instance.Users.First(u => u.Id == userId);
string password = await GetFormValue("password").ConfigureAwait(false);
diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index 48f43e03b..f8c0dc761 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -657,7 +657,9 @@ namespace MediaBrowser.ApiInteraction
string url = ApiUrl + "/UserAuthentication?userId=" + userId;
url += "&dataformat=" + SerializationFormat.ToString();
- HttpContent content = new StringContent("password=" + password, Encoding.UTF8, "application/x-www-form-urlencoded");
+ string postContent = string.Format("userid={0}&password={1}", userId, password);
+
+ HttpContent content = new StringContent(postContent, Encoding.UTF8, "application/x-www-form-urlencoded");
HttpResponseMessage msg = await HttpClient.PostAsync(url, content).ConfigureAwait(false);