Changeset 325 for binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

Timestamp:

Sep 4, 2018, 1:00:48 PM (6 years ago)

Author:

alloc

Message:

Code style cleanup (mostly whitespace changes, enforcing braces, using cleanup)

File:

• binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs (modified) (5 diffs)

binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

@@ -1 @@
-using AllocsFixes.NetConnections.Servers.Web.API;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Reflection;
-using System.Threading;
+using AllocsFixes.NetConnections.Servers.Web.API;
 
-namespace AllocsFixes.NetConnections.Servers.Web.Handlers
-{
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
         public class ApiHandler : PathHandler {
-                private string staticPart;
-                private Dictionary<String, WebAPI> apis = new Dictionary<string, WebAPI> ();
+                private readonly Dictionary<string, WebAPI> apis = new Dictionary<string, WebAPI> ();
+                private readonly string staticPart;
 
                 public ApiHandler (string staticPart, string moduleName = null) : base (moduleName) {
@@ -17 +14 @@
 
                         foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
-                                if (!t.IsAbstract && t.IsSubclassOf (typeof(WebAPI))) {
+                                if (!t.IsAbstract && t.IsSubclassOf (typeof (WebAPI))) {
                                         ConstructorInfo ctor = t.GetConstructor (new Type [0]);
                                         if (ctor != null) {
-                                                WebAPI apiInstance = (WebAPI)ctor.Invoke (new object [0]);
+                                                WebAPI apiInstance = (WebAPI) ctor.Invoke (new object [0]);
                                                 addApi (t.Name.ToLower (), apiInstance);
                                         }
@@ -26 +23 @@
                         }
 
-            // Add dummy types
-            Type dummy_t = typeof (API.Null);
-            ConstructorInfo dummy_ctor = dummy_t.GetConstructor (new Type [0]);
-            if (dummy_ctor != null) {
-                WebAPI dummy_apiInstance = (WebAPI)dummy_ctor.Invoke (new object[0]);
+                        // Add dummy types
+                        Type dummy_t = typeof (Null);
+                        ConstructorInfo dummy_ctor = dummy_t.GetConstructor (new Type [0]);
+                        if (dummy_ctor != null) {
+                                WebAPI dummy_apiInstance = (WebAPI) dummy_ctor.Invoke (new object[0]);
 
-                // Permissions that don't map to a real API
-                addApi("viewallclaims", dummy_apiInstance);
-                addApi("viewallplayers", dummy_apiInstance);
-            }
+                                // Permissions that don't map to a real API
+                                addApi ("viewallclaims", dummy_apiInstance);
+                                addApi ("viewallplayers", dummy_apiInstance);
+                        }
                 }
 
@@ -43 +40 @@
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel) {
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
+                        int permissionLevel) {
                         string apiName = req.Url.AbsolutePath.Remove (0, staticPart.Length);
                         if (!AuthorizeForCommand (apiName, user, permissionLevel)) {
-                                resp.StatusCode = (int)HttpStatusCode.Forbidden;
+                                resp.StatusCode = (int) HttpStatusCode.Forbidden;
                                 if (user != null) {
                                         //Log.Out ("ApiHandler: user '{0}' not allowed to execute '{1}'", user.SteamID, apiName);
-                                } else {
-                                        //Log.Out ("ApiHandler: unidentified user from '{0}' not allowed to execute '{1}'", req.RemoteEndPoint.Address, apiName);
                                 }
+
                                 return;
-                        } else {
-                                foreach (KeyValuePair<string, WebAPI> kvp in apis) {
-                                        if (apiName.StartsWith (kvp.Key)) {
-                                                try {
-                                                        kvp.Value.HandleRequest (req, resp, user, permissionLevel);
-                                                        return;
-                                                } catch (Exception e) {
-                                                        Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", kvp.Key);
-                                                        Log.Exception (e);
-                                                        resp.StatusCode = (int)HttpStatusCode.InternalServerError;
-                                                        return;
-                                                }
+                        }
+
+                        foreach (KeyValuePair<string, WebAPI> kvp in apis) {
+                                if (apiName.StartsWith (kvp.Key)) {
+                                        try {
+                                                kvp.Value.HandleRequest (req, resp, user, permissionLevel);
+                                                return;
+                                        } catch (Exception e) {
+                                                Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", kvp.Key);
+                                                Log.Exception (e);
+                                                resp.StatusCode = (int) HttpStatusCode.InternalServerError;
+                                                return;
                                         }
                                 }
                         }
-        
+
                         Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\"");
-                        resp.StatusCode = (int)HttpStatusCode.NotFound;
+                        resp.StatusCode = (int) HttpStatusCode.NotFound;
                 }
 
@@ -76 +73 @@
                         return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + apiName, permissionLevel);
                 }
-
         }
-
 }
-