@webority/mobile-core 0.0.28 → 0.0.29

package/lib/commonjs/push/push.js

@@ -114,7 +114,7 @@ const toStringData = data => {
   }
   return out;
 };
-const responseData = response => {
+const contentData = response => {
   const content = response.notification.request.content;
   if (content.data) {
     return toStringData(content.data);
@@ -128,6 +128,31 @@ const responseData = response => {
   }
   return {};
 };
+
+/**
+ * expo-notifications fills iOS `content.data` only from a `body` object, but our
+ * servers send raw APNs with the app's keys at the top level beside `aps`.
+ */
+const triggerData = response => {
+  const trigger = response.notification.request.trigger;
+  const extra = {
+    ...(trigger?.remoteMessage?.data ?? {})
+  };
+  for (const [key, value] of Object.entries(trigger?.payload ?? {})) {
+    // A `body` object is what expo already turned into content.data.
+    if (key === 'aps' || key === 'body' && typeof value === 'object') {
+      continue;
+    }
+    extra[key] = value;
+  }
+  return toStringData(extra);
+};
+
+/** The push's own data merged over the raw remote payload's keys, so content.data wins a conflict. */
+const responseData = response => ({
+  ...triggerData(response),
+  ...contentData(response)
+});
 const toPushAction = response => ({
   actionId: response.actionIdentifier,
   ...(response.userText ? {

package/lib/module/push/push.js

@@ -109,7 +109,7 @@ const toStringData = data => {
   }
   return out;
 };
-const responseData = response => {
+const contentData = response => {
   const content = response.notification.request.content;
   if (content.data) {
     return toStringData(content.data);
@@ -123,6 +123,31 @@ const responseData = response => {
   }
   return {};
 };
+
+/**
+ * expo-notifications fills iOS `content.data` only from a `body` object, but our
+ * servers send raw APNs with the app's keys at the top level beside `aps`.
+ */
+const triggerData = response => {
+  const trigger = response.notification.request.trigger;
+  const extra = {
+    ...(trigger?.remoteMessage?.data ?? {})
+  };
+  for (const [key, value] of Object.entries(trigger?.payload ?? {})) {
+    // A `body` object is what expo already turned into content.data.
+    if (key === 'aps' || key === 'body' && typeof value === 'object') {
+      continue;
+    }
+    extra[key] = value;
+  }
+  return toStringData(extra);
+};
+
+/** The push's own data merged over the raw remote payload's keys, so content.data wins a conflict. */
+const responseData = response => ({
+  ...triggerData(response),
+  ...contentData(response)
+});
 export const toPushAction = response => ({
   actionId: response.actionIdentifier,
   ...(response.userText ? {

package/lib/typescript/commonjs/push/push.d.ts

@@ -86,6 +86,14 @@ interface NotificationResponseLike {
                 data?: Record<string, unknown> | null;
                 dataString?: string;
             };
+            /** A remote push carries its raw payload: APNs `userInfo` on iOS, the FCM message on Android. */
+            trigger?: {
+                type?: string;
+                payload?: Record<string, unknown> | null;
+                remoteMessage?: {
+                    data?: Record<string, unknown> | null;
+                } | null;
+            } | null;
         };
     };
 }

package/lib/typescript/module/push/push.d.ts

@@ -86,6 +86,14 @@ interface NotificationResponseLike {
                 data?: Record<string, unknown> | null;
                 dataString?: string;
             };
+            /** A remote push carries its raw payload: APNs `userInfo` on iOS, the FCM message on Android. */
+            trigger?: {
+                type?: string;
+                payload?: Record<string, unknown> | null;
+                remoteMessage?: {
+                    data?: Record<string, unknown> | null;
+                } | null;
+            } | null;
         };
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webority/mobile-core",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "Platform layer for Webority React Native apps: HTTP clients, auth/token storage, config, logging, formatters, validators, network status, permissions, storage and version checks. No UI.",
   "keywords": [
     "react-native",