Remove deprecated callback API

Author: mmermerkaya

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

@@ -132,37 +132,18 @@ export class WindowController extends ControllerInterface {
    * @return Resolves if the permission was granted, otherwise rejects
    */
   async requestPermission(): Promise<void> {
-    if (
-      // TODO: Remove the cast when this issue is fixed:
-      // https://github.com/Microsoft/TypeScript/issues/14701
-      // tslint:disable-next-line no-any
-      ((Notification as any).permission as NotificationPermission) === 'granted'
-    ) {
+    if (this.getNotificationPermission_() === 'granted') {
       return;
     }
 
-    return new Promise<void>((resolve, reject) => {
-      const managePermissionResult = (result: NotificationPermission) => {
-        if (result === 'granted') {
-          return resolve();
-        } else if (result === 'denied') {
-          return reject(errorFactory.create(ERROR_CODES.PERMISSION_BLOCKED));
-        } else {
-          return reject(errorFactory.create(ERROR_CODES.PERMISSION_DEFAULT));
-        }
-      };
-
-      // The Notification.requestPermission API was changed to
-      // return a promise so now have to handle both in case
-      // browsers stop support callbacks for promised version
-      const permissionPromise = Notification.requestPermission(
-        managePermissionResult
-      );
-      if (permissionPromise) {
-        // Prefer the promise version as it's the future API.
-        permissionPromise.then(managePermissionResult);
-      }
-    });
+    const permissionResult = await Notification.requestPermission();
+    if (permissionResult === 'granted') {
+      return;
+    } else if (permissionResult === 'denied') {
+      throw errorFactory.create(ERROR_CODES.PERMISSION_BLOCKED);
+    } else {
+      throw errorFactory.create(ERROR_CODES.PERMISSION_DEFAULT);
+    }
   }
 
   /**

packages/messaging/test/window-controller.test.ts

@@ -204,16 +204,6 @@ describe('Firebase Messaging > *WindowController', () => {
       const controller = new WindowController(app);
       return controller.requestPermission();
     });
-
-    it('should resolve if the requestPermission() is granted using old callback API', () => {
-      sandbox.stub(Notification as any, 'permission').value('default');
-      sandbox.stub(Notification, 'requestPermission').callsFake(cb => {
-        cb('granted');
-      });
-
-      const controller = new WindowController(app);
-      return controller.requestPermission();
-    });
   });
 
   describe('useServiceWorker()', () => {