Code Cleanup

Author: coryjthompson

WebPush.Test/JWSSignerTest.cs

@@ -25,7 +25,7 @@ public void TestGenerateSignature()
             jwtPayload.Add("exp", 1);
             jwtPayload.Add("sub", "subject");
 
-            var signer = new JWSSigner(privateKey);
+            var signer = new JwsSigner(privateKey);
             var token = signer.GenerateSignature(header, jwtPayload);
 
             var tokenParts = token.Split('.');

WebPush.Test/WebPushClientTest.cs

@@ -59,12 +59,9 @@ public void TestSetGcmApiKey()
         [TestMethod]
         public void TestSetGCMAPIKeyEmptyString()
         {
-            WebPushClient client = new WebPushClient();
+            var client = new WebPushClient();
 
-            Assert.ThrowsException<ArgumentException>(delegate
-            {
-                client.SetGcmApiKey("");
-            });
+            Assert.ThrowsException<ArgumentException>(delegate { client.SetGcmApiKey(""); });
         }
 
         [TestMethod]

WebPush/Util/Encryptor.cs

@@ -55,7 +55,7 @@ public static EncryptionResult Encrypt(byte[] userKey, byte[] userSecret, byte[]
         private static byte[] GenerateSalt(int length)
         {
             var salt = new byte[length];
-            System.Random random = new System.Random();
+            var random = new Random();
             random.NextBytes(salt);
             return salt;
         }
@@ -93,6 +93,7 @@ public static byte[] HKDFSecondStep(byte[] key, byte[] info, int length)
             {
                 Array.Resize(ref result, length);
             }
+
             return result;
         }
 
@@ -111,6 +112,7 @@ public static byte[] ConvertInt(int number)
             {
                 Array.Reverse(output);
             }
+
             return output;
         }
 
@@ -138,7 +140,7 @@ public HmacSha256(byte[] key)
 
         public byte[] ComputeHash(byte[] value)
         {
-            byte[] resBuf = new byte[_hmac.GetMacSize()];
+            var resBuf = new byte[_hmac.GetMacSize()];
             _hmac.BlockUpdate(value, 0, value.Length);
             _hmac.DoFinal(resBuf, 0);
 

WebPush/Util/JWSSigner.cs renamed to WebPush/Util/JwsSigner.cs

@@ -9,11 +9,11 @@
 
 namespace WebPush.Util
 {
-    internal class JWSSigner
+    internal class JwsSigner
     {
         private readonly ECPrivateKeyParameters _privateKey;
 
-        public JWSSigner(ECPrivateKeyParameters privateKey)
+        public JwsSigner(ECPrivateKeyParameters privateKey)
         {
             _privateKey = privateKey;
         }
@@ -29,7 +29,7 @@ public string GenerateSignature(Dictionary<string, object> header, Dictionary<st
             var securedInput = SecureInput(header, payload);
             var message = Encoding.UTF8.GetBytes(securedInput);
 
-            byte[] hashedMessage =sha256Hash(message);
+            var hashedMessage = Sha256Hash(message);
 
             var signer = new ECDsaSigner();
             signer.Init(true, _privateKey);
@@ -48,15 +48,15 @@ public string GenerateSignature(Dictionary<string, object> header, Dictionary<st
             }
 
             var signature = UrlBase64.Encode(a.Concat(b).ToArray());
-            return string.Format("{0}.{1}", securedInput, signature);
+            return $"{securedInput}.{signature}";
         }
 
         private static string SecureInput(Dictionary<string, object> header, Dictionary<string, object> payload)
         {
             var encodeHeader = UrlBase64.Encode(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(header)));
             var encodePayload = UrlBase64.Encode(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)));
 
-            return string.Format("{0}.{1}", encodeHeader, encodePayload);
+            return $"{encodeHeader}.{encodePayload}";
         }
 
         private static byte[] ByteArrayPadLeft(byte[] src, int size)
@@ -67,11 +67,11 @@ private static byte[] ByteArrayPadLeft(byte[] src, int size)
             return dst;
         }
 
-        private static byte[] sha256Hash(byte[] message)
+        private static byte[] Sha256Hash(byte[] message)
         {
-            Sha256Digest sha256Digest = new Sha256Digest();
+            var sha256Digest = new Sha256Digest();
             sha256Digest.BlockUpdate(message, 0, message.Length);
-            byte[] hash = new byte[sha256Digest.GetDigestSize()];
+            var hash = new byte[sha256Digest.GetDigestSize()];
             sha256Digest.DoFinal(hash, 0);
             return hash;
         }

WebPush/VapidHelper.cs

@@ -15,8 +15,8 @@ public static VapidDetails GenerateVapidKeys()
             var results = new VapidDetails();
 
             var keys = ECKeyHelper.GenerateKeys();
-            var publicKey = ((ECPublicKeyParameters)keys.Public).Q.GetEncoded(false);
-            var privateKey = ((ECPrivateKeyParameters)keys.Private).D.ToByteArrayUnsigned();
+            var publicKey = ((ECPublicKeyParameters) keys.Public).Q.GetEncoded(false);
+            var privateKey = ((ECPrivateKeyParameters) keys.Private).D.ToByteArrayUnsigned();
 
             results.PublicKey = UrlBase64.Encode(publicKey);
             results.PrivateKey = UrlBase64.Encode(ByteArrayPadLeft(privateKey, 32));
@@ -49,23 +49,19 @@ public static Dictionary<string, string> GetVapidHeaders(string audience, string
                 expiration = UnixTimeNow() + 43200;
             }
 
-            var header = new Dictionary<string, object>();
-            header.Add("typ", "JWT");
-            header.Add("alg", "ES256");
+            var header = new Dictionary<string, object> {{"typ", "JWT"}, {"alg", "ES256"}};
 
-            var jwtPayload = new Dictionary<string, object>();
-            jwtPayload.Add("aud", audience);
-            jwtPayload.Add("exp", expiration);
-            jwtPayload.Add("sub", subject);
+            var jwtPayload = new Dictionary<string, object> {{"aud", audience}, {"exp", expiration}, {"sub", subject}};
 
             var signingKey = ECKeyHelper.GetPrivateKey(decodedPrivateKey);
 
-            var signer = new JWSSigner(signingKey);
+            var signer = new JwsSigner(signingKey);
             var token = signer.GenerateSignature(header, jwtPayload);
 
-            var results = new Dictionary<string, string>();
-            results.Add("Authorization", "WebPush " + token);
-            results.Add("Crypto-Key", "p256ecdsa=" + publicKey);
+            var results = new Dictionary<string, string>
+            {
+                {"Authorization", "WebPush " + token}, {"Crypto-Key", "p256ecdsa=" + publicKey}
+            };
 
             return results;
         }
@@ -143,7 +139,7 @@ public static void ValidatePrivateKey(string privateKey)
         private static long UnixTimeNow()
         {
             var timeSpan = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0);
-            return (long)timeSpan.TotalSeconds;
+            return (long) timeSpan.TotalSeconds;
         }
 
         private static byte[] ByteArrayPadLeft(byte[] src, int size)

WebPush/WebPush.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net46</TargetFrameworks>