From 26d26e84f9165bd60f065f32fa66c82822fb5957 Mon Sep 17 00:00:00 2001
From: Klaus Fischer <klaus.fischer@eloware.com>
Date: Fri, 26 Aug 2022 11:38:28 +0200
Subject: [PATCH] Resolved annotations from review
---
FitConnect/Subscriber.cs | 2 +-
IntegrationTests/CallbackTest.cs | 18 +++++++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/FitConnect/Subscriber.cs b/FitConnect/Subscriber.cs
index 7af29b81..c0c6a3ae 100644
--- a/FitConnect/Subscriber.cs
+++ b/FitConnect/Subscriber.cs
@@ -234,7 +234,7 @@ public class Subscriber : FitConnectClient,
var result = VerifyCallback(callbackSecret, timestamp, content);
if (result != authentication)
- throw new ArgumentException("Request is not authentic");
+ throw new ArgumentException("Verified request does not match authentication");
return true;
}
}
diff --git a/IntegrationTests/CallbackTest.cs b/IntegrationTests/CallbackTest.cs
index 989441d6..827eaebb 100644
--- a/IntegrationTests/CallbackTest.cs
+++ b/IntegrationTests/CallbackTest.cs
@@ -17,7 +17,7 @@ namespace IntegrationTests;
[TestFixture]
public class CallbackTest {
- private HttpRequest Request;
+ private HttpRequest _request = null!;
private string _callbackSecret = "";
[SetUp]
@@ -30,10 +30,6 @@ public class CallbackTest {
streamWriter.Flush();
memoryStream.Position = 0;
- // Request = new DefaultHttpRequest(new DefaultHttpContext()) {
- // Body = new StreamBody(memoryStream)
- // };
-
var headers = new HeaderDictionary(new Dictionary<string, StringValues>() {
{ "callback-timestamp", "1672527599" }, {
"callback-authentication",
@@ -49,7 +45,7 @@ public class CallbackTest {
mock.Setup(w => w.Method).Returns("POST");
mock.Setup(w => w.Body).Returns(memoryStream);
- Request = mock.Object;
+ _request = mock.Object;
_callbackSecret = MockContainer.Container.Create().Resolve<MockSettings>().CallbackSecret;
}
@@ -72,18 +68,18 @@ public class CallbackTest {
[Test]
public void ValidRequest() {
// Assert
- FitConnect.Subscriber.VerifyCallback(_callbackSecret, Request).Should().Be(true);
+ FitConnect.Subscriber.VerifyCallback(_callbackSecret, _request).Should().Be(true);
}
[Test]
public void RequestAge_Fails() {
// Arrange
- Request.Headers["callback-timestamp"] = "1641066653";
+ _request.Headers["callback-timestamp"] = "1641066653";
// Atc
// Assert
Assert.Throws<ArgumentException>(() => {
- FitConnect.Subscriber.VerifyCallback(_callbackSecret, Request);
+ FitConnect.Subscriber.VerifyCallback(_callbackSecret, _request);
})
.Message.Should().Be("Request is too old");
}
@@ -91,13 +87,13 @@ public class CallbackTest {
[Test]
public void RequestAuthentication_Fails() {
// Arrange
- Request.Headers["callback-authentication"] =
+ _request.Headers["callback-authentication"] =
"898cd0edb70c08e5b32aa8a18cbbc8ff6b3078c51af6d011ff4e32e470c746234fc4314821fe5185264b029e962bd37de33f3b9fc5f1a93c40ce6672845e90df";
// Atc
// Assert
Assert.Throws<ArgumentException>(() => {
- FitConnect.Subscriber.VerifyCallback(_callbackSecret, Request);
+ FitConnect.Subscriber.VerifyCallback(_callbackSecret, _request);
})
.Message.Should().Be("Request is not authentic");
}
--
GitLab