diff --git a/Ombi.Core/JsonRequestModelRequestService.cs b/Ombi.Core/JsonRequestModelRequestService.cs index 3388fd589..4bdcb89d0 100644 --- a/Ombi.Core/JsonRequestModelRequestService.cs +++ b/Ombi.Core/JsonRequestModelRequestService.cs @@ -73,29 +73,51 @@ namespace Ombi.Core public RequestedModel CheckRequest(int providerId) { var blobs = Repo.GetAll(); - var blob = blobs.FirstOrDefault(x => x.ProviderId == providerId); - return blob != null ? ByteConverterHelper.ReturnObject(blob.Content) : null; + var blob = blobs.FirstOrDefault(x => x.ProviderId == providerId); if (blob == null) + { + return null; + } + var model = ByteConverterHelper.ReturnObject(blob.Content); + model.Id = blob.Id; + return model; } public async Task CheckRequestAsync(int providerId) { var blobs = await Repo.GetAllAsync().ConfigureAwait(false); - var blob = blobs.FirstOrDefault(x => x.ProviderId == providerId); - return blob != null ? ByteConverterHelper.ReturnObject(blob.Content) : null; + var blob = blobs.FirstOrDefault(x => x.ProviderId == providerId); if (blob == null) + { + return null; + } + var model = ByteConverterHelper.ReturnObject(blob.Content); + model.Id = blob.Id; + return model; } public RequestedModel CheckRequest(string musicId) { var blobs = Repo.GetAll(); - var blob = blobs.FirstOrDefault(x => x.MusicId == musicId); - return blob != null ? ByteConverterHelper.ReturnObject(blob.Content) : null; + var blob = blobs.FirstOrDefault(x => x.MusicId == musicId); if (blob == null) + { + return null; + } + var model = ByteConverterHelper.ReturnObject(blob.Content); + model.Id = blob.Id; + return model; } public async Task CheckRequestAsync(string musicId) { var blobs = await Repo.GetAllAsync().ConfigureAwait(false); var blob = blobs.FirstOrDefault(x => x.MusicId == musicId); - return blob != null ? ByteConverterHelper.ReturnObject(blob.Content) : null; + + if (blob == null) + { + return null; + } + var model = ByteConverterHelper.ReturnObject(blob.Content); + model.Id = blob.Id; + return model; } public void DeleteRequest(RequestedModel request) @@ -130,6 +152,7 @@ namespace Ombi.Core return new RequestedModel(); } var model = ByteConverterHelper.ReturnObject(blob.Content); + model.Id = blob.Id; // They should always be the same, but for somereason a user didn't have it in the db https://github.com/tidusjar/Ombi/issues/862#issuecomment-269743847 return model; } @@ -141,23 +164,44 @@ namespace Ombi.Core return new RequestedModel(); } var model = ByteConverterHelper.ReturnObject(blob.Content); + model.Id = blob.Id; return model; } public IEnumerable GetAll() { - var blobs = Repo.GetAll(); - return blobs.Select(b => Encoding.UTF8.GetString(b.Content)) - .Select(JsonConvert.DeserializeObject) - .ToList(); + var blobs = Repo.GetAll().ToList(); + var retVal = new List(); + + foreach (var b in blobs) + { + if (b == null) + { + continue; + } + var model = ByteConverterHelper.ReturnObject(b.Content); + model.Id = b.Id; + retVal.Add(model); + } + return retVal; } public async Task> GetAllAsync() { var blobs = await Repo.GetAllAsync().ConfigureAwait(false); - return blobs.Select(b => Encoding.UTF8.GetString(b.Content)) - .Select(JsonConvert.DeserializeObject) - .ToList(); + var retVal = new List(); + + foreach (var b in blobs) + { + if (b == null) + { + continue; + } + var model = ByteConverterHelper.ReturnObject(b.Content); + model.Id = b.Id; + retVal.Add(model); + } + return retVal; } public bool BatchUpdate(IEnumerable model) diff --git a/Ombi.Core/UserMapper.cs b/Ombi.Core/UserMapper.cs index ace0f4f0f..1a7aaca6d 100644 --- a/Ombi.Core/UserMapper.cs +++ b/Ombi.Core/UserMapper.cs @@ -68,7 +68,7 @@ namespace Ombi.Core foreach (var u in users) { - if (username == u.UserName) + if (username.Equals(u.UserName, StringComparison.CurrentCultureIgnoreCase)) { var passwordMatch = PasswordHasher.VerifyPassword(password, u.Salt, u.Hash); if (passwordMatch) diff --git a/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml b/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml index 305936a39..9d3e24893 100644 --- a/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml +++ b/Ombi.UI/Views/Shared/Partial/_Navbar.cshtml @@ -1,4 +1,4 @@ -@using Nancy.Security +ab@using Nancy.Security @using Nancy.Session @using Nancy; @using Ombi.Helpers @@ -58,7 +58,7 @@