diff options
Diffstat (limited to 'MediaBrowser.Api/HttpHandlers')
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/DefaultUserHandler.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/GenreHandler.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/GenresHandler.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/ItemHandler.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/ItemListHandler.cs | 88 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/PersonHandler.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/StudioHandler.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/StudiosHandler.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs | 16 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/UsersHandler.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/YearHandler.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/YearsHandler.cs | 12 |
13 files changed, 93 insertions, 134 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/DefaultUserHandler.cs b/MediaBrowser.Api/HttpHandlers/DefaultUserHandler.cs index 0fb739b7d..56a05dab8 100644 --- a/MediaBrowser.Api/HttpHandlers/DefaultUserHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/DefaultUserHandler.cs @@ -1,9 +1,7 @@ -using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
-using MediaBrowser.Controller;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -11,7 +9,7 @@ namespace MediaBrowser.Api.HttpHandlers {
protected override Task<DTOUser> GetObjectToSerialize()
{
- User user = Kernel.Instance.Users.FirstOrDefault();
+ User user = ApiService.GetDefaultUser(false);
DTOUser dto = ApiService.GetDTOUser(user);
diff --git a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs index eeadf1e45..dffae49d7 100644 --- a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs @@ -1,11 +1,11 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -17,8 +17,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
string name = QueryString["name"];
diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs index 9be2efa17..073411b88 100644 --- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs @@ -1,11 +1,10 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -14,8 +13,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem[]> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
return GetAllGenres(parent, user);
}
diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index c45d20b7c..9496362b9 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -1,12 +1,12 @@ -using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Logging;
+using MediaBrowser.Common.Logging;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -57,8 +57,7 @@ namespace MediaBrowser.Api.HttpHandlers if (!string.IsNullOrEmpty(userId))
{
- Guid userIdGuid = new Guid(userId);
- return Kernel.Instance.Users.First(u => u.Id == userIdGuid).PrimaryImagePath;
+ return ApiService.GetUserById(userId, false).PrimaryImagePath;
}
BaseItem item = ApiService.GetItemById(QueryString["id"]);
diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs index 35310f042..e6908001d 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs @@ -1,10 +1,7 @@ -using System;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
-using MediaBrowser.Controller;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -12,8 +9,7 @@ namespace MediaBrowser.Api.HttpHandlers {
protected override Task<DTOBaseItem> GetObjectToSerialize()
{
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
BaseItem item = ItemToSerialize;
diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs index 09814b191..a792f8b03 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs @@ -1,11 +1,10 @@ -using System;
+using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Entities;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
-using MediaBrowser.Controller;
-using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -13,68 +12,55 @@ namespace MediaBrowser.Api.HttpHandlers {
protected override Task<DTOBaseItem[]> GetObjectToSerialize()
{
- User user = Kernel.Instance.Users.First(u => u.Id == UserId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
- return Task.WhenAll<DTOBaseItem>(ItemsToSerialize.Select(i =>
+ return Task.WhenAll<DTOBaseItem>(GetItemsToSerialize(user).Select(i =>
{
return ApiService.GetDTOBaseItem(i, user, includeChildren: false, includePeople: false);
}));
}
- protected IEnumerable<BaseItem> ItemsToSerialize
+ private IEnumerable<BaseItem> GetItemsToSerialize(User user)
{
- get
- {
- Folder parent = ApiService.GetItemById(ItemId) as Folder;
-
- User user = Kernel.Instance.Users.First(u => u.Id == UserId);
+ Folder parent = ApiService.GetItemById(ItemId) as Folder;
- if (ListType.Equals("inprogressitems", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetInProgressItems(user);
- }
- else if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetRecentlyAddedItems(user);
- }
- else if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetRecentlyAddedUnplayedItems(user);
- }
- else if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetItemsWithGenre(QueryString["name"], user);
- }
- else if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetItemsWithYear(int.Parse(QueryString["year"]), user);
- }
- else if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetItemsWithStudio(QueryString["name"], user);
- }
- else if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase))
- {
- return parent.GetItemsWithPerson(QueryString["name"], null, user);
- }
-
- throw new InvalidOperationException();
+ if (ListType.Equals("inprogressitems", StringComparison.OrdinalIgnoreCase))
+ {
+ return parent.GetInProgressItems(user);
}
- }
-
- protected string ItemId
- {
- get
+ else if (ListType.Equals("recentlyaddeditems", StringComparison.OrdinalIgnoreCase))
{
- return QueryString["id"];
+ return parent.GetRecentlyAddedItems(user);
+ }
+ else if (ListType.Equals("recentlyaddedunplayeditems", StringComparison.OrdinalIgnoreCase))
+ {
+ return parent.GetRecentlyAddedUnplayedItems(user);
+ }
+ else if (ListType.Equals("itemswithgenre", StringComparison.OrdinalIgnoreCase))
+ {
+ return parent.GetItemsWithGenre(QueryString["name"], user);
+ }
+ else if (ListType.Equals("itemswithyear", StringComparison.OrdinalIgnoreCase))
+ {
+ return parent.GetItemsWithYear(int.Parse(QueryString["year"]), user);
}
+ else if (ListType.Equals("itemswithstudio", StringComparison.OrdinalIgnoreCase))
+ {
+ return parent.GetItemsWithStudio(QueryString["name"], user);
+ }
+ else if (ListType.Equals("itemswithperson", StringComparison.OrdinalIgnoreCase))
+ {
+ return parent.GetItemsWithPerson(QueryString["name"], null, user);
+ }
+
+ throw new InvalidOperationException();
}
- protected Guid UserId
+ protected string ItemId
{
get
{
- return Guid.Parse(QueryString["userid"]);
+ return QueryString["id"];
}
}
diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs index 0d496c240..74373675f 100644 --- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs @@ -1,11 +1,9 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -17,8 +15,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
string name = QueryString["name"];
diff --git a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs index 458dd9da1..40cdc23bc 100644 --- a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs @@ -1,11 +1,11 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -17,8 +17,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
string name = QueryString["name"];
diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs index d9805c43c..6ccc6aa78 100644 --- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs @@ -1,11 +1,10 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -14,8 +13,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem[]> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
return GetAllStudios(parent, user);
}
diff --git a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs index 8f6680530..9f72aa417 100644 --- a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs @@ -1,10 +1,7 @@ -using System;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
-using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -12,15 +9,12 @@ namespace MediaBrowser.Api.HttpHandlers {
protected override async Task<AuthenticationResult> GetObjectToSerialize()
{
- Guid userId = Guid.Parse(await GetFormValue("userid").ConfigureAwait(false));
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ string userId = await GetFormValue("userid").ConfigureAwait(false);
+ User user = ApiService.GetUserById(userId, false);
string password = await GetFormValue("password").ConfigureAwait(false);
- return new AuthenticationResult()
- {
- Success = Kernel.GetMD5(password).Equals(user.Password)
- };
+ return Kernel.Instance.AuthenticateUser(user, password);
}
}
}
diff --git a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs index e7617fe88..82bd1f498 100644 --- a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs @@ -1,9 +1,9 @@ -using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
diff --git a/MediaBrowser.Api/HttpHandlers/YearHandler.cs b/MediaBrowser.Api/HttpHandlers/YearHandler.cs index 1b0c7f670..44e9f5198 100644 --- a/MediaBrowser.Api/HttpHandlers/YearHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/YearHandler.cs @@ -1,11 +1,9 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -17,8 +15,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
string year = QueryString["year"];
diff --git a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs index 9a7325f64..dffc0328c 100644 --- a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs @@ -1,11 +1,10 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.HttpHandlers
{
@@ -14,8 +13,7 @@ namespace MediaBrowser.Api.HttpHandlers protected override Task<IBNItem[]> GetObjectToSerialize()
{
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
- Guid userId = Guid.Parse(QueryString["userid"]);
- User user = Kernel.Instance.Users.First(u => u.Id == userId);
+ User user = ApiService.GetUserById(QueryString["userid"], true);
return GetAllYears(parent, user);
}
|