Skip to content

API Compatibility #246

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

Closed
wants to merge 5 commits into from
Closed

API Compatibility #246

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab82ff3
API Compatibility
charles-ramos May 10, 2024
96382e3
API Compatibility
charles-ramos May 10, 2024
cef65af
API Compatibility
charles-ramos May 13, 2024
4cd588b
Merge branch 'master' into api-compatibility
charles-ramos May 15, 2024
9d297bf
Merge branch 'master' into api-compatibility
charles-ramos May 15, 2024
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
56 changes: 41 additions & 15 deletions src/FCM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,17 @@ function _GCMToFCMPayload(requestData, pushId, timeStamp) {

if (requestData.hasOwnProperty('notification')) {
androidPayload.android.notification = requestData.notification;
} else if (requestData.hasOwnProperty('data')) {
androidPayload.android.notification = {};
if (requestData.data.title) {
androidPayload.android.notification['title'] = requestData.data.title;
}
if (requestData.data.alert) {
androidPayload.android.notification['body'] = requestData.data.alert;
}
else if (requestData.data.body) {
androidPayload.android.notification['body'] = requestData.data.body;
}
}

if (requestData.hasOwnProperty('data')) {
Expand All @@ -260,28 +271,43 @@ function _GCMToFCMPayload(requestData, pushId, timeStamp) {
delete requestData.data[key]
}
}
androidPayload.android.data = {
push_id: pushId,
time: new Date(timeStamp).toISOString(),
data: JSON.stringify(requestData.data),
if (requestData.data && requestData.data.alert && typeof requestData.data.alert == 'object') {
androidPayload.android.data = {
...requestData.data,
alert: JSON.stringify(requestData.data.alert)
}
}
else {
androidPayload.android.data = requestData.data;
}
}

if (requestData['expiration_time']) {
const expirationTime = requestData['expiration_time'];
// Convert to seconds
let timeToLive = Math.floor((expirationTime - timeStamp) / 1000);
if (timeToLive < 0) {
timeToLive = 0;
}
if (timeToLive >= FCMTimeToLiveMax) {
timeToLive = FCMTimeToLiveMax;
if (requestData.data && requestData.data.alert && typeof requestData.data.alert == 'object') {
androidPayload.android.data = {
...requestData.data,
alert: JSON.stringify(requestData.data.alert)
}
}
else {
androidPayload.android.data = requestData.data;
}
}

androidPayload.android.ttl = timeToLive;
if (requestData['expiration_time']) {
const expirationTime = requestData['expiration_time'];
// Convert to seconds
let timeToLive = Math.floor((expirationTime - timeStamp) / 1000);
if (timeToLive < 0) {
timeToLive = 0;
}
if (timeToLive >= FCMTimeToLiveMax) {
timeToLive = FCMTimeToLiveMax;
}

androidPayload.android.ttl = timeToLive;
}

return androidPayload;
return androidPayload;
}

/**
Expand Down