fix missing token updates

PushToken values can change and this wasn't being account for in
checkAndTriggerSubscriptionChanged(). This fixes a bug where the backend
would not get the new token when toggling notification push off and on
then refreshing the page.

Also logging instead of throwing when there is no push sub yet when
updatePushSubscriptionNotificationTypes is called. This isn't an error
as the value is simply populated when the sub is created.

Author: jkasten2

src/shared/helpers/EventHelper.ts

@@ -32,24 +32,24 @@ export default class EventHelper {
 
     const appState = await Database.getAppState();
     const { lastKnownPushEnabled, lastKnownPushId, lastKnownPushToken, lastKnownOptedIn } = appState;
+
+    const currentPushToken = await MainHelper.getCurrentPushToken();
+
+    const pushModel = await OneSignal.coreDirector.getPushSubscriptionModel();
+    const pushSubscriptionId = pushModel?.data?.id;
+
     const didStateChange = (
       lastKnownPushEnabled === null ||
-      isPushEnabled !== lastKnownPushEnabled
+      isPushEnabled !== lastKnownPushEnabled ||
+      currentPushToken !== lastKnownPushToken ||
+      pushSubscriptionId !== lastKnownPushId
     );
     if (!didStateChange) {
       return;
     }
-    Log.info(
-      `The user's subscription state changed from ` +
-        `${lastKnownPushEnabled === null ? '(not stored)' : lastKnownPushEnabled} ⟶ ${isPushEnabled}`
-    );
 
     // update notification_types via core module
-    await context.subscriptionManager.updateNotificationTypes();
-
-    const currentPushToken = await MainHelper.getCurrentPushToken();
-    const pushModel: OSModel<SubscriptionModel> = await OneSignal.coreDirector.getCurrentPushSubscriptionModel();
-    const pushSubscriptionId = pushModel.data?.id;
+    await context.subscriptionManager.updateNotificationTypes()
 
     await Database.setIsPushEnabled(isPushEnabled);
     appState.lastKnownPushEnabled = isPushEnabled;
@@ -71,7 +71,7 @@ export default class EventHelper {
         optedIn: isOptedIn,
       }
     };
-
+    Log.info("Push Subscription state changed: ", change);
     EventHelper.triggerSubscriptionChanged(change);
   }
 

src/shared/managers/SubscriptionManager.ts

@@ -209,9 +209,8 @@ export class SubscriptionManager {
   async updatePushSubscriptionNotificationTypes(notificationTypes: SubscriptionStateKind): Promise<void> {
     const pushModel = await OneSignal.coreDirector.getPushSubscriptionModel();
     if (!pushModel) {
-      throw new OneSignalError(
-        `Cannot update notification_types for push subscription model because it does not exist.`
-        );
+      Log.info("No Push Subscription yet to update notification_types.");
+      return;
     }
 
     pushModel.set("notification_types", notificationTypes);