Cleanup HTTPServer and more stuff

Author: JohnnyCrazy

SpotifyAPI.Example/WebControl.cs

@@ -16,7 +16,6 @@ namespace SpotifyAPI.Example
     public partial class WebControl : UserControl
     {
         private SpotifyWebAPI _spotify;
-        private ImplicitGrantAuth _auth;
 
         private PrivateProfile _profile;
         private List<FullTrack> _savedTracks;
@@ -30,30 +29,6 @@ public WebControl()
 
         }
 
-        private void _auth_OnResponseReceivedEvent(Token token, string state)
-        {
-            _auth.StopHttpServer();
-
-            if (state != "XSS")
-            {
-                MessageBox.Show(@"Wrong state received.", @"SpotifyWeb API Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (token.Error != null)
-            {
-                MessageBox.Show($"Error: {token.Error}", @"SpotifyWeb API Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _spotify = new SpotifyWebAPI
-            {
-                UseAuth = true,
-                AccessToken = token.AccessToken,
-                TokenType = token.TokenType
-            };
-            
-        }
-
         private async void InitialSetup()
         {
             if (InvokeRequired)

SpotifyAPI/Web/SimpleHttpServer.cs

@@ -25,12 +25,11 @@ public class HttpProcessor : IDisposable
         private const int BufSize = 4096;
         private readonly HttpServer _srv;
         private Stream _inputStream;
-        public Hashtable HttpHeaders = new Hashtable();
-        public string HttpMethod;
+        private readonly Hashtable _httpHeaders = new Hashtable();
+        private string _httpMethod;
         public string HttpProtocolVersionstring;
         public string HttpUrl;
         public StreamWriter OutputStream;
-        private bool _isActive = true;
 
         public HttpProcessor(HttpServer srv)
         {
@@ -61,16 +60,16 @@ public void Process(TcpClient socket)
                 ParseRequest(requestLines.First());
                 ReadHeaders(requestLines.Skip(1));
 
-                if (HttpMethod.Equals("GET"))
+                if (_httpMethod.Equals("GET"))
                 {
                     HandleGetRequest();
                 }
-                else if (HttpMethod.Equals("POST"))
+                else if (_httpMethod.Equals("POST"))
                 {
                     HandlePostRequest();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 WriteFailure();
             }
@@ -86,7 +85,7 @@ public void ParseRequest(string request)
             {
                 throw new Exception("Invalid HTTP request line");
             }
-            HttpMethod = tokens[0].ToUpper();
+            _httpMethod = tokens[0].ToUpper();
             HttpUrl = tokens[1];
         }
 
@@ -112,7 +111,7 @@ public void ReadHeaders(IEnumerable<string> requestLines)
                 }
 
                 string value = line.Substring(pos, line.Length - pos);
-                HttpHeaders[name] = value;
+                _httpHeaders[name] = value;
             }
         }
 
@@ -130,9 +129,9 @@ public void HandlePostRequest()
             // length, because otherwise he won't know when he's seen it all!
 
             MemoryStream ms = new MemoryStream();
-            if (HttpHeaders.ContainsKey("Content-Length"))
+            if (_httpHeaders.ContainsKey("Content-Length"))
             {
-                var contentLen = Convert.ToInt32(HttpHeaders["Content-Length"]);
+                var contentLen = Convert.ToInt32(_httpHeaders["Content-Length"]);
                 if (contentLen > MaxPostSize)
                 {
                     throw new Exception($"POST Content-Length({contentLen}) too big for this simple server");
@@ -175,7 +174,7 @@ public void WriteFailure()
 
         public void Dispose()
         {
-            _isActive = false;
+
         }
     }