fix: Set the first ulid being used each play session as the default for

requests

Author: kirre-bylund

Runtime/Client/LootLockerStateData.cs

@@ -195,6 +195,9 @@ public static LootLockerPlayerData GetStateForPlayerOrDefaultStateOrEmpty(string
             }
             string playerULIDToGetDataFor = string.IsNullOrEmpty(playerULID) ? ActiveMetaData.DefaultPlayer : playerULID;
 
+            // Make this player the default for requests if there is no default yet or if the current default is not currently active
+            bool shouldBeMadeDefault = ActivePlayerData.Count == 0 && !playerULIDToGetDataFor.Equals(ActiveMetaData.DefaultPlayer, StringComparison.OrdinalIgnoreCase);
+
             if (ActivePlayerData.TryGetValue(playerULIDToGetDataFor, out var data))
             {
                 return data;
@@ -204,6 +207,10 @@ public static LootLockerPlayerData GetStateForPlayerOrDefaultStateOrEmpty(string
             {
                 if (ActivePlayerData.TryGetValue(playerULIDToGetDataFor, out var data2))
                 {
+                    if (shouldBeMadeDefault)
+                    {
+                        SetDefaultPlayerULID(data2.ULID);
+                    }
                     return data2;
                 }
             }
@@ -264,7 +271,7 @@ public static bool SetPlayerData(LootLockerPlayerData updatedPlayerData)
             {
                 ActiveMetaData.WhiteLabelEmailToPlayerUlidMap[updatedPlayerData.WhiteLabelEmail] = updatedPlayerData.ULID;
             }
-            if (string.IsNullOrEmpty(ActiveMetaData.DefaultPlayer))
+            if (string.IsNullOrEmpty(ActiveMetaData.DefaultPlayer) || !ActivePlayerData.ContainsKey(ActiveMetaData.DefaultPlayer))
             {
                 SetDefaultPlayerULID(updatedPlayerData.ULID);
             }

Tests/LootLockerTests/PlayMode/MultiUserTests.cs

@@ -806,7 +806,7 @@ public IEnumerator MultiUser_SetPlayerDataWhenPlayerCachesExistButNoPlayersAreAc
 
             // When
             bool loginCompleted = false;
-            LootLockerSDKManager.StartGuestSession(response =>
+            LootLockerSDKManager.StartGuestSession("completely-novel-identifier", response =>
             {
                 ulids.Add(response.player_ulid);
                 loginCompleted = true;
@@ -826,6 +826,55 @@ public IEnumerator MultiUser_SetPlayerDataWhenPlayerCachesExistButNoPlayersAreAc
 
             yield return null;
         }
+        
+        [UnityTest, Category("LootLocker"), Category("LootLockerCI"), Category("LootLockerCIFast")]
+        public IEnumerator MultiUser_GetPlayerDataWhenPlayerCachesExistButNoPlayersAreActive_GetsPlayerAndSetsDefault()
+        {
+            // Setup Succeeded
+            Assert.IsFalse(SetupFailed, "Setup did not succeed");
+
+            // Given
+            List<string> ulids = new List<string>();
+            int guestUsersToCreate = 3;
+            for (int i = 0; i < guestUsersToCreate; i++)
+            {
+                bool guestLoginCompleted = false;
+                LootLockerSDKManager.StartGuestSession(response =>
+                {
+                    ulids.Add(response.player_ulid);
+                    guestLoginCompleted = true;
+                });
+                yield return new WaitUntil(() => guestLoginCompleted);
+            }
+
+            foreach (var ulid in ulids)
+            {
+                LootLockerStateData.SetPlayerULIDToInactive(ulid);
+            }
+
+            // When
+            bool pingCompleted = false;
+            string pingUlid = null;
+            LootLockerSDKManager.Ping(response =>
+            {
+                pingUlid = response.requestContext.player_ulid;
+                pingCompleted = true;
+            }, ulids[ulids.Count - 1]);
+            yield return new WaitUntil(() => pingCompleted);
+
+            // Then
+            int postPingActivePlayerCount = LootLockerStateData.GetActivePlayerULIDs().Count;
+            var postPingDefaultPlayerPlayerData = LootLockerStateData.GetStateForPlayerOrDefaultStateOrEmpty(null);
+            var postPingDefaultPlayerUlid = LootLockerStateData.GetDefaultPlayerULID();
+
+            Assert.AreEqual(1, postPingActivePlayerCount);
+            Assert.IsNotNull(postPingDefaultPlayerUlid);
+            Assert.IsNotNull(postPingDefaultPlayerPlayerData);
+            Assert.AreEqual(ulids[ulids.Count - 1], postPingDefaultPlayerUlid);
+            Assert.AreEqual(ulids[ulids.Count - 1], postPingDefaultPlayerPlayerData.ULID);
+
+            yield return null;
+        }
 
         [UnityTest, Category("LootLocker"), Category("LootLockerCI"), Category("LootLockerCIFast")]
         public IEnumerator MultiUser_GetPlayerUlidFromWLEmailWhenPlayerIsCached_ReturnsCorrectULID()