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

Timestamp:

Jan 19, 2019, 6:12:21 PM (6 years ago)

Author:

alloc

Message:

Fixed game version compatibility of GamePrefs
Code style cleanup (mostly argument names)

File:

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

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

@@ -11 +11 @@
                 private readonly string staticPart;
 
-                public ApiHandler (string staticPart, string moduleName = null) : base (moduleName) {
-                        this.staticPart = staticPart;
+                public ApiHandler (string _staticPart, string _moduleName = null) : base (_moduleName) {
+                        staticPart = _staticPart;
 
                         foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
@@ -45 +45 @@
 #endif
 
-                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;
-                                if (user != null) {
+                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
+                        int _permissionLevel) {
+                        string apiName = _req.Url.AbsolutePath.Remove (0, staticPart.Length);
+
+                        WebAPI api;
+                        if (!apis.TryGetValue (apiName, out api)) {
+                                Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\"");
+                                _resp.StatusCode = (int) HttpStatusCode.NotFound;
+                                return;
+                        }
+
+                        if (!AuthorizeForCommand (apiName, _user, _permissionLevel)) {
+                                _resp.StatusCode = (int) HttpStatusCode.Forbidden;
+                                if (_user != null) {
                                         //Log.Out ("ApiHandler: user '{0}' not allowed to execute '{1}'", user.SteamID, apiName);
                                 }
@@ -57 +65 @@
                         }
 
-                        WebAPI api;
-                        if (apis.TryGetValue (apiName, out api)) {
-                                try {
+                        try {
 #if ENABLE_PROFILER
-                                        apiHandlerSampler.Begin ();
+                                apiHandlerSampler.Begin ();
 #endif
-                                        api.HandleRequest (req, resp, user, permissionLevel);
+                                api.HandleRequest (_req, _resp, _user, _permissionLevel);
 #if ENABLE_PROFILER
-                                        apiHandlerSampler.End ();
+                                apiHandlerSampler.End ();
 #endif
-                                        return;
-                                } catch (Exception e) {
-                                        Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name);
-                                        Log.Exception (e);
-                                        resp.StatusCode = (int) HttpStatusCode.InternalServerError;
-                                        return;
-                                }
+                        } catch (Exception e) {
+                                Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name);
+                                Log.Exception (e);
+                                _resp.StatusCode = (int) HttpStatusCode.InternalServerError;
                         }
-                        
-                        Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\"");
-                        resp.StatusCode = (int) HttpStatusCode.NotFound;
                 }
 
-                private bool AuthorizeForCommand (string apiName, WebConnection user, int permissionLevel) {
-                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + apiName, permissionLevel);
+                private bool AuthorizeForCommand (string _apiName, WebConnection _user, int _permissionLevel) {
+                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + _apiName, _permissionLevel);
                 }
         }