Fix/identity service model validation (#1837)

* Fix indentation

* Fix comment

* Extract ModelStateValidationFilter add to Indentity MVC opts

* Remove unnecessary base constructor call

src/Api/Utilities/ModelStateValidationFilterAttribute.cs

@@ -6,7 +6,7 @@ using InternalApi = Bit.Core.Models.Api;
 
 namespace Bit.Api.Utilities
 {
-    public class ModelStateValidationFilterAttribute : ActionFilterAttribute
+    public class ModelStateValidationFilterAttribute : SharedWeb.Utilities.ModelStateValidationFilterAttribute
     {
         private readonly bool _publicApi;
 
@@ -15,15 +15,7 @@ namespace Bit.Api.Utilities
             _publicApi = publicApi;
         }
 
-        public override void OnActionExecuting(ActionExecutingContext context)
-        {
-            var model = context.ActionArguments.FirstOrDefault(a => a.Key == "model");
-            if (model.Key == "model" && model.Value == null)
-            {
-                context.ModelState.AddModelError(string.Empty, "Body is empty.");
-            }
-
-            if (!context.ModelState.IsValid)
+        protected override void OnModelStateInvalid(ActionExecutingContext context)
         {
             if (_publicApi)
             {
@@ -35,5 +27,4 @@ namespace Bit.Api.Utilities
             }
         }
     }
-    }
 }

src/Identity/Controllers/AccountsController.cs

@@ -30,7 +30,7 @@ namespace Bit.Identity.Controllers
             _userService = userService;
         }
 
-        // Moved from API, If you modify this endpoint, please update Identity as well.
+        // Moved from API, If you modify this endpoint, please update API as well.
         [HttpPost("register")]
         [CaptchaProtected]
         public async Task PostRegister([FromBody] RegisterRequestModel model)
@@ -51,7 +51,7 @@ namespace Bit.Identity.Controllers
             throw new BadRequestException(ModelState);
         }
 
-        // Moved from API, If you modify this endpoint, please update Identity as well.
+        // Moved from API, If you modify this endpoint, please update API as well.
         [HttpPost("prelogin")]
         public async Task<PreloginResponseModel> PostPrelogin([FromBody] PreloginRequestModel model)
         {

src/Identity/Startup.cs

@@ -58,7 +58,11 @@ namespace Bit.Identity
             services.AddMemoryCache();
 
             // Mvc
-            services.AddMvc();
+            // MVC
+            services.AddMvc(config =>
+            {
+                config.Filters.Add(new ModelStateValidationFilterAttribute());
+            });
 
             if (!globalSettings.SelfHosted)
             {

src/SharedWeb/Utilities/ModelStateValidationFilterAttribute.cs

@@ -0,0 +1,33 @@
+using System.Linq;
+using Bit.Core.Models.Api;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Bit.SharedWeb.Utilities
+{
+    public class ModelStateValidationFilterAttribute : ActionFilterAttribute
+    {
+        public ModelStateValidationFilterAttribute()
+        {
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            var model = context.ActionArguments.FirstOrDefault(a => a.Key == "model");
+            if (model.Key == "model" && model.Value == null)
+            {
+                context.ModelState.AddModelError(string.Empty, "Body is empty.");
+            }
+
+            if (!context.ModelState.IsValid)
+            {
+                OnModelStateInvalid(context);
+            }
+        }
+
+        protected virtual void OnModelStateInvalid(ActionExecutingContext context)
+        {
+            context.Result = new BadRequestObjectResult(new ErrorResponseModel(context.ModelState));
+        }
+    }
+}