chore(demo): display OneSignal ID in push section

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: fadi-george

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

@@ -180,9 +180,14 @@ private JObject BuildBasePayload(string title, string body, string subscriptionI
                 ["contents"] = new JObject { ["en"] = body },
             };
 
-        // Retry 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.
+        // Retry while the OneSignal backend hasn't yet indexed the freshly
+        // created subscription. The /notifications endpoint reports this race
+        // in a few different shapes, all of which return HTTP 200:
+        //   {"id":"...","recipients":0}                       (user just switched, push token not yet attached)
+        //   {"id":"...","errors":{"invalid_player_ids":[...]}}
+        //   {"id":"","errors":["All included players are not subscribed"]}
+        //   {"id":"","errors":[...]}
+        // Treat any 200 response with no real id, populated errors, or recipients=0 as transient.
         private async Task<bool> PostNotification(string jsonPayload)
         {
             const int maxAttempts = 3;
@@ -212,7 +217,7 @@ private async Task<bool> PostNotification(string jsonPayload)
                 var responseText = request.downloadHandler.text;
                 request.Dispose();
 
-                if (HasInvalidPlayerIds(responseText))
+                if (IsTransientSendFailure(responseText))
                 {
                     if (attempt < maxAttempts)
                     {
@@ -228,15 +233,25 @@ private async Task<bool> PostNotification(string jsonPayload)
             return false;
         }
 
-        private static bool HasInvalidPlayerIds(string responseJson)
+        private static bool IsTransientSendFailure(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;
+                var id = parsed["id"]?.ToString();
+                var errors = parsed["errors"];
+                bool hasErrors =
+                    (errors is JArray arr && arr.Count > 0) ||
+                    (errors is JObject obj && obj.Count > 0);
+                bool missingId = string.IsNullOrEmpty(id);
+                var recipientsToken = parsed["recipients"];
+                bool zeroRecipients =
+                    recipientsToken != null
+                    && recipientsToken.Type == JTokenType.Integer
+                    && recipientsToken.Value<long>() == 0;
+                return hasErrors || missingId || zeroRecipients;
             }
             catch
             {

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

@@ -35,7 +35,7 @@ private VisualElement BuildSection()
 
             var pushIdRow = SectionBuilder.CreateInlineKeyValue(
                 "Push ID",
-                _viewModel.PushSubscriptionId ?? "—",
+                FormatIdValue(_viewModel.PushSubscriptionId),
                 "push_id"
             );
             _pushIdLabel = pushIdRow.Q<Label>("push_id_value");
@@ -71,14 +71,17 @@ private VisualElement BuildSection()
 
         public void Refresh()
         {
-            _pushIdLabel.text = _viewModel.PushSubscriptionId ?? "—";
+            _pushIdLabel.text = FormatIdValue(_viewModel.PushSubscriptionId);
             _enabledToggle.SetValueWithoutNotify(_viewModel.PushOptedIn);
             _enabledToggle.SetEnabled(_viewModel.HasPermission);
             _promptButton.style.display = _viewModel.HasPermission
                 ? DisplayStyle.None
                 : DisplayStyle.Flex;
         }
 
+        private static string FormatIdValue(string value) =>
+            string.IsNullOrEmpty(value) ? "—" : value;
+
         private void OnEnabledChanged(bool value) => _viewModel.SetPushEnabled(value);
     }
 }

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

@@ -25,6 +25,7 @@ public class AppViewModel : MonoBehaviour
         private bool _inAppMessagesPaused;
         private bool _locationShared;
         private string _externalUserId;
+        private string _oneSignalId;
         private string _pushSubscriptionId;
         private bool _pushOptedIn;
         private bool _hasPermission;
@@ -58,6 +59,7 @@ public class AppViewModel : MonoBehaviour
         public bool InAppMessagesPaused => _inAppMessagesPaused;
         public bool LocationShared => _locationShared;
         public string ExternalUserId => _externalUserId;
+        public string OneSignalId => _oneSignalId;
         public string PushSubscriptionId => _pushSubscriptionId;
         public bool PushOptedIn => _pushOptedIn;
         public bool HasPermission => _hasPermission;
@@ -118,6 +120,7 @@ public void LoadInitialState()
             _pushSubscriptionId = OneSignal.User.PushSubscription.Id ?? "";
             _pushOptedIn = OneSignal.User.PushSubscription.OptedIn;
             _hasPermission = OneSignal.Notifications.Permission;
+            _oneSignalId = OneSignal.User.OneSignalId ?? "";
 
             NotifyStateChanged();
         }
@@ -660,6 +663,8 @@ private void OnPermissionChanged(object sender, NotificationPermissionChangedEve
         private async void OnUserChanged(object sender, UserStateChangedEventArgs e)
         {
             Debug.Log($"[{Tag}] User changed, fetching data...");
+            _oneSignalId = OneSignal.User.OneSignalId ?? "";
+            NotifyStateChanged();
             await FetchUserDataFromApi();
         }
     }

examples/demo/Packages/packages-lock.json

@@ -22,14 +22,6 @@
         "com.onesignal.unity.core": "5.2.8"
       }
     },
-    "com.unity.asset-store-tools": {
-      "version": "file:com.unity.asset-store-tools",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "3.2.1"
-      }
-    },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.2.2",
       "depth": 0,