rename option to resolveUnhandledClientError

Author: mtrezza

README.md

@@ -163,8 +163,8 @@ android: {
 
 Occasionally, errors within the Firebase Cloud Messaging (FCM) client may not be managed internally and are instead passed to the Parse Server Push Adapter. These errors can occur, for instance, due to unhandled FCM server connection issues.
 
-- `fcmResolveUnhandledClientError: true`: Logs the error and gracefully resolves it, ensuring that push sending does not result in a failure.
-- `fcmResolveUnhandledClientError: false`: Causes push sending to fail, returning a `Parse.Error.OTHER_CAUSE` with error details that can be parsed to handle it accordingly. This is the default.
+- `resolveUnhandledClientError: true`: Logs the error and gracefully resolves it, ensuring that push sending does not result in a failure.
+- `resolveUnhandledClientError: false`: Causes push sending to fail, returning a `Parse.Error.OTHER_CAUSE` with error details that can be parsed to handle it accordingly. This is the default.
 
 In both cases, detailed error logs are recorded in the Parse Server logs for debugging purposes.
 

spec/FCM.spec.js

@@ -1,8 +1,8 @@
-import path from 'path';
+import { deleteApp, getApps } from 'firebase-admin/app';
 import log from 'npmlog';
-import FCM from '../src/FCM.js';
-import { getApps, deleteApp } from 'firebase-admin/app';
 import Parse from 'parse/node.js';
+import path from 'path';
+import FCM from '../src/FCM.js';
 
 let testArgs;
 
@@ -227,7 +227,7 @@ describe('FCM', () => {
   it('rejects exceptions that are unhandled by FCM client', async () => {
     const spyInfo = spyOn(log, 'info').and.callFake(() => {});
     const spyError = spyOn(log, 'error').and.callFake(() => {});
-    testArgs.fcmResolveUnhandledClientError = false;
+    testArgs.resolveUnhandledClientError = false;
     const fcm = new FCM(testArgs);
     spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
       throw new Error('test error');
@@ -246,7 +246,7 @@ describe('FCM', () => {
   it('resolves exceptions that are unhandled by FCM client', async () => {
     const spyInfo = spyOn(log, 'info').and.callFake(() => {});
     const spyError = spyOn(log, 'error').and.callFake(() => {});
-    testArgs.fcmResolveUnhandledClientError = true;
+    testArgs.resolveUnhandledClientError = true;
     const fcm = new FCM(testArgs);
     spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
       throw new Error('test error');

src/FCM.js

@@ -1,9 +1,9 @@
 'use strict';
 
-import Parse from 'parse';
-import log from 'npmlog';
-import { initializeApp, cert, getApps, getApp } from 'firebase-admin/app';
+import { cert, getApp, getApps, initializeApp } from 'firebase-admin/app';
 import { getMessaging } from 'firebase-admin/messaging';
+import log from 'npmlog';
+import Parse from 'parse';
 import { randomString } from './PushAdapterUtils.js';
 
 const LOG_PREFIX = 'parse-server-push-adapter FCM';
@@ -28,8 +28,8 @@ export default function FCM(args, pushType) {
   const fcmEnableLegacyHttpTransport = typeof args.fcmEnableLegacyHttpTransport === 'boolean'
     ? args.fcmEnableLegacyHttpTransport
     : false;
-  this.fcmResolveUnhandledClientError = typeof args.fcmResolveUnhandledClientError === 'boolean'
-    ? args.fcmResolveUnhandledClientError
+  this.resolveUnhandledClientError = typeof args.resolveUnhandledClientError === 'boolean'
+    ? args.resolveUnhandledClientError
     : false;
 
   let app;
@@ -155,7 +155,7 @@ FCM.prototype.send = function (data, devices) {
     slices.map((slice) => sendToDeviceSlice(slice, this.pushType)),
   ).catch(e => {
     log.error(LOG_PREFIX, `error sending push: ${e}`);
-    if (!this.fcmResolveUnhandledClientError && e instanceof Parse.Error && e.code === Parse.Error.OTHER_CAUSE) {
+    if (!this.resolveUnhandledClientError && e instanceof Parse.Error && e.code === Parse.Error.OTHER_CAUSE) {
       return Promise.reject(e);
     }
   });