Changeset 487 for TFP-WebServer/WebServer/src/WebAPI/APIs

Timestamp:

Jun 17, 2024, 5:25:43 PM (5 months ago)

Author:

alloc

Message:

1.1.0.1 Release for V 1.0

Location:

TFP-WebServer/WebServer/src/WebAPI/APIs

Files:

• Permissions/CommandPermissions.cs (modified) (4 diffs)
• Permissions/CommandPermissions.openapi.yaml (modified) (1 diff)
• Permissions/WebModules.cs (modified) (2 diffs)
• WorldState/Player.cs (modified) (2 diffs)

TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/CommandPermissions.cs

@@ -10 +10 @@
                 private const string propertyCommand = "command";
                 private const string propertyPermissionLevel = "permissionLevel";
+                private const string propertyIsDefault = "default";
 
                 private static readonly byte[] jsonKeyCommand = JsonWriter.GetEncodedPropertyNameWithBeginObject (propertyCommand);
                 private static readonly byte[] jsonKeyPermissionLevel = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator (propertyPermissionLevel);
+                private static readonly byte[] jsonKeyIsDefault = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator (propertyIsDefault);
 
                 private static AdminCommands CommandsInstance => GameManager.Instance.adminTools.Commands;
@@ -26 +28 @@
                         
                                 bool first = true;
-                                foreach ((_, AdminCommands.CommandPermission commandPermission) in CommandsInstance.GetCommands ()) {
+                                
+                                foreach (IConsoleCommand command in SdtdConsole.Instance.GetCommands ()) {
                                         if (!first) {
                                                 writer.WriteValueSeparator ();
@@ -33 +36 @@
                                         first = false;
 
-                                        writeCommandJson (ref writer, commandPermission);
+                                        AdminCommands.CommandPermission commandPermission = CommandsInstance.GetAdminToolsCommandPermission (command.GetCommands());
+                                        bool isDefault = commandPermission.PermissionLevel == command.DefaultPermissionLevel;
+                                        if (commandPermission.Command == "") {
+                                                commandPermission =
+                                                        new AdminCommands.CommandPermission (command.GetCommands ()[0], commandPermission.PermissionLevel);
+                                        }
+
+                                        writeCommandJson (ref writer, commandPermission, isDefault);
                                 }
-
+                                
                                 writer.WriteEndArray ();
                                 
@@ -46 +56 @@
                 }
 
-                private void writeCommandJson (ref JsonWriter _writer, AdminCommands.CommandPermission _commandPermission) {
+                private void writeCommandJson(ref JsonWriter _writer, AdminCommands.CommandPermission _commandPermission, bool _isDefault) {
                         _writer.WriteRaw (jsonKeyCommand);
                         _writer.WriteString (_commandPermission.Command);
                         _writer.WriteRaw (jsonKeyPermissionLevel);
                         _writer.WriteInt32 (_commandPermission.PermissionLevel);
+                        _writer.WriteRaw (jsonKeyIsDefault);
+                        _writer.WriteBoolean (_isDefault);
                         _writer.WriteEndObject ();
                 }

TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/CommandPermissions.openapi.yaml

@@ -21 +21 @@
           type: integer
           description: Permission level of the command
+        default:
+          type: boolean
+          description: Whether the permission level is the default value for the command
       required:
         - command
         - permissionLevel
+        - default
 
     CommandPermissionList:

TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/WebModules.cs

@@ -124 +124 @@
                                 }
 
-                                module.LevelGlobal = permissionLevelGlobal;
+                                module = module.SetLevelGlobal (permissionLevelGlobal);
                         }
 
@@ -165 +165 @@
                                         }
 
-                                        module.LevelPerMethod [(int)method] = permissionLevel;
+                                        module = module.SetLevelForMethod (method, permissionLevel);
                                 }
                         }
 
-                        module.IsDefault = false;
                         ModulesInstance.AddModule (module);
 

TFP-WebServer/WebServer/src/WebAPI/APIs/WorldState/Player.cs

@@ -92 +92 @@
                         ClientInfo ci = ConnectionManager.Instance.Clients.ForUserId (_nativeUserId);
                         if (ci == null) {
-                                Log.Warning ($"[Web] Player.GET: ClientInfo null");
+                                Log.Warning ("[Web] Player.GET: ClientInfo null");
                                 return;
                         }
@@ -100 +100 @@
 
                         if (entity == null) {
-                                Log.Warning ($"[Web] Player.GET: EntityPlayer null");
+                                Log.Warning ("[Web] Player.GET: EntityPlayer null");
                                 return;
                         }