aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-09-06 14:50:16 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-09-06 14:50:16 -0400
commitb12da143d1e8a319e4b7309ab9240b603b544e18 (patch)
tree71cb760003f317ab750e16a3c870cabf8061b584
parent79cfbb17688a083eee3caeb88403659fa23774df (diff)
Authentication tweaks
-rw-r--r--MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs2
-rw-r--r--MediaBrowser.ApiInteraction/ApiClient.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs
index c0ee2ff0e..ed588e776 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(await GetFormValue("userId").ConfigureAwait(false));
+ 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 f8c0dc761..ca53c66fc 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -654,9 +654,9 @@ namespace MediaBrowser.ApiInteraction
/// </summary>
public async Task<AuthenticationResult> AuthenticateUser(Guid userId, string password)
{
- string url = ApiUrl + "/UserAuthentication?userId=" + userId;
- url += "&dataformat=" + SerializationFormat.ToString();
+ string url = ApiUrl + "/UserAuthentication?dataformat=" + SerializationFormat.ToString();
+ // Create the post body
string postContent = string.Format("userid={0}&password={1}", userId, password);
HttpContent content = new StringContent(postContent, Encoding.UTF8, "application/x-www-form-urlencoded");