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

Timestamp:

May 7, 2023, 5:05:29 PM (19 months ago)

Author:

alloc

Message:

Fixed: User registration allowed same username for multiple users

Location:

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

Files:

• . (added)
• RegisterUser.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/APIs/RegisterUser.cs ) (2 diffs)

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

@@ -79 +79 @@
                                 return;
                         }
+
+                        if (AdminWebUsers.Instance.GetUsers ().TryGetValue (username, out AdminWebUsers.WebUser existingMapping)) {
+                                // Username already exists
+
+                                if (!PlatformUserIdentifierAbs.Equals (existingMapping.PlatformUser, regData.PlatformUserId) ||
+                                    !PlatformUserIdentifierAbs.Equals (existingMapping.CrossPlatformUser, regData.CrossPlatformUserId)) {
+                                        // Username already in use by another player
+                                        SendErrorResult (_context, HttpStatusCode.Unauthorized, _jsonInputData, "DUPLICATE_USERNAME");
+                                        return;
+                                }
+                                
+                                // Username used by the same player, allow overwriting his existing login
+                        }
                         
-                        // TODO: Check if username is already used by someone else!
-                        // TODO: Remove existing username if player already had one!
+                        // Log info
+                        string crossplatformidString = regData.CrossPlatformUserId == null ? "" : $", crossplatform ID {regData.CrossPlatformUserId.CombinedString}";
+                        global::Log.Out ($"[Web] User registered: Username '{username}' for platform ID {regData.PlatformUserId.CombinedString}{crossplatformidString}");
 
+                        if (AdminWebUsers.Instance.HasUser (regData.PlatformUserId, regData.CrossPlatformUserId, out AdminWebUsers.WebUser existingUser)) {
+                                // Remove existing username of player, only allowing one user per player
+
+                                global::Log.Out ($"[Web] Re-registration, replacing existing username '{existingUser.Name}'");
+                                AdminWebUsers.Instance.RemoveUser (existingUser.Name);
+                        }
+
+                        // Add new user
                         AdminWebUsers.Instance.AddUser (username, password, regData.PlatformUserId, regData.CrossPlatformUserId);
                         
+                        // Login with new user and return response
                         string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString ();
                         SessionHandler.HandleUserIdLogin (ParentWeb.ConnectionHandler, _context, remoteEndpointString, SessionHandler.userPassLoginName,
@@ -93 +116 @@
                         _context.Response.ContentEncoding = Encoding.UTF8;
                         _context.Response.ContentLength64 = 0;
-                        // _context.Response.OutputStream.Write (jsonData.Array!, 0, jsonData.Count);
                 }