Code cleanup

Cory Thompson · Cory Thompson · commit 45e69fa93e13 · 2017-08-22T20:29:22.000+10:00
diff --git a/WebPush.Test/ECKeyHelperTest.cs b/WebPush.Test/ECKeyHelperTest.cs
@@ -1,10 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Org.BouncyCastle.Crypto;
+﻿using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Parameters;
+using System.Linq;
 using WebPush.Util;
 using Xunit;
 
@@ -44,16 +40,17 @@ public void TestGenerateKeys()
         {
             AsymmetricCipherKeyPair keys = ECKeyHelper.GenerateKeys();
 
-            byte[] publicKey = ((ECPublicKeyParameters) keys.Public).Q.GetEncoded(false);
-            byte[] privateKey = ((ECPrivateKeyParameters) keys.Private).D.ToByteArrayUnsigned();
+            byte[] publicKey = ((ECPublicKeyParameters)keys.Public).Q.GetEncoded(false);
+            byte[] privateKey = ((ECPrivateKeyParameters)keys.Private).D.ToByteArrayUnsigned();
 
             int publicKeyLength = publicKey.Length;
             int privateKeyLength = privateKey.Length;
 
             Assert.Equal(65, publicKeyLength);
             Assert.Equal(32, privateKeyLength);
 
-;        }
+            ;
+        }
 
         [Fact]
         public void TestGenerateKeysNoCache()
@@ -66,7 +63,7 @@ public void TestGenerateKeysNoCache()
 
             byte[] publicKey2 = ((ECPublicKeyParameters)keys2.Public).Q.GetEncoded(false);
             byte[] privateKey2 = ((ECPrivateKeyParameters)keys2.Private).D.ToByteArrayUnsigned();
-            
+
             Assert.False(publicKey1.SequenceEqual(publicKey2));
             Assert.False(privateKey1.SequenceEqual(privateKey2));
         }
diff --git a/WebPush.Test/JWSSignerTest.cs b/WebPush.Test/JWSSignerTest.cs
@@ -1,9 +1,6 @@
-﻿using System;
+﻿using Org.BouncyCastle.Crypto.Parameters;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using Org.BouncyCastle.Crypto.Parameters;
 using WebPush.Util;
 using Xunit;
 
@@ -45,7 +42,6 @@ public void TestGenerateSignature()
             byte[] decodedSignature = UrlBase64.Decode(signature);
             int decodedSignatureLength = decodedSignature.Length;
 
-
             bool isSignatureLengthValid = decodedSignatureLength == 66 || decodedSignatureLength == 64;
             Assert.Equal(true, isSignatureLengthValid);
         }
diff --git a/WebPush.Test/UrlBase64Test.cs b/WebPush.Test/UrlBase64Test.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Linq;
+﻿using System.Linq;
 using WebPush.Util;
 using Xunit;
 
@@ -10,7 +9,7 @@ public class UrlBase64Test
         [Fact]
         public void TestBase64UrlDecode()
         {
-            byte[] expected = new byte[3] {181, 235, 45};
+            byte[] expected = new byte[3] { 181, 235, 45 };
             byte[] actual = UrlBase64.Decode(@"test");
             Assert.True(actual.SequenceEqual(expected));
         }
@@ -19,9 +18,8 @@ public void TestBase64UrlDecode()
         public void TestBase64UrlEncode()
         {
             string expected = @"test";
-            string actual = UrlBase64.Encode(new byte[3] {181, 235, 45});
+            string actual = UrlBase64.Encode(new byte[3] { 181, 235, 45 });
             Assert.Equal(expected, actual);
         }
-
     }
 }
diff --git a/WebPush.Test/VapidHelperTest.cs b/WebPush.Test/VapidHelperTest.cs
@@ -10,7 +10,7 @@ public class VapidHelperTest
         private const string VALID_AUDIENCE = "http://example.com";
         private const string VALID_SUBJECT = "http://example.com/example";
         private const string VALID_SUBJECT_MAILTO = "mailto:example@example.com";
