Merge pull request #272 from smoogipoo/fix-join-password

Fix not being able to join rooms with password

Author: peppy

osu.Server.Spectator.Tests/Multiplayer/RoomInteropTest.cs

@@ -20,7 +20,7 @@ public async Task CreateRoom()
 
             await Hub.CreateRoom(new MultiplayerRoom(0));
             LegacyIO.Verify(io => io.CreateRoomAsync(USER_ID, It.IsAny<MultiplayerRoom>()), Times.Once);
-            LegacyIO.Verify(io => io.AddUserToRoomAsync(ROOM_ID, USER_ID), Times.Once);
+            LegacyIO.Verify(io => io.AddUserToRoomAsync(USER_ID, ROOM_ID, It.IsAny<string>()), Times.Once);
 
             using (var usage = await Hub.GetRoom(ROOM_ID))
             {
@@ -33,10 +33,10 @@ public async Task CreateRoom()
         public async Task LeaveRoom()
         {
             await Hub.JoinRoom(ROOM_ID);
-            LegacyIO.Verify(io => io.RemoveUserFromRoomAsync(ROOM_ID, USER_ID), Times.Never);
+            LegacyIO.Verify(io => io.RemoveUserFromRoomAsync(USER_ID, ROOM_ID), Times.Never);
 
             await Hub.LeaveRoom();
-            LegacyIO.Verify(io => io.RemoveUserFromRoomAsync(ROOM_ID, USER_ID), Times.Once);
+            LegacyIO.Verify(io => io.RemoveUserFromRoomAsync(USER_ID, ROOM_ID), Times.Once);
 
             await Assert.ThrowsAsync<KeyNotFoundException>(() => Hub.GetRoom(ROOM_ID));
         }

osu.Server.Spectator/Hubs/Multiplayer/MultiplayerHub.cs

@@ -67,7 +67,7 @@ public async Task<MultiplayerRoom> JoinRoomWithPassword(long roomId, string pass
                     throw new InvalidStateException("Can't join a room when restricted.");
             }
 
-            await sharedInterop.AddUserToRoomAsync(roomId, Context.GetUserId());
+            await sharedInterop.AddUserToRoomAsync(Context.GetUserId(), roomId, password);
 
             using (var userUsage = await GetOrCreateLocalUserState())
             {
@@ -917,7 +917,7 @@ private async Task<ItemUsage<ServerMultiplayerRoom>> getLocalUserRoom(Multiplaye
 
         private async Task leaveRoom(MultiplayerClientState state, bool wasKick)
         {
-            await sharedInterop.RemoveUserFromRoomAsync(state.CurrentRoomID, state.UserId);
+            await sharedInterop.RemoveUserFromRoomAsync(state.UserId, state.CurrentRoomID);
 
             using (var roomUsage = await getLocalUserRoom(state))
                 await leaveRoom(state, roomUsage, wasKick);

osu.Server.Spectator/Services/ISharedInterop.cs

@@ -25,18 +25,19 @@ public interface ISharedInterop
         /// <remarks>
         /// This performs setup tasks like adding the user to the relevant chat channel.
         /// </remarks>
-        /// <param name="roomId">The ID of the room to join.</param>
         /// <param name="userId">The ID of the user wanting to join the room.</param>
-        Task AddUserToRoomAsync(long roomId, int userId);
+        /// <param name="roomId">The ID of the room to join.</param>
+        /// <param name="password">The room's password.</param>
+        Task AddUserToRoomAsync(int userId, long roomId, string password);
 
         /// <summary>
         /// Parts an osu!web room.
         /// </summary>
         /// <remarks>
         /// This performs setup tasks like removing the user from any relevant chat channels.
         /// </remarks>
-        /// <param name="roomId">The ID of the room to part.</param>
         /// <param name="userId">The ID of the user wanting to part the room.</param>
-        Task RemoveUserFromRoomAsync(long roomId, int userId);
+        /// <param name="roomId">The ID of the room to part.</param>
+        Task RemoveUserFromRoomAsync(int userId, long roomId);
     }
 }

osu.Server.Spectator/Services/SharedInterop.cs

@@ -123,12 +123,15 @@ public async Task<long> CreateRoomAsync(int hostUserId, MultiplayerRoom room)
             })));
         }
 
-        public async Task AddUserToRoomAsync(long roomId, int userId)
+        public async Task AddUserToRoomAsync(int userId, long roomId, string password)
         {
-            await runCommand(HttpMethod.Put, $"multiplayer/rooms/{roomId}/users/{userId}");
+            await runCommand(HttpMethod.Put, $"multiplayer/rooms/{roomId}/users/{userId}", new
+            {
+                password = password
+            });
         }
 
-        public async Task RemoveUserFromRoomAsync(long roomId, int userId)
+        public async Task RemoveUserFromRoomAsync(int userId, long roomId)
         {
             await runCommand(HttpMethod.Delete, $"multiplayer/rooms/{roomId}/users/{userId}");
         }