Removed OnlineMode responsability from GameNetPortal

Author: LPLafontaineB

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

@@ -158,7 +158,6 @@ private void OnDisconnectOrTimeout(ulong clientID)
         /// <param name="port">The port of the host to connect to. </param>
         public void StartClient(string ipaddress, int port)
         {
-            m_Portal.OnlineMode = OnlineMode.IpHost;
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
@@ -181,7 +180,6 @@ public void StartClient(string ipaddress, int port)
 
         public async void StartClientUnityRelayModeAsync(string joinCode, Action<string> onFailure)
         {
-            m_Portal.OnlineMode = OnlineMode.UnityRelay;
             var utp = (UnityTransport)NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = utp;
 

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

@@ -88,8 +88,6 @@ public class GameNetPortal : MonoBehaviour
         private LocalLobby m_LocalLobby;
         private LobbyServiceFacade m_LobbyServiceFacade;
 
-        public OnlineMode OnlineMode { get; set; }
-
         [Inject]
         private void InjectDependencies(LocalLobby localLobby, LobbyServiceFacade lobbyServiceFacade)
         {
@@ -169,7 +167,6 @@ private void OnNetworkReady()
         /// <param name="port">The port to connect to. </param>
         public void StartHost(string ipaddress, int port)
         {
-            OnlineMode = OnlineMode.IpHost;
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
@@ -192,7 +189,6 @@ public void StartHost(string ipaddress, int port)
 
         public async void StartUnityRelayHost()
         {
-            OnlineMode = OnlineMode.UnityRelay;
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
@@ -253,24 +249,7 @@ public void RequestDisconnect()
 
         public string GetPlayerId()
         {
-            var playerId = "";
-            if (AuthenticationService.Instance.IsSignedIn)
-            {
-                playerId = AuthenticationService.Instance.PlayerId;
-            }
-            else if (OnlineMode == OnlineMode.IpHost)
-            {
-                playerId = ClientPrefs.GetGuid() + ProfileManager.Profile;
-            }
-            else if (OnlineMode == OnlineMode.UnityRelay)
-            {
-                Debug.LogError("OnlineMode set to UnityRelay, but not signed in through AuthenticationService.");
-            }
-            else
-            {
-                Debug.LogError($"OnlineMode not set to a valid value: {OnlineMode}");
-            }
-            return playerId;
+            return AuthenticationService.Instance.IsSignedIn ? AuthenticationService.Instance.PlayerId : ClientPrefs.GetGuid() + ProfileManager.Profile;
         }
     }
 }