github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-23 14:35:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor CheckOwnRequests

Browse source
This commit is contained in:
Florian Dupret 2021-11-10 17:09:48 +01:00
commit f20ff7f594
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Ombi.Core/Engine/BaseMediaEngine.cs
View file

@ -78,13 +78,19 @@ namespace Ombi.Core.Engine
return _dbTv; return _dbTv;
} }
protected async Task<RequestEngineResult> CheckOwnRequests(BaseRequest request) { protected async Task<RequestEngineResult> CheckCanManageRequest(BaseRequest request) {
var isRequestedBySameUser = ( await GetUser() ).Equals(request.RequestedUser); // Admins can always manage requests
var isAdmin = await IsInRole(OmbiRoles.PowerUser) || await IsInRole(OmbiRoles.Admin); var isAdmin = await IsInRole(OmbiRoles.PowerUser) || await IsInRole(OmbiRoles.Admin);
if (isAdmin)
return new RequestEngineResult { Result = true };
// Users with 'ManageOwnRequests' can only manage their own requests
var isRequestedBySameUser = ( await GetUser() ).Equals(request.RequestedUser);
var canManageOwnRequests = await IsInRole(OmbiRoles.ManageOwnRequests);
if(canManageOwnRequests && isRequestedBySameUser)
return new RequestEngineResult { Result = true };
if (!isRequestedBySameUser && !isAdmin)
{
return new RequestEngineResult return new RequestEngineResult
{ {
Result = false, Result = false,
@ -92,12 +98,6 @@ namespace Ombi.Core.Engine
}; };
} }
return new RequestEngineResult
{
Result = true,
};
}
public RequestCountModel RequestCount() public RequestCountModel RequestCount()
{ {
var movieQuery = MovieRepository.GetAll(); var movieQuery = MovieRepository.GetAll();

2
src/Ombi.Core/Engine/MovieRequestEngine.cs
View file

@ -658,7 +658,7 @@ namespace Ombi.Core.Engine
{ {
var request = await MovieRepository.GetAll().FirstOrDefaultAsync(x => x.Id == requestId); var request = await MovieRepository.GetAll().FirstOrDefaultAsync(x => x.Id == requestId);
var result = await CheckOwnRequests(request); var result = await CheckCanManageRequest(request);
if (result.IsError) if (result.IsError)
return result; return result;

2
src/Ombi.Core/Engine/MusicRequestEngine.cs
View file

@ -408,7 +408,7 @@ namespace Ombi.Core.Engine
{ {
var request = await MusicRepository.GetAll().FirstOrDefaultAsync(x => x.Id == requestId); var request = await MusicRepository.GetAll().FirstOrDefaultAsync(x => x.Id == requestId);
var result = await CheckOwnRequests(request); var result = await CheckCanManageRequest(request);
if (result.IsError) if (result.IsError)
return result; return result;

2
src/Ombi.Core/Engine/TvRequestEngine.cs
View file

@ -753,7 +753,7 @@ namespace Ombi.Core.Engine
{ {
var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == requestId); var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == requestId);
var result = await CheckOwnRequests(request); var result = await CheckCanManageRequest(request);
if (result.IsError) if (result.IsError)
return result; return result;