Code Cleanup and ImplictGrantAuth name fix, fixes #320

Author: Jonas Dellinger

SpotifyAPI.Web.Auth/AuthUtil.cs

@@ -21,10 +21,6 @@ public static void OpenBrowser(string url)
             {
                 Process.Start("open", url);
             }
-            else
-            {
-                // throw 
-            }
 #else
             url = url.Replace("&", "^&");
             Process.Start(new ProcessStartInfo("cmd", $"/c start {url}"));

SpotifyAPI.Web.Auth/AuthorizationCodeAuth.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
@@ -48,7 +47,7 @@ protected override void AdaptWebServer(WebServer webServer)
 
         public async Task<Token> RefreshToken(string refreshToken)
         {
-            List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>()
+            List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>
             {
                 new KeyValuePair<string, string>("grant_type", "refresh_token"),
                 new KeyValuePair<string, string>("refresh_token", refreshToken)
@@ -65,7 +64,7 @@ public async Task<Token> RefreshToken(string refreshToken)
         }
         public async Task<Token> ExchangeCode(string code)
         {
-            List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>()
+            List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>
             {
                 new KeyValuePair<string, string>("grant_type", "authorization_code"),
                 new KeyValuePair<string, string>("code", code),

SpotifyAPI.Web.Auth/CredentialsAuth.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
@@ -25,7 +24,7 @@ public async Task<Token> GetToken()
         {
             string auth = Convert.ToBase64String(Encoding.UTF8.GetBytes(ClientId + ":" + ClientSecret));
 
-            List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>()
+            List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>
             {
                 new KeyValuePair<string, string>("grant_type", "client_credentials")
             };

SpotifyAPI.Web.Auth/ImplictGrantAuth.cs SpotifyAPI.Web.Auth/ImplicitGrantAuth.csSpotifyAPI.Web.Auth/ImplictGrantAuth.cs renamed to SpotifyAPI.Web.Auth/ImplicitGrantAuth.cs

@@ -1,42 +1,33 @@
-using System;
-using System.Net;
 using System.Threading.Tasks;
 using SpotifyAPI.Web.Enums;
 using SpotifyAPI.Web.Models;
 using Unosquare.Labs.EmbedIO;
 using Unosquare.Labs.EmbedIO.Constants;
 using Unosquare.Labs.EmbedIO.Modules;
-#if NETSTANDARD2_0
-using System.Net.Http;
-#endif
-#if NET46
-using System.Net.Http;
-using HttpListenerContext = Unosquare.Net.HttpListenerContext;
-#endif
 
 namespace SpotifyAPI.Web.Auth
 {
-    public class ImplictGrantAuth : SpotifyAuthServer<Token>
+    public class ImplicitGrantAuth : SpotifyAuthServer<Token>
     {
-        public ImplictGrantAuth(string clientId, string redirectUri, string serverUri, Scope scope = Scope.None, string state = "") :
+        public ImplicitGrantAuth(string clientId, string redirectUri, string serverUri, Scope scope = Scope.None, string state = "") :
             base("token", "ImplicitGrantAuth", redirectUri, serverUri, scope, state)
         {
             ClientId = clientId;
         }
 
         protected override void AdaptWebServer(WebServer webServer)
         {
-            webServer.Module<WebApiModule>().RegisterController<ImplictGrantAuthController>();
+            webServer.Module<WebApiModule>().RegisterController<ImplicitGrantAuthController>();
         }
     }
 
-    public class ImplictGrantAuthController : WebApiController
+    public class ImplicitGrantAuthController : WebApiController
     {
         [WebApiHandler(HttpVerbs.Get, "/auth")]
         public Task<bool> GetAuth()
         {
             string state = Request.QueryString["state"];
-            SpotifyAuthServer<Token> auth = ImplictGrantAuth.GetByState(state);
+            SpotifyAuthServer<Token> auth = ImplicitGrantAuth.GetByState(state);
             if (auth == null)
                 return this.StringResponseAsync(
                     $"Failed - Unable to find auth request with state \"{state}\" - Please retry");
@@ -57,7 +48,7 @@ public Task<bool> GetAuth()
             }
             else
             {
-                token = new Token()
+                token = new Token
                 {
                     Error = error
                 };
@@ -67,7 +58,7 @@ public Task<bool> GetAuth()
             return this.StringResponseAsync("OK - This window can be closed now");
         }
 
-        public ImplictGrantAuthController(IHttpContext context) : base(context)
+        public ImplicitGrantAuthController(IHttpContext context) : base(context)
         {
         }
     }

SpotifyAPI.Web.Auth/SpotifyAuthServer.cs

@@ -6,7 +6,6 @@
 using System.Threading;
 using SpotifyAPI.Web.Enums;
 using Unosquare.Labs.EmbedIO;
-using Unosquare.Labs.EmbedIO.Constants;
 using Unosquare.Labs.EmbedIO.Modules;
 
 namespace SpotifyAPI.Web.Auth

SpotifyAPI.Web.Example/Program.cs

@@ -10,6 +10,7 @@ internal static class Program
         private static string _clientId = ""; //"";
         private static string _secretId = ""; //"";
 
+        // ReSharper disable once UnusedParameter.Local
         static void Main(string[] args)
         {
             _clientId = string.IsNullOrEmpty(_clientId)

SpotifyAPI.Web.Tests/SpotifyWebAPITest.cs

@@ -21,7 +21,7 @@ public class SpotifyWebAPITest
         public void SetUp()
         {
             _mock = new Mock<IClient>();
-            _spotify = new SpotifyWebAPI()
+            _spotify = new SpotifyWebAPI
             {
                 WebClient = _mock.Object,
                 UseAuth = false

SpotifyAPI.Web/Models/BasicModel.cs

@@ -1,6 +1,4 @@
 using Newtonsoft.Json;
-using SpotifyAPI.Web.Enums;
-using System;
 using System.Net;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/Category.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/CursorPaging.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 
 namespace SpotifyAPI.Web.Models