Some more async/await

Author: mmermerkaya

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

@@ -70,15 +70,11 @@ export abstract class ControllerInterface implements FirebaseMessaging {
   async getToken(): Promise<string | null> {
     // Check with permissions
     const currentPermission = this.getNotificationPermission_();
-    if (currentPermission !== 'granted') {
-      if (currentPermission === 'denied') {
-        return Promise.reject(
-          errorFactory.create(ERROR_CODES.NOTIFICATIONS_BLOCKED)
-        );
-      }
-
+    if (currentPermission === 'denied') {
+      throw errorFactory.create(ERROR_CODES.NOTIFICATIONS_BLOCKED);
+    } else if (currentPermission !== 'granted') {
       // We must wait for permission to be granted
-      return Promise.resolve(null);
+      return null;
     }
 
     const swReg = await this.getSWRegistration_();
@@ -216,7 +212,6 @@ export abstract class ControllerInterface implements FirebaseMessaging {
    * unsubscribes the token from FCM  and then unregisters the push
    * subscription if it exists. It returns a promise that indicates
    * whether or not the unsubscribe request was processed successfully.
-   * @export
    */
   async deleteToken(token: string): Promise<boolean> {
     // Delete the token details from the database.

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

@@ -34,6 +34,10 @@ import {
 } from '../models/worker-page-message';
 import { ControllerInterface } from './controller-interface';
 
+interface ManifestContent {
+  gcm_sender_id: string;
+}
+
 export class WindowController extends ControllerInterface {
   private registrationToUse: ServiceWorkerRegistration | null = null;
   private publicVapidKeyToUse: Uint8Array | null = null;
@@ -73,17 +77,17 @@ export class WindowController extends ControllerInterface {
    * @return Returns a promise that resolves to an FCM token or null if
    * permission isn't granted.
    */
-  getToken(): Promise<string | null> {
+  async getToken(): Promise<string | null> {
     // Check that the required API's are available
     if (!this.isSupported_()) {
-      return Promise.reject(
-        errorFactory.create(ERROR_CODES.UNSUPPORTED_BROWSER)
-      );
+      throw errorFactory.create(ERROR_CODES.UNSUPPORTED_BROWSER);
     }
 
-    return this.manifestCheck_().then(() => {
-      return super.getToken();
-    });
+    if (!this.manifestCheckPromise) {
+      this.manifestCheckPromise = this.manifestCheck_();
+    }
+    await this.manifestCheckPromise;
+    return super.getToken();
   }
 
   /**
@@ -94,41 +98,32 @@ export class WindowController extends ControllerInterface {
    */
   // Visible for testing
   // TODO: make private
-  manifestCheck_(): Promise<void> {
-    if (this.manifestCheckPromise) {
-      return this.manifestCheckPromise;
-    }
-
+  async manifestCheck_(): Promise<void> {
     const manifestTag = document.querySelector<HTMLAnchorElement>(
       'link[rel="manifest"]'
     );
+
     if (!manifestTag) {
-      this.manifestCheckPromise = Promise.resolve();
-    } else {
-      this.manifestCheckPromise = fetch(manifestTag.href)
-        .then(response => {
-          return response.json();
-        })
-        .catch(() => {
-          // If the download or parsing fails allow check.
-          // We only want to error if we KNOW that the gcm_sender_id is incorrect.
-        })
-        .then(manifestContent => {
-          if (!manifestContent) {
-            return;
-          }
-
-          if (!manifestContent['gcm_sender_id']) {
-            return;
-          }
-
-          if (manifestContent['gcm_sender_id'] !== '103953800507') {
-            throw errorFactory.create(ERROR_CODES.INCORRECT_GCM_SENDER_ID);
-          }
-        });
+      return;
+    }
+
+    let manifestContent: ManifestContent;
+    try {
+      const response = await fetch(manifestTag.href);
+      manifestContent = await response.json();
+    } catch (e) {
+      // If the download or parsing fails allow check.
+      // We only want to error if we KNOW that the gcm_sender_id is incorrect.
+      return;
     }
 
-    return this.manifestCheckPromise;
+    if (!manifestContent || !manifestContent.gcm_sender_id) {
+      return;
+    }
+
+    if (manifestContent.gcm_sender_id !== '103953800507') {
+      throw errorFactory.create(ERROR_CODES.INCORRECT_GCM_SENDER_ID);
+    }
   }
 
   /**
@@ -339,12 +334,12 @@ export class WindowController extends ControllerInterface {
    * This will return the default VAPID key or the uint8array version of the public VAPID key
    * provided by the developer.
    */
-  getPublicVapidKey_(): Promise<Uint8Array> {
+  async getPublicVapidKey_(): Promise<Uint8Array> {
     if (this.publicVapidKeyToUse) {
-      return Promise.resolve(this.publicVapidKeyToUse);
+      return this.publicVapidKeyToUse;
     }
 
-    return Promise.resolve(DEFAULT_PUBLIC_VAPID_KEY);
+    return DEFAULT_PUBLIC_VAPID_KEY;
   }
 
   /**