fixing issue where disconnect reason would be overriden by leaveSession

Author: SamuelBellomo

Assets/BossRoom/Scripts/Client/UI/PostGameUI.cs

@@ -2,6 +2,7 @@
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using TMPro;
+using Unity.Multiplayer.Samples.BossRoom.Client;
 using Unity.Multiplayer.Samples.BossRoom.Shared;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.Utilities;
@@ -102,7 +103,7 @@ public void OnPlayAgainClicked()
 
         public void OnMainMenuClicked()
         {
-            m_ApplicationController.LeaveSession();
+            m_ApplicationController.LeaveSession(withReason: ConnectStatus.UserRequestedDisconnect);
         }
     }
 }

Assets/BossRoom/Scripts/Client/UI/UIQuitPanel.cs

@@ -35,7 +35,7 @@ public void Quit()
             }
             else
             {
-                m_ApplicationController.LeaveSession();
+                m_ApplicationController.LeaveSession(withReason: ConnectStatus.UserRequestedDisconnect);
             }
 
             gameObject.SetActive(false);

Assets/BossRoom/Scripts/Shared/ApplicationController.cs

@@ -100,15 +100,15 @@ private bool OnWantToQuit()
             return canQuit;
         }
 
-        public void LeaveSession()
+        public void LeaveSession(ConnectStatus withReason = ConnectStatus.Undefined)
         {
             m_LobbyServiceFacade.ForceLeaveLobbyAttempt();
 
             // first disconnect then return to menu
             var gameNetPortal = GameNetPortal.Instance;
             if (gameNetPortal != null)
             {
-                gameNetPortal.RequestDisconnect();
+                gameNetPortal.RequestDisconnect(withReason);
             }
 
             SceneLoaderWrapper.Instance.LoadScene("MainMenu");

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

@@ -87,14 +87,15 @@ public void OnNetworkReady()
             }
         }
 
-        /// <summary>
-        /// Invoked when the user has requested a disconnect via the UI, e.g. when hitting "Return to Main Menu" in the post-game scene.
-        /// </summary>
-        public void OnUserDisconnectRequest()
+        public void OnDisconnectRequest(ConnectStatus withDisconnectReason = ConnectStatus.Undefined)
         {
             if (m_Portal.NetManager.IsClient)
             {
-                DisconnectReason.SetDisconnectReason(ConnectStatus.UserRequestedDisconnect);
+                if (withDisconnectReason != ConnectStatus.Undefined)
+                {
+                    DisconnectReason.SetDisconnectReason(withDisconnectReason);
+                }
+
                 if (m_TryToReconnectCoroutine != null)
                 {
                     StopCoroutine(m_TryToReconnectCoroutine);

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

@@ -235,14 +235,14 @@ void StartHost()
         /// This will disconnect (on the client) or shutdown the server (on the host).
         /// It's a local signal (not from the network), indicating that the user has requested a disconnect.
         /// </summary>
-        public void RequestDisconnect()
+        public void RequestDisconnect(ConnectStatus withDisconnectReason = ConnectStatus.Undefined)
         {
             if (NetManager.IsServer)
             {
                 NetManager.SceneManager.OnSceneEvent -= OnSceneEvent;
             }
-            m_ClientPortal.OnUserDisconnectRequest();
-            m_ServerPortal.OnUserDisconnectRequest();
+            m_ClientPortal.OnDisconnectRequest(withDisconnectReason);
+            m_ServerPortal.OnDisconnectRequest();
         }
 
         public string GetPlayerId()

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

@@ -127,7 +127,7 @@ public void OnClientSceneChanged(ulong clientId, int sceneIndex)
         /// Handles the flow when a user has requested a disconnect via UI (which can be invoked on the Host, and thus must be
         /// handled in server code).
         /// </summary>
-        public void OnUserDisconnectRequest()
+        public void OnDisconnectRequest()
         {
             Clear();
             if (m_Portal.NetManager.IsServer)