Skip to content

Fix message id parsing #5881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2022
Merged

Fix message id parsing #5881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d2bfd5
Fix message id parsing
zwu52 Jan 11, 2022
5cff20d
Create unlucky-bottles-wait.md
zwu52 Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/unlucky-bottles-wait.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@firebase/messaging": patch
---

Fix message id parsing.
6 changes: 3 additions & 3 deletions packages/messaging/src/helpers/externalizePayload.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('externalizePayload', () => {
// eslint-disable-next-line camelcase
collapse_key: 'collapse',
// eslint-disable-next-line camelcase
fcm_message_id: 'mid'
fcmMessageId: 'mid'
};

const payload: MessagePayload = {
Expand All @@ -55,7 +55,7 @@ describe('externalizePayload', () => {
// eslint-disable-next-line camelcase
collapse_key: 'collapse',
// eslint-disable-next-line camelcase
fcm_message_id: 'mid'
fcmMessageId: 'mid'
};

const payload: MessagePayload = {
Expand Down Expand Up @@ -88,7 +88,7 @@ describe('externalizePayload', () => {
// eslint-disable-next-line camelcase
collapse_key: 'collapse',
// eslint-disable-next-line camelcase
fcm_message_id: 'mid'
fcmMessageId: 'mid'
};

const payload: MessagePayload = {
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/src/helpers/externalizePayload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function externalizePayload(
// eslint-disable-next-line camelcase
collapseKey: internalPayload.collapse_key,
// eslint-disable-next-line camelcase
messageId: internalPayload.fcm_message_id
messageId: internalPayload.fcmMessageId
} as MessagePayload;

propagateNotificationPayload(payload, internalPayload);
Expand Down
4 changes: 2 additions & 2 deletions packages/messaging/src/helpers/logToFirelog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ function createFcmEvent(
fcmEvent.project_number = internalPayload.from;
}

if (!!internalPayload.fcm_message_id) {
fcmEvent.message_id = internalPayload.fcm_message_id;
if (!!internalPayload.fcmMessageId) {
fcmEvent.message_id = internalPayload.fcmMessageId;
}

fcmEvent.instance_id = fid;
Expand Down
3 changes: 1 addition & 2 deletions packages/messaging/src/interfaces/internal-message-payload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ export interface MessagePayloadInternal {
messageType?: MessageType;
isFirebaseMessaging?: boolean;
from: string;
fcmMessageId: string;
// eslint-disable-next-line camelcase
collapse_key: string;
// eslint-disable-next-line camelcase
fcm_message_id: string;
}

export interface NotificationPayloadInternal extends NotificationOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/src/listeners/sw-listeners.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const DISPLAY_MESSAGE: MessagePayloadInternal = {
// eslint-disable-next-line camelcase
collapse_key: 'collapse',
// eslint-disable-next-line camelcase
fcm_message_id: 'mid'
fcmMessageId: 'mid'
};

describe('SwController', () => {
Expand Down