From e9be89d57c625faca5b4f0b986c2a143d67e3436 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 26 Apr 2019 20:42:46 +0800
Subject: [PATCH] fix #1058 Perform non-null validation on
 propertyName(context.Key.Name).

---
 ...AutoLocalizationMetadataDetailsProvider.cs |  5 ++++
 .../Validation/ValidationTestController.cs    | 25 ++++++++++++++++++-
 .../ValidationTestController_Tests.cs         | 11 ++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs
index 2274f0a9b6..d9de135e7f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs
@@ -39,6 +39,11 @@ namespace Volo.Abp.AspNetCore.Mvc
                 return;
             }
 
+            if (context.Key.Name.IsNullOrWhiteSpace())
+            {
+                return;
+            }
+
             if (_localizationOptions.Value.Value.DataAnnotationLocalizerProvider == null)
             {
                 return;
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs
index b9d01a86c4..6bb9a5ae94 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Shouldly;
@@ -16,6 +17,14 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
             return Task.FromResult(model.Value1);
         }
 
+        [HttpGet]
+        [Route("object-result-action-with-custom_validate")]
+        public Task<string> ObjectResultActionWithCustomValidate(CustomValidateModel model)
+        {
+            ModelState.IsValid.ShouldBeTrue(); //AbpValidationFilter throws exception otherwise
+            return Task.FromResult(model.Value1);
+        }
+
         [HttpGet]
         [Route("action-result-action")]
         public IActionResult ActionResultAction(ValidationTest1Model model)
@@ -29,5 +38,19 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
             [MinLength(2)]
             public string Value1 { get; set; }
         }
+
+        public class CustomValidateModel : IValidatableObject
+        {
+            public string Value1 { get; set; }
+
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                if (Value1 != "hello")
+                {
+                    yield return new ValidationResult("Value1 should be hello");
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs
index 19a4bcd608..5177868843 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs
@@ -47,5 +47,16 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
             var result = await GetResponseAsStringAsync("/api/validation-test/action-result-action"); //Missed the value1
             result.ShouldBe("ModelState.IsValid: false");
         }
+
+        [Fact]
+        public async Task Should_Return_Custom_Validate_Errors()
+        {
+            var result = await GetResponseAsObjectAsync<RemoteServiceErrorResponse>(
+                "/api/validation-test/object-result-action-with-custom_validate?value1=abc", HttpStatusCode.BadRequest); //value1 should be hello.
+
+            result.Error.ValidationErrors.Length.ShouldBeGreaterThan(0);
+            result.Error.ValidationErrors.ShouldContain(x => x.Message == "Value1 should be hello");
+        }
+
     }
 }