Merge pull request #16 from griesoft/dev

Adding a ValidationResponse property
griesoft · Aug 14, 2022 · 00ee58e · 00ee58e
2 parents 3975fe0 + 40dc647
commit 00ee58e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/docs/Griesoft.AspNetCore.ReCaptcha.xml b/docs/Griesoft.AspNetCore.ReCaptcha.xml
diff --git a/src/ReCaptcha/Services/IRecaptchaService.cs b/src/ReCaptcha/Services/IRecaptchaService.cs
@@ -8,6 +8,15 @@ namespace Griesoft.AspNetCore.ReCaptcha.Services
     /// </summary>
     public interface IRecaptchaService
     {
+        /// <summary>
+        /// Access the validation response of the last validation that this service did perform.
+        /// </summary>
+        /// <remarks>
+        /// This service is registered as transient (or should be) which means the validation response will
+        /// always match the request that instantiated this service.
+        /// </remarks>
+        ValidationResponse? ValidationResponse { get; }
+
         /// <summary>
         /// Validate the reCAPTCHA response token.
         /// </summary>

diff --git a/src/ReCaptcha/Services/RecaptchaService.cs b/src/ReCaptcha/Services/RecaptchaService.cs
@@ -28,6 +28,9 @@ public RecaptchaService(IOptionsMonitor<RecaptchaSettings> settings,
             _logger = logger;
         }
 
+        /// <inheritdoc />
+        public ValidationResponse? ValidationResponse { get; private set; }
+
         /// <inheritdoc />
         public async Task<ValidationResponse> ValidateRecaptchaResponse(string token, string? remoteIp = null)
         {
@@ -40,7 +43,7 @@ public async Task<ValidationResponse> ValidateRecaptchaResponse(string token, st
 
                 response.EnsureSuccessStatusCode();
 
-                return JsonConvert.DeserializeObject<ValidationResponse>(
+                ValidationResponse = JsonConvert.DeserializeObject<ValidationResponse>(
                     await response.Content.ReadAsStringAsync()
                     .ConfigureAwait(true))
                     ?? new ValidationResponse()
@@ -55,7 +58,7 @@ await response.Content.ReadAsStringAsync()
             catch (HttpRequestException)
             {
                 _logger.ValidationRequestFailed();
-                return new ValidationResponse()
+                ValidationResponse = new ValidationResponse()
                 {
                     Success = false,
                     ErrorMessages = new List<string>()
@@ -69,6 +72,8 @@ await response.Content.ReadAsStringAsync()
                 _logger.ValidationRequestUnexpectedException(ex);
                 throw;
             }
+
+            return ValidationResponse;
         }
     }
 }
diff --git a/tests/ReCaptcha.Tests/Services/RecaptchaServiceTests.cs b/tests/ReCaptcha.Tests/Services/RecaptchaServiceTests.cs
@@ -164,5 +164,21 @@ public async Task ValidateRecaptchaResponse_ShouldReturn_DeserializedResponse()
             Assert.IsTrue(response.Success);
             Assert.AreEqual(0, response.Errors.Count());
         }
+
+        [Test]
+        public async Task ValidateRecaptchaResponse_Should_DeserializedResponse_AndSet_ValidationResponseProperty()
+        {
+            // Arrange
+            var service = new RecaptchaService(_settingsMock.Object, _httpClient, _logger);
+
+            // Act
+            var response = await service.ValidateRecaptchaResponse(Token);
+
+            // Assert
+            _httpMessageHandlerMock.Verify();
+            Assert.IsTrue(response.Success);
+            Assert.AreEqual(0, response.Errors.Count());
+            Assert.NotNull(service.ValidationResponse);
+        }
     }
 }