Changeset 434 for binary-improvements2/WebServer/src/WebAPI/APIs/WorldState

Timestamp:

May 17, 2023, 11:05:59 PM (18 months ago)

Author:

alloc

Message:

Added permission management APIs

Location:

binary-improvements2/WebServer/src/WebAPI/APIs/WorldState

Files:

• Animal.cs (modified) (1 diff)
• Hostile.cs (modified) (1 diff)
• Player.cs (modified) (5 diffs)

binary-improvements2/WebServer/src/WebAPI/APIs/WorldState/Animal.cs

@@ -4 +4 @@
 using Webserver.LiveData;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.WorldState {
         [UsedImplicitly]
         internal class Animal : AbsRestApi {

binary-improvements2/WebServer/src/WebAPI/APIs/WorldState/Hostile.cs

@@ -4 +4 @@
 using Webserver.LiveData;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.WorldState {
         [UsedImplicitly]
         internal class Hostile : AbsRestApi {

binary-improvements2/WebServer/src/WebAPI/APIs/WorldState/Player.cs

@@ -6 +6 @@
 using Webserver.Permissions;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.WorldState {
         [UsedImplicitly]
         public class Player : AbsRestApi {
@@ -216 +216 @@
 
                 protected override void HandleRestPost (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
-                        if (!TryGetJsonField (_jsonInput, "command", out string commandString)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_COMMAND");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "command", out string commandString)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_COMMAND");
                                 return;
                         }
@@ -223 +223 @@
                         WebCommandResult.ResultType responseType = WebCommandResult.ResultType.Full;
 
-                        if (TryGetJsonField (_jsonInput, "format", out string formatString)) {
+                        if (JsonCommons.TryGetJsonField (_jsonInput, "format", out string formatString)) {
                                 if (formatString.EqualsCaseInsensitive ("raw")) {
                                         responseType = WebCommandResult.ResultType.Raw;
@@ -240 +240 @@
 
                         if (command == null) {
-                                SendErrorResult (_context, HttpStatusCode.NotFound, _jsonInputData, "UNKNOWN_COMMAND");
+                                SendEmptyResponse (_context, HttpStatusCode.NotFound, _jsonInputData, "UNKNOWN_COMMAND");
                                 return;
                         }
@@ -247 +247 @@
 
                         if (_context.PermissionLevel > commandPermissionLevel) {
-                                SendErrorResult (_context, HttpStatusCode.Forbidden, _jsonInputData, "NO_PERMISSION");
+                                SendEmptyResponse (_context, HttpStatusCode.Forbidden, _jsonInputData, "NO_PERMISSION");
                                 return;
                         }