adding back addition of user to local session

Author: fernando-cortez

Assets/Scripts/Gameplay/GameState/ClientMainMenuState.cs

@@ -71,7 +71,7 @@ protected override void Configure(IContainerBuilder builder)
             builder.RegisterComponent(m_IPUIMediator);
         }
 
-        private async void TrySignIn()
+        async void TrySignIn()
         {
             try
             {
@@ -88,16 +88,21 @@ private async void TrySignIn()
             }
         }
 
-        private void OnAuthSignIn()
+        void OnAuthSignIn()
         {
             m_SessionButton.interactable = true;
             m_UGSSetupTooltipDetector.enabled = false;
             m_SignInSpinner.SetActive(false);
 
             Debug.Log($"Signed in. Unity Player ID {AuthenticationService.Instance.PlayerId}");
+            
+            m_LocalUser.ID = AuthenticationService.Instance.PlayerId;
+            
+            // The local LobbyUser object will be hooked into UI before the LocalSession is populated during session join, so the LocalSession must know about it already when that happens.
+            m_LocalSession.AddUser(m_LocalUser);
         }
 
-        private void OnSignInFailed()
+        void OnSignInFailed()
         {
             if (m_SessionButton)
             {
@@ -113,7 +118,11 @@ private void OnSignInFailed()
 
         protected override void OnDestroy()
         {
-            m_ProfileManager.onProfileChanged -= OnProfileChanged;
+            if (m_ProfileManager != null)
+            {
+                m_ProfileManager.onProfileChanged -= OnProfileChanged;
+            }
+
             base.OnDestroy();
         }
 

Assets/Scripts/UnityServices/Sessions/LocalSession.cs

@@ -213,9 +213,10 @@ public void ApplyRemoteData(ISession session)
             CopyDataFrom(info, localSessionUsers);
         }
 
-        public void Reset()
+        public void Reset(LocalSessionUser localUser)
         {
             CopyDataFrom(new SessionData(), new Dictionary<string, LocalSessionUser>());
+            AddUser(localUser);
         }
     }
 }

Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Unity.BossRoom.Infrastructure;
-using Unity.Services.Authentication;
 using Unity.Services.Multiplayer;
 using UnityEngine;
 using VContainer;
@@ -168,27 +167,27 @@ public void EndTracking()
         }
 
         /// <summary>
-        /// Attempt to join an existing session by name.
+        /// Attempt to join an existing session by ID.
         /// </summary>
-        public async Task<(bool Success, ISession Session)> TryJoinSessionByNameAsync(string sessionName)
+        public async Task<(bool Success, ISession Session)> TryJoinSessionByIdAsync(string sessionId)
         {
             if (!m_RateLimitJoin.CanCall)
             {
                 Debug.LogWarning("Join Session hit the rate limit.");
                 return (false, null);
             }
 
-            if (string.IsNullOrEmpty(sessionName))
+            if (string.IsNullOrEmpty(sessionId))
             {
-                Debug.LogWarning("Cannot join a Session without a session name.");
+                Debug.LogWarning("Cannot join a Session without a session ID.");
                 return (false, null);
             }
 
-            Debug.Log($"Joining session with name {sessionName}");
+            Debug.Log($"Joining session with ID {sessionId}");
 
             try
             {
-                var session = await m_MultiplayerServicesInterface.JoinSessionById(sessionName, m_LocalUser.GetDataForUnityServices());
+                var session = await m_MultiplayerServicesInterface.JoinSessionById(sessionId, m_LocalUser.GetDataForUnityServices());
                 return (true, session);
             }
             catch (Exception e)
@@ -227,7 +226,7 @@ void ResetSession()
         {
             CurrentUnitySession = null;
             m_LocalUser?.ResetState();
-            m_LocalSession?.Reset();
+            m_LocalSession?.Reset(m_LocalUser);
 
             // no need to disconnect Netcode, it should already be handled by Netcode's callback to disconnect
         }