fix(demo): retry on invalid_player_ids race condition

Author: fadi-george

examples/demo/Assets/Scripts/Services/OneSignalApiService.cs

@@ -180,22 +180,66 @@ private JObject BuildBasePayload(string title, string body, string subscriptionI
                 ["contents"] = new JObject { ["en"] = body },
             };
 
+        // Retry once on `invalid_player_ids` to absorb the brief race where the
+        // subscription has been created locally but is not yet visible to the
+        // /notifications endpoint.
         private async Task<bool> PostNotification(string jsonPayload)
         {
-            var request = new UnityWebRequest("https://onesignal.com/api/v1/notifications", "POST");
-            request.uploadHandler = new UploadHandlerRaw(Encoding.UTF8.GetBytes(jsonPayload));
-            request.downloadHandler = new DownloadHandlerBuffer();
-            request.SetRequestHeader("Content-Type", "application/json");
-            request.SetRequestHeader("Accept", "application/vnd.onesignal.v1+json");
+            for (var attempt = 0; attempt < 2; attempt++)
+            {
+                var request = new UnityWebRequest(
+                    "https://onesignal.com/api/v1/notifications",
+                    "POST"
+                );
+                request.uploadHandler = new UploadHandlerRaw(Encoding.UTF8.GetBytes(jsonPayload));
+                request.downloadHandler = new DownloadHandlerBuffer();
+                request.SetRequestHeader("Content-Type", "application/json");
+                request.SetRequestHeader("Accept", "application/vnd.onesignal.v1+json");
+
+                var tcs = new TaskCompletionSource<bool>();
+                var operation = request.SendWebRequest();
+                operation.completed += _ => tcs.TrySetResult(true);
+                await tcs.Task;
+
+                if (request.result != UnityWebRequest.Result.Success)
+                {
+                    request.Dispose();
+                    return false;
+                }
 
-            var tcs = new TaskCompletionSource<bool>();
-            var operation = request.SendWebRequest();
-            operation.completed += _ => tcs.TrySetResult(true);
-            await tcs.Task;
+                var responseText = request.downloadHandler.text;
+                request.Dispose();
 
-            bool success = request.result == UnityWebRequest.Result.Success;
-            request.Dispose();
-            return success;
+                if (HasInvalidPlayerIds(responseText))
+                {
+                    if (attempt == 0)
+                    {
+                        await Task.Delay(3000);
+                        continue;
+                    }
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private static bool HasInvalidPlayerIds(string responseJson)
+        {
+            if (string.IsNullOrWhiteSpace(responseJson))
+                return false;
+            try
+            {
+                var parsed = JObject.Parse(responseJson);
+                var invalidIds = parsed["errors"]?["invalid_player_ids"] as JArray;
+                return invalidIds != null && invalidIds.Count > 0;
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }

examples/demo/Assets/Scripts/UI/Sections/PushSectionController.cs

@@ -35,7 +35,7 @@ private VisualElement BuildSection()
 
             var pushIdRow = SectionBuilder.CreateInlineKeyValue(
                 "Push ID",
-                _viewModel.PushSubscriptionId ?? "\u2013",
+                _viewModel.PushSubscriptionId ?? "—",
                 "push_id"
             );
             _pushIdLabel = pushIdRow.Q<Label>("push_id_value");
@@ -71,7 +71,7 @@ private VisualElement BuildSection()
 
         public void Refresh()
         {
-            _pushIdLabel.text = _viewModel.PushSubscriptionId ?? "\u2013";
+            _pushIdLabel.text = _viewModel.PushSubscriptionId ?? "—";
             _enabledToggle.SetValueWithoutNotify(_viewModel.PushOptedIn);
             _enabledToggle.SetEnabled(_viewModel.HasPermission);
             _promptButton.style.display = _viewModel.HasPermission

examples/demo/Assets/Scripts/UI/Sections/UserSectionController.cs

@@ -43,7 +43,7 @@ private VisualElement BuildSection()
 
             var extIdRow = SectionBuilder.CreateInlineKeyValue(
                 "External ID",
-                _viewModel.IsLoggedIn ? _viewModel.ExternalUserId : "\u2013",
+                _viewModel.IsLoggedIn ? _viewModel.ExternalUserId : "\u2014",
                 "user_external_id"
             );
             _externalIdValue = extIdRow.Q<Label>("user_external_id_value");
@@ -75,7 +75,7 @@ public void Refresh()
             _statusValue.text = _viewModel.IsLoggedIn ? "Logged In" : "Anonymous";
             _statusValue.EnableInClassList("status-value-green", _viewModel.IsLoggedIn);
 
-            _externalIdValue.text = _viewModel.IsLoggedIn ? _viewModel.ExternalUserId : "\u2013";
+            _externalIdValue.text = _viewModel.IsLoggedIn ? _viewModel.ExternalUserId : "\u2014";
 
             _loginButton.text = _viewModel.IsLoggedIn ? "SWITCH USER" : "LOGIN USER";
             _logoutButton.style.display = _viewModel.IsLoggedIn

examples/demo/Assets/Scripts/ViewModels/AppViewModel.cs

@@ -98,7 +98,7 @@ public void Init(PreferencesService prefs, OneSignalApiService apiService)
         }
 
         private static string MaskValue(string value) =>
-            string.IsNullOrEmpty(value) ? value : new string('\u2022', value.Length);
+            IsE2EMode && value != "—" ? new string('\u2022', value.Length) : value;
 
         private void OnDestroy()
         {
@@ -113,15 +113,15 @@ private void OnDestroy()
         public void LoadInitialState()
         {
             var rawAppId = _apiService?.GetAppId() ?? "";
-            _appId = IsE2EMode ? MaskValue(rawAppId) : rawAppId;
+            _appId = MaskValue(rawAppId);
             _consentRequired = _prefs.ConsentRequired;
             _privacyConsentGiven = _prefs.PrivacyConsent;
             _inAppMessagesPaused = _prefs.IamPaused;
             _locationShared = _prefs.LocationShared;
             _externalUserId = _prefs.ExternalUserId;
 
             var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-            _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+            _pushSubscriptionId = MaskValue(rawPushId);
             _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
             _hasPermission = OneSignal.Notifications.Permission;
 
@@ -583,7 +583,7 @@ public async Task FetchUserDataFromApi()
                 }
 
                 var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-                _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+                _pushSubscriptionId = MaskValue(rawPushId);
                 _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
                 _hasPermission = OneSignal.Notifications.Permission;
 
@@ -652,7 +652,7 @@ private static void MergeUnique(List<string> target, IEnumerable<string> source)
         private void OnPushSubscriptionChanged(object sender, PushSubscriptionChangedEventArgs e)
         {
             var rawPushId = OneSignal.User.PushSubscription.Id ?? "";
-            _pushSubscriptionId = IsE2EMode ? MaskValue(rawPushId) : rawPushId;
+            _pushSubscriptionId = MaskValue(rawPushId);
             _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
             Debug.Log($"[{Tag}] Push subscription changed: {rawPushId}");
             NotifyStateChanged();