github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-21 13:53:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implimented auto approve permissions #218

Browse source
This commit is contained in:
tidusjar 2016-11-20 19:10:46 +00:00
commit 4629301264
39 changed files with 140 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

1
PlexRequests.UI/Modules/Admin/AdminModule.cs
View file

@ -67,6 +67,7 @@ using PlexRequests.UI.Models;
using Quartz;
using Action = PlexRequests.Helpers.Analytics.Action;
using HttpStatusCode = Nancy.HttpStatusCode;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

1
PlexRequests.UI/Modules/Admin/FaultQueueModule.cs
View file

@ -37,6 +37,7 @@ using PlexRequests.Store.Models;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules.Admin
{

1
PlexRequests.UI/Modules/Admin/SystemStatusModule.cs
View file

@ -40,6 +40,7 @@ using PlexRequests.Helpers;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules.Admin
{

2
PlexRequests.UI/Modules/ApiDocsModule.cs
View file

@ -29,7 +29,9 @@ using Nancy.Responses.Negotiation;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/ApiRequestModule.cs
View file

@ -36,9 +36,11 @@ using Newtonsoft.Json;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/ApiSettingsModule.cs
View file

@ -37,7 +37,9 @@ using Newtonsoft.Json;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/ApiUserModule.cs
View file

@ -32,9 +32,11 @@ using Nancy.ModelBinding;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/ApplicationTesterModule.cs
View file

@ -36,10 +36,12 @@ using NLog;
using PlexRequests.Api.Interfaces;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

1
PlexRequests.UI/Modules/ApprovalModule.cs
View file

@ -44,6 +44,7 @@ using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/BaseApiModule.cs
View file

@ -32,8 +32,10 @@ using Nancy.Validation;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.UI.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

4
PlexRequests.UI/Modules/BaseAuthModule.cs
View file

@ -28,10 +28,10 @@
using Nancy;
using Nancy.Extensions;
using PlexRequests.UI.Models;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.UI.Helpers;
using PlexRequests.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

6
PlexRequests.UI/Modules/BaseModule.cs
View file

@ -30,17 +30,13 @@ using System.Linq;
using System.Threading;
using Nancy;
using Nancy.Linker;
using Nancy.Security;
using Ninject;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/CultureModule.cs
View file

@ -35,7 +35,9 @@ using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Analytics;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/DonationLinkModule.cs
View file

@ -7,7 +7,9 @@ using NLog;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/IndexModule.cs
View file

@ -33,7 +33,9 @@ using Nancy.Responses;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

1
PlexRequests.UI/Modules/IssuesModule.cs
View file

@ -21,6 +21,7 @@ using PlexRequests.Services.Notification;
using PlexRequests.Store;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/LandingPageModule.cs
View file

@ -33,8 +33,10 @@ using Nancy.Linker;
using PlexRequests.Api.Interfaces;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

2
PlexRequests.UI/Modules/LayoutModule.cs
View file

@ -36,10 +36,12 @@ using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Core.StatusChecker;
using PlexRequests.Helpers;
using PlexRequests.Helpers.Permissions;
using PlexRequests.Services.Interfaces;
using PlexRequests.Services.Jobs;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

3
PlexRequests.UI/Modules/LoginModule.cs
View file

@ -43,9 +43,8 @@ using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Authentication;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ModuleExtensions = Nancy.Authentication.Forms.ModuleExtensions;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

1
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -50,6 +50,7 @@ using PlexRequests.Helpers.Analytics;
using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Helpers;
using Action = PlexRequests.Helpers.Analytics.Action;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{

36
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -68,6 +68,7 @@ using TMDbLib.Objects.General;
using Action = PlexRequests.Helpers.Analytics.Action;
using EpisodesModel = PlexRequests.Store.EpisodesModel;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{
@ -139,7 +140,7 @@ namespace PlexRequests.UI.Modules
Get["/episodes", true] = async (x, ct) => await GetEpisodes();
}
private IRepository<PlexContent> PlexContentRepository { get; }
private IRepository<PlexContent> PlexContentRepository { get; }
private TvMazeApi TvApi { get; }
private IPlexApi PlexApi { get; }
private TheMovieDbApi MovieApi { get; }
@ -563,7 +564,7 @@ namespace PlexRequests.UI.Modules
};
try
{
if (RequestType.Movie.ShouldAutoApprove(settings, IsAdmin, Username))
if (ShouldAutoApprove(RequestType.Movie, settings, Username))
{
var cpSettings = await CpService.GetSettingsAsync();
model.Approved = true;
@ -888,7 +889,7 @@ namespace PlexRequests.UI.Modules
try
{
if (RequestType.TvShow.ShouldAutoApprove(settings, IsAdmin, Username))
if (ShouldAutoApprove(RequestType.TvShow, settings, Username))
{
model.Approved = true;
var s = await sonarrSettings;
@ -984,10 +985,10 @@ namespace PlexRequests.UI.Modules
private bool ShouldSendNotification(RequestType type, PlexRequestSettings prSettings)
{
var sendNotification = type.ShouldAutoApprove(prSettings, IsAdmin, Username)
var sendNotification = ShouldAutoApprove(type, prSettings, Username)
? !prSettings.IgnoreNotifyForAutoApprovedRequests
: true;
if (IsAdmin)
{
sendNotification = false; // Don't bother sending a notification if the user is an admin
@ -1092,7 +1093,7 @@ namespace PlexRequests.UI.Modules
try
{
if (RequestType.Album.ShouldAutoApprove(settings, IsAdmin, Username))
if (ShouldAutoApprove(RequestType.Album, settings, Username))
{
model.Approved = true;
var hpSettings = HeadphonesService.GetSettings();
@ -1424,5 +1425,28 @@ namespace PlexRequests.UI.Modules
var diff = model.Episodes.Except(available);
return diff;
}
public bool ShouldAutoApprove(RequestType requestType, PlexRequestSettings prSettings, string username)
{
var admin = Security.HasPermissions(Context.CurrentUser, Permissions.Administrator);
// if the user is an admin or they are whitelisted, they go ahead and allow auto-approval
if (admin || prSettings.ApprovalWhiteList.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase))) return true;
// check by request type if the category requires approval or not
switch (requestType)
{
case RequestType.Movie:
return Security.HasPermissions(User, Permissions.AutoApproveMovie) ||
!prSettings.RequireMovieApproval;
case RequestType.TvShow:
return Security.HasPermissions(User, Permissions.AutoApproveTv) ||
!prSettings.RequireTvShowApproval;
case RequestType.Album:
return Security.HasPermissions(User, Permissions.AutoApproveAlbum) ||
!prSettings.RequireMusicApproval;
default:
return false;
}
}
}
}

6
PlexRequests.UI/Modules/UserLoginModule.cs
View file

@ -32,8 +32,6 @@ using System.Threading.Tasks;
using Nancy;
using Nancy.Extensions;
using Nancy.Linker;
using Nancy.Responses.Negotiation;
using NLog;
using PlexRequests.Api.Interfaces;
@ -45,9 +43,7 @@ using PlexRequests.Helpers.Analytics;
using PlexRequests.Store;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Authentication;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ModuleExtensions = Nancy.Authentication.Forms.ModuleExtensions;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules

3
PlexRequests.UI/Modules/UserManagementModule.cs
View file

@ -17,9 +17,10 @@ using PlexRequests.Helpers.Permissions;
using PlexRequests.Store;
using PlexRequests.Store.Models;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
namespace PlexRequests.UI.Modules
{
public class UserManagementModule : BaseModule

3
PlexRequests.UI/Modules/UserWizardModule.cs
View file

@ -29,10 +29,8 @@ using System.Linq;
using System.Threading.Tasks;
using Nancy;
using Nancy.Authentication.Forms;
using Nancy.Extensions;
using Nancy.ModelBinding;
using Nancy.Responses.Negotiation;
using Nancy.Validation;
using NLog;
using PlexRequests.Api.Interfaces;
@ -44,6 +42,7 @@ using PlexRequests.Helpers.Permissions;
using PlexRequests.UI.Authentication;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Models;
using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions;
using Action = PlexRequests.Helpers.Analytics.Action;