Polishing

Author: zwu52

.changeset/strange-crabs-tell.md

@@ -5,6 +5,6 @@
 ---
 
 Add `getToken(options:{serviceWorkerRegistration, vapidKey})`,`onBackgroundMessage`.
-Deprecate `setBackgroundHandler`, `onTokenRefresh`, `useVapidKey`, `useServiceWorker`, `getToken`.
+Deprecate `setBackgroundMessageHandler`, `onTokenRefresh`, `useVapidKey`, `useServiceWorker`, `getToken`.
 
 Add Typing `MessagePayload`, `NotificationPayload`, `FcmOptions`.

packages/installations/package.json

@@ -44,8 +44,6 @@
     "@firebase/app-types": "0.x"
   },
   "dependencies": {
-    "@firebase/app": "^0.6.7",
-    "@firebase/component": "0.1.15",
     "@firebase/installations-types": "0.3.4",
     "@firebase/util": "0.2.50",
     "@firebase/component": "0.1.16",

packages/messaging/package.json

@@ -32,7 +32,7 @@
     "@firebase/util": "0.2.50",
     "@firebase/component": "0.1.16",
     "idb": "3.0.2",
-    "tslib": "1.11.1"
+    "tslib": "^1.11.1"
   },
   "devDependencies": {
     "rollup": "2.21.0",

packages/messaging/src/controllers/sw-controller.test.ts

@@ -288,7 +288,7 @@ describe('SwController', () => {
       const bgMessageHandlerSpy = spy();
       const showNotificationSpy = spy(self.registration, 'showNotification');
 
-      swController.setBackgroundMessageHandler(bgMessageHandlerSpy);
+      swController.onBackgroundMessage(bgMessageHandlerSpy);
 
       await callEventListener(
         makeEvent('push', {

packages/messaging/src/controllers/sw-controller.ts

@@ -86,6 +86,8 @@ export class SwController implements FirebaseMessaging, FirebaseService {
    * must be shown. The callback will be given the data from the push message.
    */
   setBackgroundMessageHandler(callback: BgMessageHandler): void {
+    this.isOnBackgroundMessageUsed = false;
+
     if (!callback || typeof callback !== 'function') {
       throw ERROR_FACTORY.create(ErrorCode.INVALID_BG_HANDLER);
     }
@@ -173,7 +175,7 @@ export class SwController implements FirebaseMessaging, FirebaseService {
     if (!internalPayload) {
       console.debug(
         TAG +
-          'failed to get parse MessagePayload from the PushEvent. Skip handling the push.'
+          'failed to get parsed MessagePayload from the PushEvent. Skip handling the push.'
       );
       return;
     }
@@ -191,6 +193,8 @@ export class SwController implements FirebaseMessaging, FirebaseService {
       isNotificationShown = true;
     }
 
+    // MessagePayload is only passed to `onBackgroundMessage`. Skip passing MessagePayload for
+    // the legacy `setBackgroundMessageHandler` to preserve the SDK behaviors.
     if (
       isNotificationShown === true &&
       this.isOnBackgroundMessageUsed === false

packages/messaging/src/controllers/window-controller.ts

@@ -120,15 +120,9 @@ export class WindowController implements FirebaseMessaging, FirebaseService {
   }
 
   async updateVapidKey(vapidKey?: string | undefined): Promise<void> {
-    if (!!this.vapidKey && !!vapidKey && this.vapidKey !== vapidKey) {
+    if (!!vapidKey) {
       this.vapidKey = vapidKey;
-    }
-
-    if (!this.vapidKey && !!vapidKey) {
-      this.vapidKey = vapidKey;
-    }
-
-    if (!this.vapidKey && !vapidKey) {
+    } else if (!this.vapidKey) {
       this.vapidKey = DEFAULT_VAPID_KEY;
     }
   }