Changeset 426 for binary-improvements2/WebServer/src/WebAPI/APIs

Timestamp:

Apr 24, 2023, 2:40:34 PM (19 months ago)

Author:

alloc

Message:

*Updated web permissions system
*Fixed webpermissions command
*Moved API "webmods" to "mods", also lists non-webmod mods

Location:

binary-improvements2/WebServer/src/WebAPI/APIs

Files:

• Command.cs (modified) (2 diffs)
• Mods.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/APIs/WebMods.cs ) (3 diffs)
• Player.cs (modified) (1 diff)
• RegisterUser.cs (modified) (2 diffs)
• ServerStats.cs (modified) (2 diffs)
• WebUiUpdates.cs (modified) (2 diffs)

binary-improvements2/WebServer/src/WebAPI/APIs/Command.cs

@@ -3 +3 @@
 using JetBrains.Annotations;
 using Utf8Json;
+using Webserver.Permissions;
 
 namespace Webserver.WebAPI.APIs {
@@ -130 +131 @@
                 }
 
-                public override int DefaultPermissionLevel () => 2000;
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }

binary-improvements2/WebServer/src/WebAPI/APIs/Mods.cs

@@ -1 +1 @@
 using JetBrains.Annotations;
 using Utf8Json;
+using Webserver.Permissions;
 
 namespace Webserver.WebAPI.APIs {
         [UsedImplicitly]
-        public class WebMods : AbsRestApi {
+        public class Mods : AbsRestApi {
                 private readonly byte[] loadedWebMods;
 
-                public WebMods (Web _parent) {
+                public Mods (Web _parent) {
                         JsonWriter writer = new JsonWriter ();
                         writer.WriteBeginArray ();
@@ -13 +14 @@
                         for (int i = 0; i < _parent.webMods.Count; i++) {
                                 WebMod webMod = _parent.webMods [i];
-                                
+
                                 if (i > 0) {
                                         writer.WriteValueSeparator ();
                                 }
-
+                                
                                 writer.WriteBeginObject ();
 
-                                writer.WriteString ("name");
-                                writer.WriteNameSeparator ();
-                                writer.WriteString (webMod.ParentMod.Name);
+                                writeModJson (ref writer, webMod);
 
-                                string webModReactBundle = webMod.ReactBundle;
-                                if (webModReactBundle != null) {
+                                if (webMod.ReactBundle != null || webMod.CssPath != null) {
                                         writer.WriteValueSeparator ();
-                                        writer.WriteString ("bundle");
-                                        writer.WriteNameSeparator ();
-                                        writer.WriteString (webModReactBundle);
-                                }
 
-                                string webModCssFile = webMod.CssPath;
-                                if (webModCssFile != null) {
-                                        writer.WriteValueSeparator ();
-                                        writer.WriteString ("css");
-                                        writer.WriteNameSeparator ();
-                                        writer.WriteString (webModCssFile);
+                                        writer.WritePropertyName ("web");
+                                        writer.WriteBeginObject ();
+                                        
+                                        string webModReactBundle = webMod.ReactBundle;
+                                        if (webModReactBundle != null) {
+                                                writer.WritePropertyName ("bundle");
+                                                writer.WriteString (webModReactBundle);
+                                        }
+
+                                        string webModCssFile = webMod.CssPath;
+                                        if (webModCssFile != null) {
+                                                if (webModReactBundle != null) {
+                                                        writer.WriteValueSeparator ();
+                                                }
+
+                                                writer.WritePropertyName ("css");
+                                                writer.WriteString (webModCssFile);
+                                        }
+                                        
+                                        writer.WriteEndObject ();
                                 }
 
@@ -54 +62 @@
                 }
 
-                public override int DefaultPermissionLevel () => 2000;
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
+
+                private void writeModJson (ref JsonWriter _writer, WebMod _webMod) {
+                        _writer.WritePropertyName ("name");
+                        _writer.WriteString (_webMod.ParentMod.Name);
+                        
+                        _writer.WriteValueSeparator ();
+                        _writer.WritePropertyName ("displayName");
+                        JsonCommons.WriteStringOrNull (ref _writer, _webMod.ParentMod.DisplayName);
+
+                        _writer.WriteValueSeparator ();
+                        _writer.WritePropertyName ("description");
+                        JsonCommons.WriteStringOrNull (ref _writer, _webMod.ParentMod.Description);
+
+                        _writer.WriteValueSeparator ();
+                        _writer.WritePropertyName ("author");
+                        JsonCommons.WriteStringOrNull (ref _writer, _webMod.ParentMod.Author);
+
+                        _writer.WriteValueSeparator ();
+                        _writer.WritePropertyName ("version");
+                        JsonCommons.WriteStringOrNull (ref _writer, _webMod.ParentMod.VersionString);
+
+                        _writer.WriteValueSeparator ();
+                        _writer.WritePropertyName ("website");
+                        JsonCommons.WriteStringOrNull (ref _writer, _webMod.ParentMod.Website);
+                }
         }
 }

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

@@ -256 +256 @@
                 }
 
-                public override int DefaultPermissionLevel () => 2000;
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }

binary-improvements2/WebServer/src/WebAPI/APIs/RegisterUser.cs

@@ -80 +80 @@
                         }
                         
-                        // TODO: Check if username is already used!
+                        // TODO: Check if username is already used by someone else!
+                        // TODO: Remove existing username if player already had one!
 
                         AdminWebUsers.Instance.AddUser (username, password, regData.PlatformUserId, regData.CrossPlatformUserId);
@@ -95 +96 @@
                 }
 
-                public override int DefaultPermissionLevel () => 2000;
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }

binary-improvements2/WebServer/src/WebAPI/APIs/ServerStats.cs

@@ -2 +2 @@
 using Utf8Json;
 using Webserver.LiveData;
+using Webserver.Permissions;
 
 namespace Webserver.WebAPI.APIs {
@@ -47 +48 @@
                 }
 
-                public override int DefaultPermissionLevel () => 2000;
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }

binary-improvements2/WebServer/src/WebAPI/APIs/WebUiUpdates.cs

@@ -2 +2 @@
 using Utf8Json;
 using Webserver.LiveData;
+using Webserver.Permissions;
 
 namespace Webserver.WebAPI.APIs {
@@ -57 +58 @@
                 }
 
-                public override int DefaultPermissionLevel () => 2000;
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }