Merge branch 'develop' into fix/replace-null-coalescence-operators

Author: LPLafontaineB

Assets/Scripts/ApplicationLifecycle/ApplicationController.cs

@@ -17,15 +17,17 @@
 
 namespace Unity.BossRoom.ApplicationLifecycle
 {
-
     /// <summary>
     /// An entry point to the application, where we bind all the common dependencies to the root DI scope.
     /// </summary>
     public class ApplicationController : LifetimeScope
     {
-        [SerializeField] UpdateRunner m_UpdateRunner;
-        [SerializeField] ConnectionManager m_ConnectionManager;
-        [SerializeField] NetworkManager m_NetworkManager;
+        [SerializeField]
+        UpdateRunner m_UpdateRunner;
+        [SerializeField]
+        ConnectionManager m_ConnectionManager;
+        [SerializeField]
+        NetworkManager m_NetworkManager;
 
         LocalLobby m_LocalLobby;
         LobbyServiceFacade m_LobbyServiceFacade;
@@ -124,17 +126,21 @@ private IEnumerator LeaveBeforeQuit()
             {
                 Debug.LogError(e.Message);
             }
+
             yield return null;
             Application.Quit();
         }
 
         private bool OnWantToQuit()
         {
+            Application.wantsToQuit -= OnWantToQuit;
+
             var canQuit = m_LocalLobby != null && string.IsNullOrEmpty(m_LocalLobby.LobbyID);
             if (!canQuit)
             {
                 StartCoroutine(LeaveBeforeQuit());
             }
+
             return canQuit;
         }
 

Assets/Scripts/ConnectionManagement/ConnectionMethod.cs

@@ -66,11 +66,11 @@ protected void SetConnectionPayload(string playerId, string playerName)
             m_ConnectionManager.NetworkManager.NetworkConfig.ConnectionData = payloadBytes;
         }
 
-        /// Using authentication, this makes sure your session is associated with your account and not your device. This means you could reconnect 
-        /// from a different device for example. A playerId is also a bit more permanent than player prefs. In a browser for example, 
+        /// Using authentication, this makes sure your session is associated with your account and not your device. This means you could reconnect
+        /// from a different device for example. A playerId is also a bit more permanent than player prefs. In a browser for example,
         /// player prefs can be cleared as easily as cookies.
-        /// The forked flow here is for debug purposes and to make UGS optional in Boss Room. This way you can study the sample without 
-        /// setting up a UGS account. It's recommended to investigate your own initialization and IsSigned flows to see if you need 
+        /// The forked flow here is for debug purposes and to make UGS optional in Boss Room. This way you can study the sample without
+        /// setting up a UGS account. It's recommended to investigate your own initialization and IsSigned flows to see if you need
         /// those checks on your own and react accordingly. We offer here the option for offline access for debug purposes, but in your own game you
         /// might want to show an error popup and ask your player to connect to the internet.
         protected string GetPlayerId()
@@ -156,7 +156,7 @@ public override async Task SetupClientConnectionAsync()
                 $"host: {joinedAllocation.HostConnectionData[0]} {joinedAllocation.HostConnectionData[1]}, " +
                 $"client: {joinedAllocation.AllocationId}");
 
-            await m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(joinedAllocation.AllocationId.ToString(), m_LocalLobby.RelayJoinCode);
+            await m_LobbyServiceFacade.UpdatePlayerDataAsync(joinedAllocation.AllocationId.ToString(), m_LocalLobby.RelayJoinCode);
 
             // Configure UTP with allocation
             var utp = (UnityTransport)m_ConnectionManager.NetworkManager.NetworkConfig.NetworkTransport;
@@ -197,13 +197,15 @@ public override async Task SetupHostConnectionAsync()
 
             m_LocalLobby.RelayJoinCode = joinCode;
 
-            //next line enable lobby and relay services integration
-            await m_LobbyServiceFacade.UpdateLobbyDataAsync(m_LocalLobby.GetDataForUnityServices());
-            await m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(hostAllocation.AllocationIdBytes.ToString(), joinCode);
+            // next line enables lobby and relay services integration
+            await m_LobbyServiceFacade.UpdateLobbyDataAndUnlockAsync();
+            await m_LobbyServiceFacade.UpdatePlayerDataAsync(hostAllocation.AllocationIdBytes.ToString(), joinCode);
 
             // Setup UTP with relay connection info
             var utp = (UnityTransport)m_ConnectionManager.NetworkManager.NetworkConfig.NetworkTransport;
             utp.SetRelayServerData(new RelayServerData(hostAllocation, k_DtlsConnType)); // This is with DTLS enabled for a secure connection
+
+            Debug.Log($"Created relay allocation with join code {m_LocalLobby.RelayJoinCode}");
         }
     }
 }

Assets/Scripts/ConnectionManagement/ConnectionState/HostingState.cs

@@ -141,7 +141,7 @@ public override void ApprovalCheck(NetworkManager.ConnectionApprovalRequest requ
             response.Reason = JsonUtility.ToJson(gameReturnStatus);
             if (m_LobbyServiceFacade.CurrentUnityLobby != null)
             {
-                m_LobbyServiceFacade.RemovePlayerFromLobbyAsync(connectionPayload.playerId, m_LobbyServiceFacade.CurrentUnityLobby.Id);
+                m_LobbyServiceFacade.RemovePlayerFromLobbyAsync(connectionPayload.playerId);
             }
         }
 

Assets/Scripts/ConnectionManagement/ConnectionState/StartingHostState.cs

@@ -68,7 +68,6 @@ async void StartHost()
             try
             {
                 await m_ConnectionMethod.SetupHostConnectionAsync();
-                Debug.Log($"Created relay allocation with join code {m_LocalLobby.RelayJoinCode}");
 
                 // NGO's StartHost launches everything
                 if (!m_ConnectionManager.NetworkManager.StartHost())

Assets/Scripts/UnityServices/Lobbies/JoinedLobbyContentHeartbeat.cs

@@ -42,6 +42,7 @@ public async Task<Lobby> CreateLobby(string requesterUasId, string lobbyName, in
             CreateLobbyOptions createOptions = new CreateLobbyOptions
             {
                 IsPrivate = isPrivate,
+                IsLocked = true, // locking the lobby at creation to prevent other players from joining before it is ready
                 Player = new Player(id: requesterUasId, data: hostUserData),
                 Data = lobbyData
             };