# This is a combination of 2 commits.

# This is the 1st commit message:

Adding idd-types

# This is the commit message #2:

[AUTOMATED]: Prettier Code Styling

Author: Matt Gaunt

packages/messaging/src/models/iid-model.ts

@@ -22,23 +22,23 @@ import Errors from './errors';
 import arrayBufferToBase64 from '../helpers/array-buffer-to-base64';
 import FCMDetails from './fcm-details';
 
+interface IIDDetails {
+  token: string;
+  pushSet: string;
+}
+
 export default class IIDModel {
   private errorFactory_: ErrorFactory<string>;
 
   constructor() {
     this.errorFactory_ = new ErrorFactory('messaging', 'Messaging', Errors.map);
   }
 
-  /**
-   * Given a PushSubscription and messagingSenderId, get an FCM token.
-   * @public
-   * @param  {string} senderId The 'messagingSenderId' to tie the token to.
-   * @param  {PushSubscription} subscription The PushSusbcription to "federate".
-   * @param  {Uint8Array} publicVapidKey The public VAPID key.
-   * @return {Promise<!Object>} Returns the FCM token to be used in place
-   * of the PushSubscription.
-   */
-  getToken(senderId, subscription, publicVapidKey): Promise<Object> {
+  async getToken(
+    senderId: string,
+    subscription: PushSubscription,
+    publicVapidKey: Uint8Array
+  ): Promise<IIDDetails> {
     const p256dh = arrayBufferToBase64(subscription['getKey']('p256dh'));
     const auth = arrayBufferToBase64(subscription['getKey']('auth'));
 
@@ -62,46 +62,43 @@ export default class IIDModel {
       body: fcmSubscribeBody
     };
 
-    return fetch(
-      FCMDetails.ENDPOINT + '/fcm/connect/subscribe',
-      subscribeOptions
-    )
-      .then(response => response.json())
-      .catch(() => {
-        throw this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_FAILED);
-      })
-      .then(response => {
-        const fcmTokenResponse = response;
-        if (fcmTokenResponse['error']) {
-          const message = fcmTokenResponse['error']['message'];
-          throw this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_FAILED, {
-            message: message
-          });
-        }
-
-        if (!fcmTokenResponse['token']) {
-          throw this.errorFactory_.create(
-            Errors.codes.TOKEN_SUBSCRIBE_NO_TOKEN
-          );
-        }
-
-        if (!fcmTokenResponse['pushSet']) {
-          throw this.errorFactory_.create(
-            Errors.codes.TOKEN_SUBSCRIBE_NO_PUSH_SET
-          );
-        }
-
-        return {
-          token: fcmTokenResponse['token'],
-          pushSet: fcmTokenResponse['pushSet']
-        };
-      });
+    try {
+      const response = await fetch(
+        FCMDetails.ENDPOINT + '/fcm/connect/subscribe',
+        subscribeOptions
+      );
+
+      const responseData = await response.json();
+      if (responseData['error']) {
+        const message = responseData['error']['message'];
+        throw this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_FAILED, {
+          message: message
+        });
+      }
+
+      if (!responseData['token']) {
+        throw this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_NO_TOKEN);
+      }
+
+      if (!responseData['pushSet']) {
+        throw this.errorFactory_.create(
+          Errors.codes.TOKEN_SUBSCRIBE_NO_PUSH_SET
+        );
+      }
+
+      return {
+        token: responseData['token'],
+        pushSet: responseData['pushSet']
+      };
+    } catch (err) {
+      throw this.errorFactory_.create(Errors.codes.TOKEN_SUBSCRIBE_FAILED);
+    }
   }
 
   /**
    * Update the underlying token details for fcmToken.
    */
-  updateToken(
+  async updateToken(
     senderId: string,
     fcmToken: string,
     fcmPushSet: string,
@@ -133,33 +130,33 @@ export default class IIDModel {
       body: fcmUpdateBody
     };
 
-    let updateFetchRes;
-    return fetch(FCMDetails.ENDPOINT + '/fcm/connect/subscribe', updateOptions)
-      .then(fetchResponse => {
-        updateFetchRes = fetchResponse;
-        return fetchResponse.json();
-      })
-      .catch(() => {
-        throw this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_FAILED);
-      })
-      .then(fcmTokenResponse => {
-        if (!updateFetchRes.ok) {
-          const message = fcmTokenResponse['error']['message'];
-          throw this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_FAILED, {
-            message: message
-          });
-        }
-        if (!fcmTokenResponse['token']) {
-          throw this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_NO_TOKEN);
-        }
-        return fcmTokenResponse['token'];
-      });
+    try {
+      const response = await fetch(
+        FCMDetails.ENDPOINT + '/fcm/connect/subscribe',
+        updateOptions
+      );
+      const responseData = await response.json();
+      if (responseData['error']) {
+        const message = responseData['error']['message'];
+        throw this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_FAILED, {
+          message: message
+        });
+      }
+
+      if (!responseData['token']) {
+        throw this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_NO_TOKEN);
+      }
+
+      return responseData['token'];
+    } catch (err) {
+      throw this.errorFactory_.create(Errors.codes.TOKEN_UPDATE_FAILED);
+    }
   }
 
   /**
    * Given a fcmToken, pushSet and messagingSenderId, delete an FCM token.
    */
-  deleteToken(
+  async deleteToken(
     senderId: string,
     fcmToken: string,
     fcmPushSet: string
@@ -178,30 +175,20 @@ export default class IIDModel {
       body: fcmUnsubscribeBody
     };
 
-    return fetch(
-      FCMDetails.ENDPOINT + '/fcm/connect/unsubscribe',
-      unsubscribeOptions
-    ).then(fetchResponse => {
-      if (!fetchResponse.ok) {
-        return fetchResponse.json().then(
-          fcmTokenResponse => {
-            if (fcmTokenResponse['error']) {
-              const message = fcmTokenResponse['error']['message'];
-              throw this.errorFactory_.create(
-                Errors.codes.TOKEN_UNSUBSCRIBE_FAILED,
-                {
-                  message: message
-                }
-              );
-            }
-          },
-          err => {
-            throw this.errorFactory_.create(
-              Errors.codes.TOKEN_UNSUBSCRIBE_FAILED
-            );
-          }
-        );
+    try {
+      const response = await fetch(
+        FCMDetails.ENDPOINT + '/fcm/connect/unsubscribe',
+        unsubscribeOptions
+      );
+      const responseData = await response.json();
+      if (responseData['error']) {
+        const message = responseData['error']['message'];
+        throw this.errorFactory_.create(Errors.codes.TOKEN_UNSUBSCRIBE_FAILED, {
+          message: message
+        });
       }
-    });
+    } catch (err) {
+      throw this.errorFactory_.create(Errors.codes.TOKEN_UNSUBSCRIBE_FAILED);
+    }
   }
 }