From d3da412fa7e10db8c721846152a2c056dd4ccbcf Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 12 Nov 2020 23:21:31 +0800 Subject: ... --- BackEnd/Timeline/Controllers/UserAvatarController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'BackEnd/Timeline/Controllers/UserAvatarController.cs') diff --git a/BackEnd/Timeline/Controllers/UserAvatarController.cs b/BackEnd/Timeline/Controllers/UserAvatarController.cs index bc4afa30..44d45b76 100644 --- a/BackEnd/Timeline/Controllers/UserAvatarController.cs +++ b/BackEnd/Timeline/Controllers/UserAvatarController.cs @@ -86,7 +86,7 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task Put([FromRoute][Username] string username, [FromBody] ByteData body) { - if (!User.IsAdministrator() && User.Identity.Name != username) + if (!this.UserHasPermission(UserPermission.UserManagement) && User.Identity!.Name != username) { _logger.LogInformation(Log.Format(LogPutForbid, ("Operator Username", User.Identity.Name), ("Username To Put Avatar", username))); @@ -149,10 +149,10 @@ namespace Timeline.Controllers [Authorize] public async Task Delete([FromRoute][Username] string username) { - if (!User.IsAdministrator() && User.Identity.Name != username) + if (!this.UserHasPermission(UserPermission.UserManagement) && User.Identity!.Name != username) { _logger.LogInformation(Log.Format(LogDeleteForbid, - ("Operator Username", User.Identity.Name), ("Username To Delete Avatar", username))); + ("Operator Username", User.Identity!.Name), ("Username To Delete Avatar", username))); return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } -- cgit v1.2.3 From 79673878b5427bbedbc4ff4323dce3958d307b49 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 13 Nov 2020 16:17:17 +0800 Subject: Run code clean. --- BackEnd/Timeline.Tests/Helpers/TestApplication.cs | 1 - BackEnd/Timeline.Tests/Helpers/TestClock.cs | 3 --- BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs | 1 - BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs | 1 - BackEnd/Timeline/Controllers/UserAvatarController.cs | 1 - BackEnd/Timeline/Migrations/20200105150407_Initialize.cs | 4 ++-- BackEnd/Timeline/Migrations/20200221064341_AddJwtToken.cs | 3 +-- BackEnd/Timeline/Migrations/20200229103848_AddPostLocalId.cs | 3 +-- BackEnd/Timeline/Migrations/20200306110049_AddDataTable.cs | 3 +-- .../Timeline/Migrations/20200618064936_TimelineAddModifiedTime.cs | 4 ++-- BackEnd/Timeline/Migrations/20200810155908_AddTimesToUser.cs | 3 +-- BackEnd/Timeline/Models/Http/Common.cs | 4 ++-- BackEnd/Timeline/Services/EntityNames.cs | 7 +------ BackEnd/Timeline/Services/TimelineService.cs | 1 - BackEnd/Timeline/Services/UserDeleteService.cs | 1 - BackEnd/Timeline/Swagger/DocumentDescriptionDocumentProcessor.cs | 2 -- 16 files changed, 11 insertions(+), 31 deletions(-) (limited to 'BackEnd/Timeline/Controllers/UserAvatarController.cs') diff --git a/BackEnd/Timeline.Tests/Helpers/TestApplication.cs b/BackEnd/Timeline.Tests/Helpers/TestApplication.cs index 684ffe2c..33d8b318 100644 --- a/BackEnd/Timeline.Tests/Helpers/TestApplication.cs +++ b/BackEnd/Timeline.Tests/Helpers/TestApplication.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; -using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/BackEnd/Timeline.Tests/Helpers/TestClock.cs b/BackEnd/Timeline.Tests/Helpers/TestClock.cs index 34adb245..a04a3eb6 100644 --- a/BackEnd/Timeline.Tests/Helpers/TestClock.cs +++ b/BackEnd/Timeline.Tests/Helpers/TestClock.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Timeline.Services; namespace Timeline.Tests.Helpers diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs index f4a406d1..9aac8188 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using Timeline.Models; using Timeline.Models.Http; using Timeline.Services; using Timeline.Tests.Helpers; diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs index 66a12573..854a4ee6 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserAvatarTest.cs @@ -10,7 +10,6 @@ using System.IO; using System.Net; using System.Net.Http; using System.Net.Http.Headers; -using System.Net.Mime; using System.Threading.Tasks; using Timeline.Models.Http; using Timeline.Services; diff --git a/BackEnd/Timeline/Controllers/UserAvatarController.cs b/BackEnd/Timeline/Controllers/UserAvatarController.cs index 44d45b76..f3b7fff8 100644 --- a/BackEnd/Timeline/Controllers/UserAvatarController.cs +++ b/BackEnd/Timeline/Controllers/UserAvatarController.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; using System; using System.Threading.Tasks; -using Timeline.Auth; using Timeline.Filters; using Timeline.Helpers; using Timeline.Models; diff --git a/BackEnd/Timeline/Migrations/20200105150407_Initialize.cs b/BackEnd/Timeline/Migrations/20200105150407_Initialize.cs index 4e12ef83..420cc13d 100644 --- a/BackEnd/Timeline/Migrations/20200105150407_Initialize.cs +++ b/BackEnd/Timeline/Migrations/20200105150407_Initialize.cs @@ -1,5 +1,5 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; +using System; namespace Timeline.Migrations { diff --git a/BackEnd/Timeline/Migrations/20200221064341_AddJwtToken.cs b/BackEnd/Timeline/Migrations/20200221064341_AddJwtToken.cs index 628970c6..a16fcf4d 100644 --- a/BackEnd/Timeline/Migrations/20200221064341_AddJwtToken.cs +++ b/BackEnd/Timeline/Migrations/20200221064341_AddJwtToken.cs @@ -1,6 +1,5 @@ -using System; +using Microsoft.EntityFrameworkCore.Migrations; using System.Security.Cryptography; -using Microsoft.EntityFrameworkCore.Migrations; namespace Timeline.Migrations { diff --git a/BackEnd/Timeline/Migrations/20200229103848_AddPostLocalId.cs b/BackEnd/Timeline/Migrations/20200229103848_AddPostLocalId.cs index 497b38a1..e4e41ade 100644 --- a/BackEnd/Timeline/Migrations/20200229103848_AddPostLocalId.cs +++ b/BackEnd/Timeline/Migrations/20200229103848_AddPostLocalId.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; namespace Timeline.Migrations { diff --git a/BackEnd/Timeline/Migrations/20200306110049_AddDataTable.cs b/BackEnd/Timeline/Migrations/20200306110049_AddDataTable.cs index e33bf4c9..ddd3a908 100644 --- a/BackEnd/Timeline/Migrations/20200306110049_AddDataTable.cs +++ b/BackEnd/Timeline/Migrations/20200306110049_AddDataTable.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; namespace Timeline.Migrations { diff --git a/BackEnd/Timeline/Migrations/20200618064936_TimelineAddModifiedTime.cs b/BackEnd/Timeline/Migrations/20200618064936_TimelineAddModifiedTime.cs index c277fe39..84879ef9 100644 --- a/BackEnd/Timeline/Migrations/20200618064936_TimelineAddModifiedTime.cs +++ b/BackEnd/Timeline/Migrations/20200618064936_TimelineAddModifiedTime.cs @@ -1,6 +1,6 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using System; namespace Timeline.Migrations { diff --git a/BackEnd/Timeline/Migrations/20200810155908_AddTimesToUser.cs b/BackEnd/Timeline/Migrations/20200810155908_AddTimesToUser.cs index 369f85e6..55721a59 100644 --- a/BackEnd/Timeline/Migrations/20200810155908_AddTimesToUser.cs +++ b/BackEnd/Timeline/Migrations/20200810155908_AddTimesToUser.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; namespace Timeline.Migrations { diff --git a/BackEnd/Timeline/Models/Http/Common.cs b/BackEnd/Timeline/Models/Http/Common.cs index 5fa22c9e..2101a1bb 100644 --- a/BackEnd/Timeline/Models/Http/Common.cs +++ b/BackEnd/Timeline/Models/Http/Common.cs @@ -94,13 +94,13 @@ namespace Timeline.Models.Http public bool Delete { get; set; } } - /// + /// public CommonDeleteResponse() { } - /// + /// public CommonDeleteResponse(int code, string message, bool delete) : base(code, message, new ResponseData(delete)) { diff --git a/BackEnd/Timeline/Services/EntityNames.cs b/BackEnd/Timeline/Services/EntityNames.cs index 0ce1de3b..7dae6a4a 100644 --- a/BackEnd/Timeline/Services/EntityNames.cs +++ b/BackEnd/Timeline/Services/EntityNames.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Timeline.Services +namespace Timeline.Services { public static class EntityNames { diff --git a/BackEnd/Timeline/Services/TimelineService.cs b/BackEnd/Timeline/Services/TimelineService.cs index 04870dcf..769e8bed 100644 --- a/BackEnd/Timeline/Services/TimelineService.cs +++ b/BackEnd/Timeline/Services/TimelineService.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Timeline.Entities; using Timeline.Helpers; diff --git a/BackEnd/Timeline/Services/UserDeleteService.cs b/BackEnd/Timeline/Services/UserDeleteService.cs index 845de573..b6306682 100644 --- a/BackEnd/Timeline/Services/UserDeleteService.cs +++ b/BackEnd/Timeline/Services/UserDeleteService.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using System; -using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Threading.Tasks; diff --git a/BackEnd/Timeline/Swagger/DocumentDescriptionDocumentProcessor.cs b/BackEnd/Timeline/Swagger/DocumentDescriptionDocumentProcessor.cs index dc5ddd96..a3452cea 100644 --- a/BackEnd/Timeline/Swagger/DocumentDescriptionDocumentProcessor.cs +++ b/BackEnd/Timeline/Swagger/DocumentDescriptionDocumentProcessor.cs @@ -1,12 +1,10 @@ using NSwag.Generation.Processors; using NSwag.Generation.Processors.Contexts; using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; -using System.Threading.Tasks; using Timeline.Models.Http; namespace Timeline.Swagger -- cgit v1.2.3