Moved removal responsibility of player from lobby to host

Author: LPLafontaineB

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -153,9 +153,6 @@ private void OnDisconnectOrTimeout(ulong clientID)
             // not a host (in which case we know this is about us) or that the clientID is the same as ours if we are the host.
             if (!NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsHost && NetworkManager.Singleton.LocalClientId == clientID)
             {
-                // Leave the current lobby.
-                //TODO: When the SessionManager will use the PlayerId from AuthenticationService instead of our current custom GUID, this could be replaced by the host kicking the disconnecting client from the lobby
-                m_LobbyServiceFacade.ForceLeaveLobbyAttempt();
                 //On a client disconnect we want to take them back to the main menu.
                 //We have to check here in SceneManager if our active scene is the main menu, as if it is, it means we timed out rather than a raw disconnect;
                 if (SceneManager.GetActiveScene().name != "MainMenu")

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ServerGameNetPortal.cs

@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Multiplayer.Samples.BossRoom.Client;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using Unity.Multiplayer.Samples.Utilities;
 using UnityEngine;
 using Unity.Netcode;
-using UnityEngine.SceneManagement;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Server
 {
@@ -17,21 +18,31 @@ public class ServerGameNetPortal : MonoBehaviour
         [SerializeField]
         NetworkObject m_GameState;
 
-        private GameNetPortal m_Portal;
+        GameNetPortal m_Portal;
 
         // used in ApprovalCheck. This is intended as a bit of light protection against DOS attacks that rely on sending silly big buffers of garbage.
-        private const int k_MaxConnectPayload = 1024;
+        const int k_MaxConnectPayload = 1024;
 
         /// <summary>
         /// Keeps a list of what clients are in what scenes.
         /// </summary>
-        private Dictionary<ulong, int> m_ClientSceneMap = new Dictionary<ulong, int>();
+        Dictionary<ulong, int> m_ClientSceneMap = new Dictionary<ulong, int>();
 
         /// <summary>
         /// The active server scene index.
         /// </summary>
         public int ServerScene { get { return UnityEngine.SceneManagement.SceneManager.GetActiveScene().buildIndex; } }
 
+        private LocalLobby m_LocalLobby;
+        private LobbyServiceFacade m_LobbyServiceFacade;
+
+        [Inject]
+        private void InjectDependencies(LocalLobby localLobby, LobbyServiceFacade lobbyServiceFacade)
+        {
+            m_LocalLobby = localLobby;
+            m_LobbyServiceFacade = lobbyServiceFacade;
+        }
+
         void Start()
         {
             m_Portal = GetComponent<GameNetPortal>();
@@ -82,7 +93,7 @@ public void OnNetworkReady()
         /// Handles the case where NetworkManager has told us a client has disconnected. This includes ourselves, if we're the host,
         /// and the server is stopped."
         /// </summary>
-        private void OnClientDisconnect(ulong clientId)
+        void OnClientDisconnect(ulong clientId)
         {
             m_ClientSceneMap.Remove(clientId);
 
@@ -91,6 +102,15 @@ private void OnClientDisconnect(ulong clientId)
                 //the ServerGameNetPortal may be initialized again, which will cause its OnNetworkSpawn to be called again.
                 //Consequently we need to unregister anything we registered, when the NetworkManager is shutting down.
                 m_Portal.NetManager.OnClientDisconnectCallback -= OnClientDisconnect;
+                m_LobbyServiceFacade.DeleteLobbyAsync(m_LocalLobby.LobbyID, null, null);
+            }
+            else
+            {
+                var playerId = SessionManager<SessionPlayerData>.Instance.GetPlayerId(clientId);
+                if (playerId != null)
+                {
+                    m_LobbyServiceFacade.RemovePlayerFromLobbyAsync(playerId, m_LocalLobby.LobbyID, null, null);
+                }
             }
         }
 
@@ -121,7 +141,7 @@ IEnumerator WaitToShutdown()
             m_Portal.NetManager.Shutdown();
         }
 
-        private void Clear()
+        void Clear()
         {
             //resets all our runtime state.
             m_ClientSceneMap.Clear();
@@ -151,7 +171,7 @@ public bool AreAllClientsInServerScene()
         /// <param name="connectionData">binary data passed into StartClient. In our case this is the client's GUID, which is a unique identifier for their install of the game that persists across app restarts. </param>
         /// <param name="clientId">This is the clientId that Netcode assigned us on login. It does not persist across multiple logins from the same client. </param>
         /// <param name="connectionApprovedCallback">The delegate we must invoke to signal that the connection was approved or not. </param>
-        private void ApprovalCheck(byte[] connectionData, ulong clientId, NetworkManager.ConnectionApprovedDelegate connectionApprovedCallback)
+        void ApprovalCheck(byte[] connectionData, ulong clientId, NetworkManager.ConnectionApprovedDelegate connectionApprovedCallback)
         {
             if (connectionData.Length > k_MaxConnectPayload)
             {
@@ -226,7 +246,7 @@ private void ApprovalCheck(byte[] connectionData, ulong clientId, NetworkManager
             }
         }
 
-        private IEnumerator WaitToDisconnect(ulong clientId)
+        IEnumerator WaitToDisconnect(ulong clientId)
         {
             yield return new WaitForSeconds(0.5f);
             m_Portal.NetManager.DisconnectClient(clientId);
@@ -269,7 +289,7 @@ public void SendServerToClientConnectResult(ulong clientID, ConnectStatus status
         /// <summary>
         /// Called after the server is created-  This is primarily meant for the host server to clean up or handle/set state as its starting up
         /// </summary>
-        private void ServerStartedHandler()
+        void ServerStartedHandler()
         {
             // server spawns game state
             var gameState = Instantiate(m_GameState);

Assets/BossRoom/Scripts/Shared/Net/UnityServices/Lobbies/LobbyServiceFacade.cs

@@ -4,6 +4,7 @@
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Infrastructure;
 using Unity.Services.Authentication;
 using Unity.Services.Lobbies.Models;
+using UnityEngine;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies
 {
@@ -237,6 +238,30 @@ public void LeaveLobbyAsync(string lobbyId, Action onSuccess, Action onFailure)
             m_LobbyApiInterface.LeaveLobbyAsync(uasId, lobbyId, onSuccess, onFailure);
         }
 
+        public void RemovePlayerFromLobbyAsync(string uasId, string lobbyId, Action onSuccess, Action onFailure)
+        {
+            if (m_LocalUser.IsHost)
+            {
+                m_LobbyApiInterface.LeaveLobbyAsync(uasId, lobbyId, onSuccess, onFailure);
+            }
+            else
+            {
+                Debug.LogError("Only the host can remove other players from the lobby.");
+            }
+        }
+
+        public void DeleteLobbyAsync(string lobbyId, Action onSuccess, Action onFailure)
+        {
+            if (m_LocalUser.IsHost)
+            {
+                m_LobbyApiInterface.DeleteLobbyAsync(lobbyId, onSuccess, onFailure);
+            }
+            else
+            {
+                Debug.LogError("Only the host can delete a lobby.");
+            }
+        }
+
         /// <summary>
         /// Attempt to push a set of key-value pairs associated with the local player which will overwrite any existing data for these keys.
         /// </summary>

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/SessionManager.cs

@@ -179,18 +179,29 @@ public bool SetupConnectingPlayerSessionData(ulong clientId, string clientGUID,
             return success;
         }
 
+        public string GetPlayerId(ulong clientId)
+        {
+            if (m_ClientIDToGuid.TryGetValue(clientId, out string playerId))
+            {
+                return playerId;
+            }
+
+            Debug.LogError($"No client guid found mapped to the given client ID: {clientId}");
+            return null;
+        }
+
         /// <summary>
         ///
         /// </summary>
         /// <param name="clientId"> id of the client whose data is requested</param>
         /// <returns>Player data struct matching the given ID</returns>
         public T? GetPlayerData(ulong clientId)
         {
-            //First see if we have a guid matching the clientID given.
-
-            if (m_ClientIDToGuid.TryGetValue(clientId, out string clientGUID))
+            //First see if we have a playerId matching the clientID given.
+            var playerId = GetPlayerId(clientId);
+            if (playerId != null)
             {
-                return GetPlayerData(clientGUID);
+                return GetPlayerData(playerId);
             }
 
             Debug.LogError($"No client guid found mapped to the given client ID: {clientId}");