on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

rename assertion methods

Browse Source
This commit is contained in:
ngfrolov 2023-09-14 12:01:35 +05:00
parent f6bc677a68
commit 2903762f0e
Signed by untrusted user who does not match committer: ng.frolov
GPG Key ID: E99907A0357B29A7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AsbCloudWebApi/Controllers/ManualController.cs
View File

@ -46,7 +46,7 @@ public class ManualController : ControllerBase
if(!idUser.HasValue) if(!idUser.HasValue)
throw new ForbidException("Не удается вас опознать"); throw new ForbidException("Не удается вас опознать");
CanUserAccessToManual("Manual.edit"); AssertUserHasAccessToManual("Manual.edit");
using var fileStream = file.OpenReadStream(); using var fileStream = file.OpenReadStream();
@ -68,7 +68,7 @@ public class ManualController : ControllerBase
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> GetFileAsync(int id, CancellationToken cancellationToken) public async Task<IActionResult> GetFileAsync(int id, CancellationToken cancellationToken)
{ {
CanUserAccessToManual("Manual.get"); AssertUserHasAccessToManual("Manual.get");
var file = await manualCatalogService.GetFileAsync(id, cancellationToken); var file = await manualCatalogService.GetFileAsync(id, cancellationToken);
@ -90,12 +90,12 @@ public class ManualController : ControllerBase
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> DeleteFileAsync(int id, CancellationToken cancellationToken) public async Task<IActionResult> DeleteFileAsync(int id, CancellationToken cancellationToken)
{ {
CanUserAccessToManual("Manual.edit"); AssertUserHasAccessToManual("Manual.edit");
return Ok(await manualCatalogService.DeleteFileAsync(id, cancellationToken)); return Ok(await manualCatalogService.DeleteFileAsync(id, cancellationToken));
} }
private void CanUserAccessToManual(string permissionName) private void AssertUserHasAccessToManual(string permissionName)
{ {
var idUser = User.GetUserId(); var idUser = User.GetUserId();

10
AsbCloudWebApi/Controllers/ManualDirectoryController.cs
View File

@ -42,7 +42,7 @@ public class ManualDirectoryController : ControllerBase
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> AddDirectoryAsync(string name, int? idParent, CancellationToken cancellationToken) public async Task<IActionResult> AddDirectoryAsync(string name, int? idParent, CancellationToken cancellationToken)
{ {
CanUserAccessToManualDirectory("Manual.edit"); AssertUserHasAccessToManualDirectory("Manual.edit");
return Ok(await manualCatalogService.AddDirectoryAsync(name, idParent, cancellationToken)); return Ok(await manualCatalogService.AddDirectoryAsync(name, idParent, cancellationToken));
} }
@ -60,7 +60,7 @@ public class ManualDirectoryController : ControllerBase
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> UpdateDirectoryAsync(int id, string name, CancellationToken cancellationToken) public async Task<IActionResult> UpdateDirectoryAsync(int id, string name, CancellationToken cancellationToken)
{ {
CanUserAccessToManualDirectory("Manual.edit"); AssertUserHasAccessToManualDirectory("Manual.edit");
await manualCatalogService.UpdateDirectoryAsync(id, name, cancellationToken); await manualCatalogService.UpdateDirectoryAsync(id, name, cancellationToken);
@ -79,7 +79,7 @@ public class ManualDirectoryController : ControllerBase
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> DeleteDirectoryAsync(int id, CancellationToken cancellationToken) public async Task<IActionResult> DeleteDirectoryAsync(int id, CancellationToken cancellationToken)
{ {
CanUserAccessToManualDirectory("Manual.edit"); AssertUserHasAccessToManualDirectory("Manual.edit");
return Ok(await manualCatalogService.DeleteDirectoryAsync(id, cancellationToken)); return Ok(await manualCatalogService.DeleteDirectoryAsync(id, cancellationToken));
} }
@ -95,12 +95,12 @@ public class ManualDirectoryController : ControllerBase
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> GetAsync(CancellationToken cancellationToken) public async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
{ {
CanUserAccessToManualDirectory("Manual.get"); AssertUserHasAccessToManualDirectory("Manual.get");
return Ok(await manualDirectoryRepository.GetTreeAsync(cancellationToken)); return Ok(await manualDirectoryRepository.GetTreeAsync(cancellationToken));
} }
private void CanUserAccessToManualDirectory(string permissionName) private void AssertUserHasAccessToManualDirectory(string permissionName)
{ {
var idUser = User.GetUserId(); var idUser = User.GetUserId();