Changeset 387 for binary-improvements2/MapRendering/Web/API/GetPlayerList.cs

Timestamp:

Aug 6, 2022, 11:32:32 PM (2 years ago)

Author:

alloc

Message:

Big refactoring in Web to pass around a Context instead of a bunch of individual arguments all the time

File:

• binary-improvements2/MapRendering/Web/API/GetPlayerList.cs (modified) (5 diffs)

binary-improvements2/MapRendering/Web/API/GetPlayerList.cs

@@ -5 +5 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
-using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
-using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetPlayerList : WebAPI {
+        public class GetPlayerList : AbsWebAPI {
                 private static readonly Regex numberFilterMatcher =
                         new Regex (@"^(>=|=>|>|<=|=<|<|==|=)?\s*([0-9]+(\.[0-9]*)?)$");
@@ -17 +15 @@
 #endif
 
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+                public override void HandleRequest (RequestContext _context) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        PlatformUserIdentifierAbs userId = _user?.UserId;
-
-                        bool bViewAll = WebConnection.CanViewAllPlayers (_permissionLevel);
+                        PlatformUserIdentifierAbs userId = _context.Connection?.UserId;
+
+                        bool bViewAll = WebConnection.CanViewAllPlayers (_context.PermissionLevel);
 
                         // TODO: Sort (and filter?) prior to converting to JSON ... hard as how to get the correct column's data? (i.e. column name matches JSON object field names, not source data)
 
                         int rowsPerPage = 25;
-                        if (_req.QueryString ["rowsperpage"] != null) {
-                                int.TryParse (_req.QueryString ["rowsperpage"], out rowsPerPage);
+                        if (_context.Request.QueryString ["rowsperpage"] != null) {
+                                int.TryParse (_context.Request.QueryString ["rowsperpage"], out rowsPerPage);
                         }
 
                         int page = 0;
-                        if (_req.QueryString ["page"] != null) {
-                                int.TryParse (_req.QueryString ["page"], out page);
+                        if (_context.Request.QueryString ["page"] != null) {
+                                int.TryParse (_context.Request.QueryString ["page"], out page);
                         }
 
@@ -83 +80 @@
                         IEnumerable<JSONObject> list = playerList;
 
-                        foreach (string key in _req.QueryString.AllKeys) {
+                        foreach (string key in _context.Request.QueryString.AllKeys) {
                                 if (!string.IsNullOrEmpty (key) && key.StartsWith ("filter[")) {
                                         string filterCol = key.Substring (key.IndexOf ('[') + 1);
                                         filterCol = filterCol.Substring (0, filterCol.Length - 1);
-                                        string filterVal = _req.QueryString.Get (key).Trim ();
+                                        string filterVal = _context.Request.QueryString.Get (key).Trim ();
 
                                         list = ExecuteFilter (list, filterCol, filterVal);
@@ -95 +92 @@
                         int totalAfterFilter = list.Count ();
 
-                        foreach (string key in _req.QueryString.AllKeys) {
+                        foreach (string key in _context.Request.QueryString.AllKeys) {
                                 if (!string.IsNullOrEmpty (key) && key.StartsWith ("sort[")) {
                                         string sortCol = key.Substring (key.IndexOf ('[') + 1);
                                         sortCol = sortCol.Substring (0, sortCol.Length - 1);
-                                        string sortVal = _req.QueryString.Get (key);
+                                        string sortVal = _context.Request.QueryString.Get (key);
 
                                         list = ExecuteSort (list, sortCol, sortVal == "0");
@@ -120 +117 @@
                         result.Add ("players", playersJsResult);
 
-                        WriteJSON (_resp, result);
+                        WebUtils.WriteJson (_context.Response, result);
                 }