Merge branch 'release/1.0.0'

belidzs · Jun 18, 2020 · 81449ef · 81449ef
2 parents 6645dad + 1d8d0e4
commit 81449ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/Mailgun.Models.SignedEvent.Tests/MailgunSignatureTests.cs b/Mailgun.Models.SignedEvent.Tests/MailgunSignatureTests.cs
@@ -13,23 +13,23 @@ namespace Mailgun.Models.SignedEvent.Tests
     /// </summary>
     public class MailgunSignatureTests
     {
-        private DateTime _originalTimestamp;
-        private TimeSpan _timeSinceOriginalTimestamp;
-        private MailgunSignature _validSignature;
-        private string _apiKey;
+        private DateTime originalTimestamp;
+        private TimeSpan timeSinceOriginalTimestamp;
+        private MailgunSignature validSignature;
+        private string apiKey;
 
         /// <summary>
         /// Sets up test fixture with a know valid signature.
         /// </summary>
         [SetUp]
         public void Setup()
         {
-            this._originalTimestamp = new DateTime(2020, 6, 18, 11, 55, 0).ToUniversalTime();
-            var originalTimestampAsUnixEpoch = (this._originalTimestamp - DateTime.UnixEpoch).TotalSeconds.ToString();
-            this._timeSinceOriginalTimestamp = DateTime.UtcNow - this._originalTimestamp;
-            this._apiKey = "ffffffffffffffffffffffffffffffff-ffffffff-ffffffff";
+            this.originalTimestamp = new DateTime(2020, 6, 18, 11, 55, 0).ToUniversalTime();
+            var originalTimestampAsUnixEpoch = (this.originalTimestamp - DateTime.UnixEpoch).TotalSeconds.ToString();
+            this.timeSinceOriginalTimestamp = DateTime.UtcNow - this.originalTimestamp;
+            this.apiKey = "ffffffffffffffffffffffffffffffff-ffffffff-ffffffff";
 
-            this._validSignature = new MailgunSignature()
+            this.validSignature = new MailgunSignature()
             {
                 Signature = "de4b938580bb4d84f710cbb8bfa7d224bb2262c8f644f558c2901c1ae645bb03",
                 Token = "ffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -43,7 +43,7 @@ public void Setup()
         [Test]
         public void Valid()
         {
-            Assert.That(this._validSignature.IsValid(this._apiKey, this._timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.True);
+            Assert.That(this.validSignature.IsValid(this.apiKey, this.timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.True);
         }
 
         /// <summary>
@@ -52,7 +52,7 @@ public void Valid()
         [Test]
         public void TooOld()
         {
-            Assert.That(this._validSignature.IsValid(this._apiKey, this._timeSinceOriginalTimestamp - new TimeSpan(0, 1, 0)), Is.False);
+            Assert.That(this.validSignature.IsValid(this.apiKey, this.timeSinceOriginalTimestamp - new TimeSpan(0, 1, 0)), Is.False);
         }
 
         /// <summary>
@@ -61,9 +61,9 @@ public void TooOld()
         [Test]
         public void BadSignature()
         {
-            this._validSignature.Signature += "x";
+            this.validSignature.Signature += "x";
 
-            Assert.That(this._validSignature.IsValid(this._apiKey, this._timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.False);
+            Assert.That(this.validSignature.IsValid(this.apiKey, this.timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.False);
         }
 
         /// <summary>
@@ -72,9 +72,9 @@ public void BadSignature()
         [Test]
         public void BadToken()
         {
-            this._validSignature.Token += "x";
+            this.validSignature.Token += "x";
 
-            Assert.That(this._validSignature.IsValid(this._apiKey, this._timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.False);
+            Assert.That(this.validSignature.IsValid(this.apiKey, this.timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.False);
         }
 
         /// <summary>
@@ -83,9 +83,9 @@ public void BadToken()
         [Test]
         public void BadApiKey()
         {
-            this._apiKey += "x";
+            this.apiKey += "x";
 
-            Assert.That(this._validSignature.IsValid(this._apiKey, this._timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.False);
+            Assert.That(this.validSignature.IsValid(this.apiKey, this.timeSinceOriginalTimestamp + new TimeSpan(0, 1, 0)), Is.False);
         }
     }
 }
diff --git a/Mailgun.Models.SignedEvent/Mailgun.Models.SignedEvent.csproj b/Mailgun.Models.SignedEvent/Mailgun.Models.SignedEvent.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;net20</TargetFrameworks>
     <Authors>Balazs Keresztury</Authors>
     <Copyright>Copyright (c) 2020 Balazs Keresztury</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>1.0.0-rc1</Version>
+    <Version>1.0.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/belidzs/Mailgun.Models.SignedEvent</PackageProjectUrl>
     <RepositoryUrl>https://github.com/belidzs/Mailgun.Models.SignedEvent</RepositoryUrl>

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ Since the signature is created using the signing server's own time you can speci
 
 Mailgun generates JSON data using an unusual naming convention with dashes between words. This means that the verb `is valid` will be encoded as `is-valid` even though the convention is to encode names as *camelCase* (resulting in `isValid`).
 
-There are ways to configure most JSON serializers to handle this, but this topic is out of scope of this project.
+[There are ways](https://github.com/belidzs/DashedJsonNamingPolicy) to configure most JSON serializers to handle this, but this topic is out of scope of this project.
 
 ### Structure Is Constantly Changing
 Please note that these events [can apparently change their structure anytime](https://documentation.mailgun.com/en/latest/api-events.html#event-structure), so don't be surprised if the data you've just received contains new fields.