diff options
Diffstat (limited to 'Timeline/Filters')
| -rw-r--r-- | Timeline/Filters/Header.cs | 55 | ||||
| -rw-r--r-- | Timeline/Filters/Timeline.cs | 25 | ||||
| -rw-r--r-- | Timeline/Filters/User.cs | 24 |
3 files changed, 7 insertions, 97 deletions
diff --git a/Timeline/Filters/Header.cs b/Timeline/Filters/Header.cs index f5fb16aa..843a619d 100644 --- a/Timeline/Filters/Header.cs +++ b/Timeline/Filters/Header.cs @@ -1,72 +1,23 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Timeline.Models.Http;
-using static Timeline.Resources.Filters;
-
-namespace Timeline
-{
- public static partial class ErrorCodes
- {
- public static partial class Http
- {
- public static partial class Filter // bxx = 1xx
- {
- public static partial class Header // bbb = 100
- {
- public static class ContentType // cc = 01
- {
- public const int Missing = 11000101; // dd = 01
- }
-
- public static class ContentLength // cc = 02
- {
- public const int Missing = 11000201; // dd = 01
- public const int Zero = 11000202; // dd = 02
- }
- }
- }
-
- }
- }
-}
namespace Timeline.Filters
{
public class RequireContentTypeAttribute : ActionFilterAttribute
{
- internal static CommonResponse CreateResponse()
- {
- return new CommonResponse(
- ErrorCodes.Http.Filter.Header.ContentType.Missing,
- MessageHeaderContentTypeMissing);
- }
-
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods")]
public override void OnActionExecuting(ActionExecutingContext context)
{
if (context.HttpContext.Request.ContentType == null)
{
- context.Result = new BadRequestObjectResult(CreateResponse());
+ context.Result = new BadRequestObjectResult(ErrorResponse.Common.Header.ContentType_Missing());
}
}
}
public class RequireContentLengthAttribute : ActionFilterAttribute
{
- internal static CommonResponse CreateMissingResponse()
- {
- return new CommonResponse(
- ErrorCodes.Http.Filter.Header.ContentLength.Missing,
- MessageHeaderContentLengthMissing);
- }
-
- internal static CommonResponse CreateZeroResponse()
- {
- return new CommonResponse(
- ErrorCodes.Http.Filter.Header.ContentLength.Zero,
- MessageHeaderContentLengthZero);
- }
-
public RequireContentLengthAttribute()
: this(true)
{
@@ -85,13 +36,13 @@ namespace Timeline.Filters {
if (context.HttpContext.Request.ContentLength == null)
{
- context.Result = new BadRequestObjectResult(CreateMissingResponse());
+ context.Result = new BadRequestObjectResult(ErrorResponse.Common.Header.ContentLength_Missing());
return;
}
if (RequireNonZero && context.HttpContext.Request.ContentLength.Value == 0)
{
- context.Result = new BadRequestObjectResult(CreateZeroResponse());
+ context.Result = new BadRequestObjectResult(ErrorResponse.Common.Header.ContentLength_Zero());
return;
}
}
diff --git a/Timeline/Filters/Timeline.cs b/Timeline/Filters/Timeline.cs index 7859d409..bc142db0 100644 --- a/Timeline/Filters/Timeline.cs +++ b/Timeline/Filters/Timeline.cs @@ -2,25 +2,6 @@ using Microsoft.AspNetCore.Mvc.Filters;
using Timeline.Models.Http;
using Timeline.Services;
-using static Timeline.Resources.Filters;
-
-namespace Timeline
-{
- public static partial class ErrorCodes
- {
- public static partial class Http
- {
- public static partial class Filter // bxx = 1xx
- {
- public static class Timeline // bbb = 102
- {
- public const int UserNotExist = 11020101;
- public const int NameNotExist = 11020102;
- }
- }
- }
- }
-}
namespace Timeline.Filters
{
@@ -33,13 +14,11 @@ namespace Timeline.Filters {
if (e.InnerException is UserNotExistException)
{
- context.Result = new BadRequestObjectResult(
- new CommonResponse(ErrorCodes.Http.Filter.Timeline.UserNotExist, MessageTimelineNotExistUser));
+ context.Result = new BadRequestObjectResult(ErrorResponse.UserCommon.NotExist());
}
else
{
- context.Result = new BadRequestObjectResult(
- new CommonResponse(ErrorCodes.Http.Filter.Timeline.NameNotExist, MessageTimelineNotExist));
+ throw new System.NotImplementedException();
}
}
}
diff --git a/Timeline/Filters/User.cs b/Timeline/Filters/User.cs index 16c76750..12ed6155 100644 --- a/Timeline/Filters/User.cs +++ b/Timeline/Filters/User.cs @@ -9,25 +9,6 @@ using Timeline.Models.Http; using Timeline.Services;
using static Timeline.Resources.Filters;
-namespace Timeline
-{
- public static partial class ErrorCodes
- {
- public static partial class Http
- {
- public static partial class Filter // bxx = 1xx
- {
- public static class User // bbb = 101
- {
- public const int NotExist = 11010101;
-
- public const int NotSelfOrAdminForbid = 11010201;
- }
- }
- }
- }
-}
-
namespace Timeline.Filters
{
public class SelfOrAdminAttribute : ActionFilterAttribute
@@ -51,8 +32,7 @@ namespace Timeline.Filters {
if (!user.IsAdministrator() && user.Identity.Name != username)
{
- context.Result = new ObjectResult(
- new CommonResponse(ErrorCodes.Http.Filter.User.NotSelfOrAdminForbid, MessageSelfOrAdminForbid))
+ context.Result = new ObjectResult(ErrorResponse.Common.Forbid())
{ StatusCode = StatusCodes.Status403Forbidden };
}
}
@@ -76,7 +56,7 @@ namespace Timeline.Filters {
if (context.Exception is UserNotExistException)
{
- var body = new CommonResponse(ErrorCodes.Http.Filter.User.NotExist, MessageUserNotExist);
+ var body = ErrorResponse.UserCommon.NotExist();
if (context.HttpContext.Request.Method == "GET")
context.Result = new NotFoundObjectResult(body);
|