Exctracted GetPlayerId to GameNetPortal

Author: LPLafontaineB

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

@@ -19,7 +19,6 @@ public class ClientGameNetPortal : MonoBehaviour
         private GameNetPortal m_Portal;
 
         string m_JoinCode;
-        OnlineMode m_OnlineMode;
 
         /// <summary>
         /// If a disconnect occurred this will be populated with any contextual information that was available to explain why.
@@ -162,7 +161,7 @@ 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_OnlineMode = OnlineMode.IpHost;
+            m_Portal.OnlineMode = OnlineMode.IpHost;
             var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
 
@@ -185,7 +184,7 @@ public void StartClient(string ipaddress, int port)
 
         public void StartClientUnityRelayModeAsync(string joinCode, Action<string> onFailure)
         {
-            m_OnlineMode = OnlineMode.UnityRelay;
+            m_Portal.OnlineMode = OnlineMode.UnityRelay;
             m_JoinCode = joinCode;
             var utp = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
             NetworkManager.Singleton.NetworkConfig.NetworkTransport = utp;
@@ -197,8 +196,7 @@ public void StartClientUnityRelayModeAsync(string joinCode, Action<string> onFai
 
         async void ConnectClient(Action<string> onFailure)
         {
-            string playerId;
-            if (m_OnlineMode == OnlineMode.UnityRelay)
+            if (m_Portal.OnlineMode == OnlineMode.UnityRelay)
             {
                 try
                 {
@@ -216,16 +214,11 @@ async void ConnectClient(Action<string> onFailure)
                     return;//not re-throwing, but still not allowing to connect
                 }
 
-                playerId = AuthenticationService.Instance.PlayerId;
-            }
-            else
-            {
-                playerId = ClientPrefs.GetGuid() + ProfileManager.Profile;
             }
 
             var payload = JsonUtility.ToJson(new ConnectionPayload()
             {
-                playerId = playerId,
+                playerId = m_Portal.GetPlayerId(),
                 clientScene = SceneManager.GetActiveScene().buildIndex,
                 playerName = m_Portal.PlayerName
             });

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

@@ -5,6 +5,7 @@
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UNET;
+using Unity.Services.Authentication;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -87,6 +88,8 @@ 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)
         {
@@ -166,6 +169,7 @@ 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;
 
@@ -188,6 +192,7 @@ 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;
 
@@ -245,5 +250,19 @@ public void RequestDisconnect()
             SessionManager<SessionPlayerData>.Instance.OnUserDisconnectRequest();
             NetManager.Shutdown();
         }
+
+        public string GetPlayerId()
+        {
+            if (OnlineMode == OnlineMode.IpHost)
+            {
+                return ClientPrefs.GetGuid() + ProfileManager.Profile;
+            }
+            if (OnlineMode == OnlineMode.UnityRelay)
+            {
+                return AuthenticationService.Instance.PlayerId;
+            }
+            Debug.LogError($"OnlineMode not set to a valid value: {OnlineMode}");
+            return "";
+        }
     }
 }

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

@@ -147,7 +147,7 @@ private void ApprovalCheck(byte[] connectionData, ulong clientId, NetworkManager
             // Approval check happens for Host too, but obviously we want it to be approved
             if (clientId == NetworkManager.Singleton.LocalClientId)
             {
-                SessionManager<SessionPlayerData>.Instance.SetupConnectingPlayerSessionData(clientId, AuthenticationService.Instance.PlayerId,
+                SessionManager<SessionPlayerData>.Instance.SetupConnectingPlayerSessionData(clientId, m_Portal.GetPlayerId(),
                     new SessionPlayerData(clientId, m_Portal.PlayerName, m_Portal.AvatarRegistry.GetRandomAvatar().Guid.ToNetworkGuid(), 0, true));
 
                 connectionApprovedCallback(true, null, true, null, null);