remove old dead existingToken code

Logic in checkAndTriggerSubscriptionChanged has completely replaced the
existingToken* fields in RawPushSubscription. It seem the usages of
these fields were dropped in at least v16 beta6, if not sooner.

Author: jkasten2

src/shared/helpers/SubscriptionHelper.ts

@@ -120,8 +120,8 @@ export default class SubscriptionHelper {
   static getRawPushSubscriptionForLegacySafari(safariWebId: string): RawPushSubscription {
     const subscription = new RawPushSubscription();
 
-    const { deviceToken: existingDeviceToken } = window.safari.pushNotification.permission(safariWebId);
-    subscription.existingSafariDeviceToken = existingDeviceToken;
+    const { deviceToken } = window.safari.pushNotification.permission(safariWebId);
+    subscription.setFromSafariSubscription(deviceToken);
 
     return subscription;
   }

src/shared/managers/SubscriptionManager.ts

@@ -366,8 +366,6 @@ export class SubscriptionManager {
     }
 
     const { deviceToken: existingDeviceToken } = window.safari.pushNotification.permission(this.config.safariWebId);
-    pushSubscriptionDetails.existingSafariDeviceToken = existingDeviceToken;
-
     if (!existingDeviceToken) {
       /*
         We're about to show the Safari native permission request. It can fail for a number of
@@ -605,10 +603,6 @@ export class SubscriptionManager {
 
     // Create our own custom object from the browser's native PushSubscription object
     const pushSubscriptionDetails = RawPushSubscription.setFromW3cSubscription(newPushSubscription);
-    if (existingPushSubscription) {
-      pushSubscriptionDetails.existingW3cPushSubscription =
-        RawPushSubscription.setFromW3cSubscription(existingPushSubscription);
-    }
     return pushSubscriptionDetails;
   }
 

src/shared/models/RawPushSubscription.ts

@@ -9,48 +9,8 @@ export class RawPushSubscription implements Serializable {
   w3cAuth: string | undefined;
   /**
      * A Safari-only push subscription device token. Not used for Chrome/Firefox.
-     */
+  */
   safariDeviceToken: string | undefined;
-  /**
-   * A full RawPushSubscription object of the existing W3C subscription, if any.
-   *
-   * This is used to determine whether the subscription changed, so we know
-   * whether to contact OneSignal to update the subscription.
-   */
-  existingW3cPushSubscription: RawPushSubscription | undefined;
-  /**
-   * The existing Safari subscription device token, if it exists.
-   *
-   * This is used to determine whether the subscription changed, so we know
-   * whether to contact OneSignal to update the subscription.
-   */
-  existingSafariDeviceToken: string | undefined | null;
-
-  /**
-   * Returns true if an existing recorded W3C or Safari subscription is
-   * identical to the current subscription.
-   */
-  public isNewSubscription(): boolean {
-    if (this.existingW3cPushSubscription) {
-      if (!!this.existingW3cPushSubscription.w3cEndpoint !== !!this.w3cEndpoint) {
-        return true;
-      }
-      if (!!this.existingW3cPushSubscription.w3cEndpoint && !!this.w3cEndpoint &&
-        this.existingW3cPushSubscription.w3cEndpoint.toString() !== this.w3cEndpoint.toString()) {
-          return true;
-      }
-      if (this.existingW3cPushSubscription.w3cP256dh !== this.w3cP256dh) {
-        return true;
-      }
-      if (this.existingW3cPushSubscription.w3cAuth !== this.w3cAuth) {
-        return true;
-      }
-      return false;
-    } else if (this.existingSafariDeviceToken) {
-      return this.existingSafariDeviceToken !== this.safariDeviceToken;
-    }
-    return true;
-  }
 
   /**
    * Given a native W3C browser push subscription, takes the endpoint, p256dh,
@@ -102,7 +62,10 @@ export class RawPushSubscription implements Serializable {
    *
    * @param safariDeviceToken A native browser Safari push subscription.
    */
-  public setFromSafariSubscription(safariDeviceToken: string) {
+  public setFromSafariSubscription(safariDeviceToken?: string | null) {
+    if (!safariDeviceToken) {
+      return;
+    }
     this.safariDeviceToken = safariDeviceToken;
   }
 
@@ -113,8 +76,6 @@ export class RawPushSubscription implements Serializable {
       w3cP256dh: this.w3cP256dh,
       w3cAuth: this.w3cAuth,
       safariDeviceToken: this.safariDeviceToken,
-      existingPushSubscription: this.existingW3cPushSubscription ? this.existingW3cPushSubscription.serialize() : null,
-      existingSafariDeviceToken: this.existingSafariDeviceToken
     };
 
     return serializedBundle;
@@ -134,14 +95,7 @@ export class RawPushSubscription implements Serializable {
     }
     subscription.w3cP256dh = bundle.w3cP256dh;
     subscription.w3cAuth = bundle.w3cAuth;
-    subscription.existingW3cPushSubscription = undefined;
-    if (bundle.existingW3cPushSubscription) {
-      subscription.existingW3cPushSubscription = RawPushSubscription.deserialize(bundle.existingW3cPushSubscription);
-    } else if (bundle.existingPushSubscription) {
-      subscription.existingW3cPushSubscription = RawPushSubscription.deserialize(bundle.existingPushSubscription);
-    }
     subscription.safariDeviceToken = bundle.safariDeviceToken;
-    subscription.existingSafariDeviceToken = bundle.existingSafariDeviceToken;
     return subscription;
   }
 }