Changeset 387 for binary-improvements2/MapRendering/Web/API/ExecuteConsoleCommand.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/ExecuteConsoleCommand.cs (modified) (3 diffs)

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

@@ -1 +1 @@
 using System;
 using System.Net;
-using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
-using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class ExecuteConsoleCommand : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
-                        if (string.IsNullOrEmpty (_req.QueryString ["command"])) {
-                                _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                Web.SetResponseTextContent (_resp, "No command given");
+        public class ExecuteConsoleCommand : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
+                        if (string.IsNullOrEmpty (_context.Request.QueryString ["command"])) {
+                                WebUtils.WriteText (_context.Response, "No command given", HttpStatusCode.BadRequest);
                                 return;
                         }
 
                         WebCommandResult.ResultType responseType =
-                                _req.QueryString ["raw"] != null
+                                _context.Request.QueryString ["raw"] != null
                                         ? WebCommandResult.ResultType.Raw
-                                        : (_req.QueryString ["simple"] != null
+                                        : (_context.Request.QueryString ["simple"] != null
                                                 ? WebCommandResult.ResultType.ResultOnly
                                                 : WebCommandResult.ResultType.Full);
 
-                        string commandline = _req.QueryString ["command"];
+                        string commandline = _context.Request.QueryString ["command"];
                         string commandPart = commandline.Split (' ') [0];
                         string argumentsPart = commandline.Substring (Math.Min (commandline.Length, commandPart.Length + 1));
@@ -28 +24 @@
 
                         if (command == null) {
-                                _resp.StatusCode = (int) HttpStatusCode.NotFound;
-                                Web.SetResponseTextContent (_resp, "Unknown command");
+                                WebUtils.WriteText (_context.Response, "Unknown command", HttpStatusCode.NotFound);
                                 return;
                         }
@@ -35 +30 @@
                         int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (command.GetCommands ());
 
-                        if (_permissionLevel > commandPermissionLevel) {
-                                _resp.StatusCode = (int) HttpStatusCode.Forbidden;
-                                Web.SetResponseTextContent (_resp, "You are not allowed to execute this command");
+                        if (_context.PermissionLevel > commandPermissionLevel) {
+                                WebUtils.WriteText (_context.Response, "You are not allowed to execute this command", HttpStatusCode.Forbidden);
                                 return;
                         }
 
-                        _resp.SendChunked = true;
-                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, _resp);
+                        _context.Response.SendChunked = true;
+                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, _context.Response);
                         SdtdConsole.Instance.ExecuteAsync (commandline, wcr);
                 }