com.beamable 5.1.0 → 5.1.1-PREVIEW.RC1

package/Editor/Modules/Content/ContentValidationPropertyDrawer.cs

@@ -62,6 +62,61 @@ namespace Beamable.Editor.Content
 			return baseHeight + EditorGUIUtility.singleLineHeight * newlineCount;
 		}
 
+		/// <summary>
+		/// For <see cref="string"/> fields (including <c>List&lt;string&gt;</c> elements) decorated with
+		/// <see cref="MustReferenceContent"/>, draws an editable text field with a dropdown button that opens a
+		/// searchable list of valid content ids. Returns <c>false</c> for anything else so the caller falls back
+		/// to the default property field.
+		/// </summary>
+		private bool TryDrawContentDropdown(Rect position, SerializedProperty property, GUIContent label)
+		{
+			if (property.propertyType != SerializedPropertyType.String)
+			{
+				return false;
+			}
+
+			// Catches MustReferenceContent and its MustBe* subclasses, which preset AllowedTypes.
+			var mustReference = fieldInfo.GetCustomAttribute<MustReferenceContent>();
+			if (mustReference == null)
+			{
+				return false;
+			}
+
+			var lineHeight = EditorGUIUtility.singleLineHeight;
+			var labelRect = new Rect(position.x, position.y, EditorGUIUtility.labelWidth, lineHeight);
+			var fieldX = position.x + EditorGUIUtility.labelWidth;
+			var fieldWidth = position.width - EditorGUIUtility.labelWidth;
+			const float buttonWidth = 22f;
+			var textRect = new Rect(fieldX, position.y, Mathf.Max(0, fieldWidth - buttonWidth), lineHeight);
+			var buttonRect = new Rect(fieldX + textRect.width, position.y, buttonWidth, lineHeight);
+
+			EditorGUI.PrefixLabel(labelRect, label);
+
+			EditorGUI.BeginChangeCheck();
+			var newValue = EditorGUI.DelayedTextField(textRect, property.stringValue);
+			if (EditorGUI.EndChangeCheck())
+			{
+				property.stringValue = newValue;
+				property.serializedObject.ApplyModifiedProperties();
+			}
+
+			if (EditorGUI.DropdownButton(buttonRect, new GUIContent(string.Empty, label.tooltip), FocusType.Keyboard, EditorStyles.popup))
+			{
+				var wnd = ScriptableObject.CreateInstance<ContentStringSearchWindow>();
+				wnd.Property = property;
+				wnd.Object = property.serializedObject.targetObject;
+				wnd.AllowedTypes = mustReference.AllowedTypes;
+				wnd.AllowNull = mustReference.AllowNull;
+				wnd.Init();
+
+				var xy = EditorGUIUtility.GUIToScreenPoint(new Vector2(textRect.x, textRect.y));
+				wnd.ShowAsDropDown(new Rect((int)xy.x, (int)xy.y + (int)lineHeight, 0, 0),
+				   new Vector2(fieldWidth, 300));
+			}
+
+			return true;
+		}
+
 		protected bool TryGetArrayIndex(SerializedProperty property, out int arrayIndex)
 		{
 			arrayIndex = 0;
@@ -140,7 +195,10 @@ namespace Beamable.Editor.Content
 				}
 			}
 
