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

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/Permissions

Files:

• Blacklist.cs (added)
• CommandPermissions.cs (added)
• PermissionsApiHelpers.cs (added)
• RegisterUser.cs (modified) (4 diffs)
• UserPermissions.cs (added)
• WebApiTokens.cs (added)
• WebModules.cs (added)
• WebUsers.cs (added)
• Whitelist.cs (added)

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

@@ -9 +9 @@
 using Webserver.UrlHandlers;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.Permissions {
         [UsedImplicitly]
         public class RegisterUser : AbsRestApi {
@@ -27 +27 @@
 
                         if (string.IsNullOrEmpty (token)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, null, "NO_TOKEN");
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, null, "NO_TOKEN");
                                 return;
                         }
 
                         if (!UserRegistrationTokens.TryValidate (token, out UserRegistrationTokens.RegistrationData regData)) {
-                                SendErrorResult (_context, HttpStatusCode.NotFound, null, "INVALID_OR_EXPIRED_TOKEN");
+                                SendEmptyResponse (_context, HttpStatusCode.NotFound, null, "INVALID_OR_EXPIRED_TOKEN");
                                 return;
                         }
@@ -50 +50 @@
 
                 protected override void HandleRestPost (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
-                        if (!TryGetJsonField (_jsonInput, "token", out string token)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "MISSING_TOKEN");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "token", out string token)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "MISSING_TOKEN");
                                 return;
                         }
 
-                        if (!TryGetJsonField (_jsonInput, "username", out string username)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "MISSING_USERNAME");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "username", out string username)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "MISSING_USERNAME");
                                 return;
                         }
 
-                        if (!TryGetJsonField (_jsonInput, "password", out string password)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "MISSING_PASSWORD");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "password", out string password)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "MISSING_PASSWORD");
                                 return;
                         }
 
                         if (!UserRegistrationTokens.TryValidate (token, out UserRegistrationTokens.RegistrationData regData)) {
-                                SendErrorResult (_context, HttpStatusCode.Unauthorized, null, "INVALID_OR_EXPIRED_TOKEN");
+                                SendEmptyResponse (_context, HttpStatusCode.Unauthorized, null, "INVALID_OR_EXPIRED_TOKEN");
                                 return;
                         }
 
                         if (!userValidationRegex.IsMatch (username)) {
-                                SendErrorResult (_context, HttpStatusCode.Unauthorized, _jsonInputData, "INVALID_USERNAME");
+                                SendEmptyResponse (_context, HttpStatusCode.Unauthorized, _jsonInputData, "INVALID_USERNAME");
                                 return;
                         }
                         
                         if (!passValidationRegex.IsMatch (password)) {
-                                SendErrorResult (_context, HttpStatusCode.Unauthorized, _jsonInputData, "INVALID_PASSWORD");
+                                SendEmptyResponse (_context, HttpStatusCode.Unauthorized, _jsonInputData, "INVALID_PASSWORD");
                                 return;
                         }
@@ -86 +86 @@
                                     !PlatformUserIdentifierAbs.Equals (existingMapping.CrossPlatformUser, regData.CrossPlatformUserId)) {
                                         // Username already in use by another player
-                                        SendErrorResult (_context, HttpStatusCode.Unauthorized, _jsonInputData, "DUPLICATE_USERNAME");
+                                        SendEmptyResponse (_context, HttpStatusCode.Unauthorized, _jsonInputData, "DUPLICATE_USERNAME");
                                         return;
                                 }