-        
+
         [Fact]
         public void TestGenerateVapidKeys()
         {
@@ -38,7 +38,7 @@ public void TestGetVapidHeaders()
             string publicKey = UrlBase64.Encode(new byte[65]);
             string privatekey = UrlBase64.Encode(new byte[32]);
             Dictionary<string, string> headers = VapidHelper.GetVapidHeaders(VALID_AUDIENCE, VALID_SUBJECT, publicKey, privatekey);
-            
+
             Assert.True(headers.ContainsKey("Authorization"));
             Assert.True(headers.ContainsKey("Crypto-Key"));
         }
diff --git a/WebPush.Test/WebPushClientTest.cs b/WebPush.Test/WebPushClientTest.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using WebPush;
 using Xunit;
 
 namespace WebPush.Test
@@ -19,7 +18,6 @@ public class WebPushClientTest
         private const string TEST_FCM_ENDPOINT =
             @"https://fcm.googleapis.com/fcm/send/efz_TLX_rLU:APA91bE6U0iybLYvv0F3mf6";
 
-
         [Fact]
         public void TestSetGCMAPIKey()
         {
@@ -103,7 +101,7 @@ public void TestSetGCMAPiKeyNonGCMPushService()
         public void TestSetVapidDetails()
         {
             WebPushClient client = new WebPushClient();
-            
+
             client.SetVapidDetails("mailto:example@example.com", TEST_PUBLIC_KEY, TEST_PRIVATE_KEY);
 
             PushSubscription subscription = new PushSubscription(TEST_FCM_ENDPOINT, TEST_PUBLIC_KEY, TEST_PRIVATE_KEY);
diff --git a/WebPush/Model/PushSubscription.cs b/WebPush/Model/PushSubscription.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WebPush
+﻿namespace WebPush
 {
     public class PushSubscription
     {
@@ -14,7 +8,6 @@ public class PushSubscription
 
         public PushSubscription()
         {
-
         }
 
         public PushSubscription(string endpoint, string p256dh, string auth)
diff --git a/WebPush/Model/VapidDetails.cs b/WebPush/Model/VapidDetails.cs
@@ -8,7 +8,6 @@ public class VapidDetails
 
         public VapidDetails()
         {
-
         }
 
         /// <param name="subject">This should be a URL or a 'mailto:' email address</param>
diff --git a/WebPush/Util/ECKeyHelper.cs b/WebPush/Util/ECKeyHelper.cs
@@ -1,13 +1,12 @@
-﻿using System;
-using System.IO;
-using Org.BouncyCastle.Asn1;
+﻿using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.Nist;
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Generators;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Security;
+using System;
+using System.IO;
 
 namespace WebPush.Util
 {
diff --git a/WebPush/Util/Encryptor.cs b/WebPush/Util/Encryptor.cs
@@ -1,14 +1,13 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using Org.BouncyCastle.Crypto;
+﻿using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Engines;
 using Org.BouncyCastle.Crypto.Modes;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Security;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 
 // @LogicSoftware
 // Originally from https://github.com/LogicSoftware/WebPushEncryption/blob/master/src/Encryptor.cs
diff --git a/WebPush/Util/JWSSigner.cs b/WebPush/Util/JWSSigner.cs
@@ -1,12 +1,11 @@
-﻿using System;
+﻿using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Crypto.Signers;
+using Org.BouncyCastle.Math;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Crypto.Signers;
-using Org.BouncyCastle.Math;
-using Org.BouncyCastle.Security;
 
 namespace WebPush.Util
 {
@@ -27,7 +26,6 @@ public JWSSigner(ECPrivateKeyParameters privateKey)
         /// <returns></returns>
         public string GenerateSignature(Dictionary<string, object> header, Dictionary<string, object> payload)
         {
-
             string securedInput = SecureInput(header, payload);
             byte[] message = Encoding.UTF8.GetBytes(securedInput);
 
diff --git a/WebPush/Util/UrlBase64.cs b/WebPush/Util/UrlBase64.cs
@@ -11,7 +11,6 @@ public static class UrlBase64
         /// <returns></returns>
         public static byte[] Decode(string base64)
         {
-
             base64 = base64.Replace('-', '+').Replace('_', '/');
 
             while (base64.Length % 4 != 0)
@@ -21,7 +20,7 @@ public static byte[] Decode(string base64)
         }
 
         /// <summary>
-        /// Encodes bytes into url-safe base64 string 
+        /// Encodes bytes into url-safe base64 string
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
diff --git a/WebPush/VapidHelper.cs b/WebPush/VapidHelper.cs
@@ -1,11 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using Org.BouncyCastle.Crypto;
+﻿using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Parameters;
+using System;
+using System.Collections.Generic;
 using WebPush.Util;
 
 namespace WebPush
@@ -32,7 +28,7 @@ public static VapidDetails GenerateVapidKeys()
 
         /// <summary>
         /// This method takes the required VAPID parameters and returns the required
-        /// header to be added to a Web Push Protocol Request. 
+        /// header to be added to a Web Push Protocol Request.
         /// </summary>
         /// <param name="audience">This must be the origin of the push service.</param>
         /// <param name="subject">This should be a URL or a 'mailto:' email address</param>
@@ -91,7 +87,6 @@ public static void ValidateAudience(string audience)
             {
                 throw new ArgumentException(@"VAPID audience is not a url.");
             }
-
         }
 
         public static void ValidateSubject(string subject)
@@ -130,7 +125,6 @@ public static void ValidatePublicKey(string publicKey)
             }
         }
 
-
         public static void ValidatePrivateKey(string privateKey)
         {
             if (String.IsNullOrEmpty(privateKey))
@@ -140,7 +134,6 @@ public static void ValidatePrivateKey(string privateKey)
 
             byte[] decodedPrivateKey = UrlBase64.Decode(privateKey);
 
-
             if (decodedPrivateKey.Length != 32)
             {
                 throw new ArgumentException(@"Vapid private key should be 32 bytes long when decoded.");
diff --git a/WebPush/WebPushClient.cs b/WebPush/WebPushClient.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Linq;`
	`1`	`+using System.Linq;`
`3`	`2`	`using WebPush.Util;`
`4`	`3`	`using Xunit;`
`5`	`4`
`@@ -10,7 +9,7 @@ public class UrlBase64Test`
`10`	`9`	`[Fact]`
`11`	`10`	`public void TestBase64UrlDecode()`
`12`	`11`	`{`
`13`		`- byte[] expected = new byte[3] {181, 235, 45};`
	`12`	`+ byte[] expected = new byte[3] { 181, 235, 45 };`
`14`	`13`	`byte[] actual = UrlBase64.Decode(@"test");`
`15`	`14`	`Assert.True(actual.SequenceEqual(expected));`
`16`	`15`	`}`
`@@ -19,9 +18,8 @@ public void TestBase64UrlDecode()`
`19`	`18`	`public void TestBase64UrlEncode()`
`20`	`19`	`{`
`21`	`20`	`string expected = @"test";`
`22`		`- string actual = UrlBase64.Encode(new byte[3] {181, 235, 45});`
	`21`	`+ string actual = UrlBase64.Encode(new byte[3] { 181, 235, 45 });`
`23`	`22`	`Assert.Equal(expected, actual);`
`24`	`23`	`}`
`25`		`-`
`26`	`24`	`}`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`		`-`
`7`		`-namespace WebPush`
	`1`	`+namespace WebPush`
`8`	`2`	`{`
`9`	`3`	`public class PushSubscription`
`10`	`4`	`{`
`@@ -14,7 +8,6 @@ public class PushSubscription`
`14`	`8`
`15`	`9`	`public PushSubscription()`
`16`	`10`	`{`
`17`		`-`
`18`	`11`	`}`
`19`	`12`
`20`	`13`	`public PushSubscription(string endpoint, string p256dh, string auth)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ public class VapidDetails`
`8`	`8`
`9`	`9`	`public VapidDetails()`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`/// <param name="subject">This should be a URL or a 'mailto:' email address</param>`