-			RefEditorGUI.DefaultPropertyField(position, property, label);
+			if (!TryDrawContentDropdown(position, property, label))
+			{
+				RefEditorGUI.DefaultPropertyField(position, property, label);
+			}
 
 			if (exceptions.Count > 0)
 			{

package/Runtime/Core/Platform/SDK/AccessTokenStorage.cs

@@ -84,7 +84,7 @@ namespace Beamable.Api
 		{
 			if (_prefix.StartsWith("editor."))
 			{
-				SaveTokenForCustomer(cid, token); // if this token looks like an editor token, then we should should also save it as customer scoped, otherwise, the save action won't apply to the right data. 
+				SaveTokenForCustomer(cid, token); // if this token looks like an editor token, then we should should also save it as customer scoped, otherwise, the save action won't apply to the right data.
 			}
 			AliasHelper.ValidateCid(cid);
 			PlayerPrefs.SetString($"{_prefix}{cid}.{pid}.access_token", token.Token);

package/Runtime/Environment/Resources/env-default.json

@@ -1,9 +1,9 @@
-{
-    "environment": "prod",
+{
+    "environment": "staging",
     "apiUrl": "https://api.beamable.com",
     "portalUrl": "https://portal.beamable.com",
     "beamMongoExpressUrl": "https://storage.beamable.com",
     "dockerRegistryUrl": "https://microservices.beamable.com/v2/",
     "isUnityVsp": "false",
-    "sdkVersion": "5.1.0"
+    "sdkVersion": "5.1.1-PREVIEW.RC1"
 }

package/Runtime/Environment/Resources/versions-default.json

@@ -1,3 +1,3 @@
 {
-     "nugetPackageVersion": "7.2.0"
+  "nugetPackageVersion": "7.2.1-PREVIEW.RC1"
 }

package/Runtime/Player/PlayerAccounts.cs

@@ -1,5 +1,6 @@
 using Beamable.AccountManagement;
 using Beamable.Api;
+using Beamable.Api.Analytics;
 using Beamable.Api.Auth;
 using Beamable.Api.Caches;
 using Beamable.Api.Sessions;
@@ -1050,6 +1051,7 @@ namespace Beamable.Player
 		private readonly IBeamableRequester _requester;
 		private readonly IStatsApi _stats;
 		private readonly Api.Autogenerated.Stats.IStatsApi _statsApi;
+		private readonly HashSet<int> _reportedRememberedTokenFailures = new HashSet<int>();
 		internal readonly IDependencyProvider _provider;
 
 
@@ -2013,6 +2015,190 @@ namespace Beamable.Player
 				AccountManagementConfiguration.Instance.AvatarStat);
 		}
 
+		private class RefreshedAccount
+		{
+			public User user;
+			public TokenResponse token;
+			public UserExtensions.StatCollection stats;
+		}
+
+		private class RememberedAccountRefreshResult
+		{
+			public RefreshedAccount account;
+			public TokenResponse token;
+			public TokenResponse tokenToRemove;
+			public string reason;
+			public string action;
+			public string stage;
+			public long status;
+			public Exception exception;
+		}
+
+		private static bool IsTerminalRememberedTokenError(Exception ex)
+		{
+			if (!(ex is PlatformRequesterException platformRequesterException)) return false;
+			var error = platformRequesterException.Error?.error ?? platformRequesterException.RequestError?.error;
+
+			return error switch
+			{
+				"UnknownTokenError" or "InvalidTokenError" or "TokenValidationError"
+					or "RefreshAccessTokenError" => true,
+				_ => false
+			};
+		}
+
+		private static bool IsDuplicateOfCurrentToken(TokenResponse rememberedToken, AccessToken currentToken)
+		{
+			return rememberedToken != null &&
+			       currentToken != null &&
+			       !string.IsNullOrEmpty(rememberedToken.refresh_token) &&
+			       rememberedToken.refresh_token == currentToken.RefreshToken;
+		}
+
+		private static bool IsMalformedRememberedToken(TokenResponse token)
+		{
+			return token == null ||
+			       string.IsNullOrEmpty(token.access_token) ||
+			       string.IsNullOrEmpty(token.refresh_token);
+		}
+
+		private static TokenResponse ToTokenResponse(AccessToken currentToken)
+		{
+			return new TokenResponse
+			{
+				access_token = currentToken.Token,
+				refresh_token = currentToken.RefreshToken
+			};
+		}
+
+		private static UserExtensions.StatCollection CreateEmptyStats()
+		{
+			return new UserExtensions.StatCollection();
+		}
+
+		private static string GetRememberedTokenFailureReason(Exception ex)
+		{
+			if (ex is PlatformRequesterException platformRequesterException)
+			{
+				return platformRequesterException.Error?.error
+				       ?? platformRequesterException.RequestError?.error
+				       ?? ex.GetType().Name;
+			}
+
+			return ex.GetType().Name;
+		}
+
+		private static long GetRememberedTokenFailureStatus(Exception ex)
+		{
+			return ex is PlatformRequesterException platformRequesterException
+				? platformRequesterException.Status
+				: 0;
+		}
+
+		private static int GetRememberedTokenDiagnosticKey(TokenResponse token)
+		{
+			unchecked
+			{
+				return ((token?.access_token?.GetHashCode() ?? 0) * 397)
+				       ^ (token?.refresh_token?.GetHashCode() ?? 0);
+			}
+		}
+
+		private static CoreEvent CreateRememberedTokenFailureEvent(long playerId, TokenResponse token,
+			string reason, string action, string stage, long status)
+		{
+			var eventParams = new Dictionary<string, object>
+			{
+				["player-id"] = playerId,
+				["reason"] = reason,
+				["action"] = action,
+				["stage"] = stage,
+				["access-token-last-4"] = TokenEvent.Last4(token?.access_token),
+				["refresh-token-last-4"] = TokenEvent.Last4(token?.refresh_token)
+			};
+			if (status > 0)
+			{
+				eventParams["status"] = status;
+			}
+
+			return new CoreEvent("user-tokens", "remembered_token_failure", eventParams);
+		}
+
+		private void ReportRememberedTokenFailure(RememberedAccountRefreshResult result)
+		{
+			if (result == null || string.IsNullOrEmpty(result.reason)) return;
+			if (!_reportedRememberedTokenFailures.Add(GetRememberedTokenDiagnosticKey(result.token))) return;
+
+			try
+			{
+				var status = result.status > 0 ? $" status=[{result.status}]" : "";
+				BeamableLogger.LogWarning(
+					$"[Beamable.Accounts.RememberedToken] reason=[{result.reason}] action=[{result.action}] stage=[{result.stage}]{status} " +
+					$"cid=[{_ctx.Cid}] pid=[{_ctx.Pid}] access-token-last-4=[{TokenEvent.Last4(result.token?.access_token)}] " +
+					$"refresh-token-last-4=[{TokenEvent.Last4(result.token?.refresh_token)}]");
+
+				var settings = _provider.GetService<ITokenEventSettings>();
+				if (!settings.EnableTokenAnalytics) return;
+
+				var analytics = _provider.GetService<IAnalyticsTracker>();
+				analytics.TrackEvent(
+					CreateRememberedTokenFailureEvent(
+						_ctx.PlayerId,
+						result.token,
+						result.reason,
+						result.action,
+						result.stage,
+						result.status),
+					true);
+			}
+			catch
+			{
+				// Diagnostics must never prevent Accounts from becoming ready.
+			}
+		}
+
+		private async Promise<RememberedAccountRefreshResult> TryRefreshRememberedAccount(TokenResponse token)
+		{
+			try
+			{
+				var user = await _authService.GetUser(token);
+				UserExtensions.StatCollection statValues;
+
+				try
+				{
+					statValues = await GetStatsForUser(user);
+				}
+				catch
+				{
+					statValues = CreateEmptyStats();
+				}
+
+				return new RememberedAccountRefreshResult
+				{
+					account = new RefreshedAccount
+					{
+						user = user,
+						token = token,
+						stats = statValues
+					}
+				};
+			}
+			catch (Exception ex)
+			{
+				var terminal = IsTerminalRememberedTokenError(ex);
+				return new RememberedAccountRefreshResult
+				{
+					token = token,
+					tokenToRemove = terminal ? token : null,
+					reason = GetRememberedTokenFailureReason(ex),
+					action = terminal ? "removed" : "retained",
+					stage = "get-user",
+					status = GetRememberedTokenFailureStatus(ex),
+					exception = ex
+				};
+			}
+		}
+
 		protected override async Promise PerformRefresh()
 		{
 			await _ctx.OnReady;
@@ -2028,33 +2214,89 @@ namespace Beamable.Player
 
 			var deviceTokens = _storage.RetrieveDeviceRefreshTokens(_ctx.Cid, _ctx.Pid);
 			var currToken = _storage.LoadTokenForRealmImmediate(_ctx.Cid, _ctx.Pid);
-			var tokens = new TokenResponse[deviceTokens.Length + 1];
+
+			if (currToken == null)
+			{
+				throw new Exception(
+					$"Cannot refresh player accounts because no current token exists for cid=[{_ctx.Cid}] pid=[{_ctx.Pid}].");
+			}
+
+			if (string.IsNullOrEmpty(currToken.Token) || string.IsNullOrEmpty(currToken.RefreshToken))
+			{
+				throw new Exception(
+					$"Cannot refresh player accounts because the current token is incomplete for cid=[{_ctx.Cid}] pid=[{_ctx.Pid}].");
+			}
+
+			var refreshedAccounts = new List<RefreshedAccount>();
+			var currentTokenResponse = ToTokenResponse(currToken);
+			var currentUser = await _authService.GetUser(currentTokenResponse);
+			var currentStats = await GetStatsForUser(currentUser);
+
+			refreshedAccounts.Add(new RefreshedAccount
+			{
+				user = currentUser,
+				token = currentTokenResponse,
+				stats = currentStats
+			});
+
+			var rememberedAccountPromises = new List<Promise<RememberedAccountRefreshResult>>();
+			var rememberedAccountResults = new List<RememberedAccountRefreshResult>();
+
 			for (var i = 0; i < deviceTokens.Length; i++)
 			{
-				tokens[i] = deviceTokens[i];
+				var token = deviceTokens[i];
+				if (token == null) continue;
+				if (IsDuplicateOfCurrentToken(token, currToken)) continue;
+
+				if (IsMalformedRememberedToken(token))
+				{
+					rememberedAccountResults.Add(new RememberedAccountRefreshResult
+					{
+						token = token,
+						reason = "MalformedToken",
+						action = "retained",
+						stage = "storage-validation"
+					});
+					continue;
+				}
+
+				rememberedAccountPromises.Add(TryRefreshRememberedAccount(token));
 			}
-			tokens[deviceTokens.Length] = new TokenResponse { access_token = currToken.Token, refresh_token = currToken.RefreshToken, };
 
-			var userPromises = new Promise<User>[tokens.Length];
-			var statPromises = new Promise<UserExtensions.StatCollection>[tokens.Length];
-			for (var i = 0; i < userPromises.Length; i++)
+			rememberedAccountResults.AddRange(await Promise.Sequence(rememberedAccountPromises));
+			var removedRememberedToken = false;
+
+			for (var i = 0; i < rememberedAccountResults.Count; i++)
 			{
-				userPromises[i] = _authService.GetUser(tokens[i]);
-				statPromises[i] = userPromises[i].FlatMap(GetStatsForUser);
+				var result = rememberedAccountResults[i];
+				ReportRememberedTokenFailure(result);
+
+				if (result.account != null)
+				{
+					refreshedAccounts.Add(result.account);
+				}
+
+				if (result.tokenToRemove != null)
+				{
+					_storage.RemoveDeviceRefreshToken(_ctx.Cid, _ctx.Pid, result.tokenToRemove);
+					removedRememberedToken = true;
+				}
+			}
+
+			if (removedRememberedToken)
+			{
+				PlayerPrefs.Save();
 			}
-			var users = await Promise.Sequence(userPromises);
-			var stats = await Promise.Sequence(statPromises);
 
-			for (var i = 0; i < userPromises.Length; i++)
+			for (var i = 0; i < refreshedAccounts.Count; i++)
 			{
-				var user = users[i];
+				var refreshed = refreshedAccounts[i];
+				var user = refreshed.user;
 				if (seen.Contains(user.id)) continue;
 				seen.Add(user.id);
 
-				var statValues = stats[i];
-				var token = tokens[i];
-
-
+				var statValues = refreshed.stats;
+				var token = refreshed.token;
 
 				if (gamerTagToAccount.TryGetValue(user.id, out var existing))
 				{

package/Tests/Runtime/Beamable/Platform/AccessTokenStorageTests.cs

@@ -1,8 +1,12 @@
 using Beamable.Api;
+using Beamable.Api.Analytics;
 using Beamable.Common.Api.Auth;
+using Beamable.Player;
+using Beamable.Serialization;
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using UnityEngine;
 
 namespace Beamable.Platform.Tests
@@ -150,5 +154,55 @@ namespace Beamable.Platform.Tests
 			var value = PlayerPrefs.GetString(DeviceTokensKey);
 			Assert.AreEqual("token1|test1,token2|test2,token3|test3", value);
 		}
+
+		[Test]
+		public void DoesNotRemove_MalformedTokenWithoutRefreshToken()
+		{
+			PlayerPrefs.SetString(DeviceTokensKey, "token1|test1,bad_access_token,token3|test3");
+			_storage.RemoveDeviceRefreshToken(_cid, _pid, new TokenResponse
+			{
+				access_token = "bad_access_token",
+				refresh_token = ""
+			});
+			var value = PlayerPrefs.GetString(DeviceTokensKey);
+			Assert.AreEqual("token1|test1,bad_access_token,token3|test3", value);
+		}
+	}
+
+	public class RememberedTokenDiagnosticTests
+	{
+		[Test]
+		public void RememberedTokenFailure_OnlySerializesTokenSuffixes()
+		{
+			var method = typeof(PlayerAccounts).GetMethod(
+				"CreateRememberedTokenFailureEvent",
+				BindingFlags.Static | BindingFlags.NonPublic);
+
+			Assert.NotNull(method);
+			var tokenEvent = (CoreEvent)method.Invoke(null, new object[]
+			{
+				123L,
+				new TokenResponse
+				{
+					access_token = "access-token-secret-1234",
+					refresh_token = "refresh-token-secret-5678"
+				},
+				"InvalidTokenError",
+				"removed",
+				"get-user",
+				401L
+			});
+			var json = JsonSerializable.ToJson(tokenEvent);
+
+			StringAssert.Contains("remembered_token_failure", json);
+			StringAssert.Contains("InvalidTokenError", json);
+			StringAssert.Contains("removed", json);
+			StringAssert.Contains("get-user", json);
+			StringAssert.Contains("401", json);
+			StringAssert.Contains("1234", json);
+			StringAssert.Contains("5678", json);
+			StringAssert.DoesNotContain("access-token-secret", json);
+			StringAssert.DoesNotContain("refresh-token-secret", json);
+		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.beamable",
-  "version": "5.1.0",
+  "version": "5.1.1-PREVIEW.RC1",
   "displayName": "Beamable",
   "description": "A better way to build games in Unity\n",
   "unity": "2021.3",