Changeset 404 for binary-improvements2/WebServer/src/UrlHandlers/UserStatusHandler.cs

Timestamp:

Feb 16, 2023, 3:50:53 PM (21 months ago)

Author:

alloc

Message:

Latest state including reworking to the permissions system

File:

• binary-improvements2/WebServer/src/UrlHandlers/UserStatusHandler.cs (modified) (3 diffs)

binary-improvements2/WebServer/src/UrlHandlers/UserStatusHandler.cs

@@ +1 @@
+using System.Collections.Generic;
 using Utf8Json;
+using Webserver.Permissions;
 
 namespace Webserver.UrlHandlers {
@@ -8 +10 @@
                 private static readonly byte[] jsonLoggedInKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("loggedIn");
                 private static readonly byte[] jsonUsernameKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("username");
+                private static readonly byte[] jsonPermissionLevelKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("permissionLevel");
                 private static readonly byte[] jsonPermissionsKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("permissions");
 
@@ -20 +23 @@
                         
                         writer.WriteRaw (jsonUsernameKey);
-                        writer.WriteString (_context.Connection != null ? _context.Connection.UserId.ToString () : string.Empty);
+                        writer.WriteString (_context.Connection != null ? _context.Connection.Username : string.Empty);
+                        
+                        writer.WriteRaw (jsonPermissionLevelKey);
+                        writer.WriteInt32 (_context.PermissionLevel);
                         
                         writer.WriteRaw (jsonPermissionsKey);
                         writer.WriteBeginArray ();
 
-                        bool first = true;
-                        foreach (WebPermissions.WebModulePermission perm in WebPermissions.Instance.GetModules ()) {
-                                if (!first) {
+                        List<AdminWebModules.WebModule> list = AdminWebModules.Instance.GetModules ();
+                        for (int i = 0; i < list.Count; i++) {
+                                AdminWebModules.WebModule perm = list [i];
+                                
+                                if (i > 0) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                first = false;
-                                
                                 writer.WriteRaw (jsonModuleKey);
-                                writer.WriteString (perm.module);
-                                
+                                writer.WriteString (perm.Name);
+
                                 writer.WriteRaw (jsonAllowedKey);
-                                writer.WriteBoolean (perm.permissionLevel >= _context.PermissionLevel);
-                                
+                                writer.WriteBoolean (perm.PermissionLevel >= _context.PermissionLevel);
+
                                 writer.WriteEndObject ();
                         }