add porting logic from old to new standard notifications

Author: fadi-george

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -162,8 +162,10 @@ export const setupSubModelStore = async ({
     token,
     onesignalId,
   });
-  await Database.setPushId(pushModel.id);
-  await Database.setPushToken(pushModel.token);
+  await Database.setTokenAndId({
+    token: pushModel.token,
+    id: pushModel.id,
+  });
   OneSignal.coreDirector.subscriptionModelStore.replaceAll(
     [pushModel],
     ModelChangeTags.NO_PROPOGATE,

src/core/types/subscription.ts

@@ -12,6 +12,7 @@ export const SubscriptionType = {
   Email: 'Email',
   SMS: 'SMS',
   SafariPush: 'SafariPush',
+  SafariLegacyPush: 'SafariLegacyPush',
   FirefoxPush: 'FirefoxPush',
   // And others but not relevant for Web SDK
   // macOSPush: 'macOSPush',

src/shared/helpers/EventHelper.ts

@@ -27,6 +27,7 @@ export default class EventHelper {
   }
 
   static async checkAndTriggerSubscriptionChanged() {
+    console.log('checkAndTriggerSubscriptionChanged');
     OneSignalUtils.logMethodCall('checkAndTriggerSubscriptionChanged');
     const context: ContextSWInterface = OneSignal.context;
     // isPushEnabled = subscribed && is not opted out

src/shared/helpers/SubscriptionHelper.ts

@@ -31,7 +31,6 @@ export default class SubscriptionHelper {
           const rawSubscription = await context.subscriptionManager.subscribe(
             SubscriptionStrategyKind.ResubscribeExisting,
           );
-          console.warn('rawSubscription', rawSubscription);
           subscription =
             await context.subscriptionManager.registerSubscription(
               rawSubscription,
@@ -57,6 +56,7 @@ export default class SubscriptionHelper {
     switch (type) {
       case SubscriptionType.ChromePush:
       case SubscriptionType.SafariPush:
+      case SubscriptionType.SafariLegacyPush:
       case SubscriptionType.FirefoxPush:
         return true;
       default:

src/shared/managers/SubscriptionManager.ts

@@ -1,6 +1,7 @@
 import {
   NotificationType,
   NotificationTypeValue,
+  SubscriptionType,
 } from 'src/core/types/subscription';
 import { isCompleteSubscriptionObject } from '../../core/utils/typePredicates';
 import UserDirector from '../../onesignal/UserDirector';
@@ -138,7 +139,6 @@ export class SubscriptionManager {
 
         rawPushSubscription =
           await this.subscribeFcmFromPage(subscriptionStrategy);
-        console.warn('rawPushSubscription 2', rawPushSubscription);
         await this._updatePushSubscriptionModelWithRawSubscription(
           rawPushSubscription,
         );
@@ -153,24 +153,38 @@ export class SubscriptionManager {
   private async _updatePushSubscriptionModelWithRawSubscription(
     rawPushSubscription: RawPushSubscription,
   ) {
+    console.log('updatePushSubscriptionModelWithRawSubscription', {
+      rawPushSubscription,
+    });
     const pushModel = await OneSignal.coreDirector.getPushSubscriptionModel();
+    console.log('pushModel', { pushModel });
+
     // EventHelper checkAndTriggerSubscriptionChanged is called before this function when permission is granted and so
     // it will save the push token/id to the database so we don't need to save the token afer generating
     if (!pushModel) {
       OneSignal.coreDirector.generatePushSubscriptionModel(rawPushSubscription);
       return UserDirector.createUserOnServer();
-
-      // Bug w/ v160400 release where isCreatingUser was improperly set and never reset
-      // so a check if pushModel id is needed to recreate the user
-    }
-    if (!pushModel.id) {
-      return UserDirector.createUserOnServer();
     }
 
-    // resubscribing. update existing push subscription model
+    // Bug w/ v160400 release where isCreatingUser was improperly set and never reset
+    // so a check if pushModel id is needed to recreate the user
+    if (!pushModel.id) return UserDirector.createUserOnServer();
+
     const serializedSubscriptionRecord = new FuturePushSubscriptionRecord(
       rawPushSubscription,
     ).serialize();
+
+    // for legacy safari push, switch to new format (e.g. old token 'ebsm3...' to -> https://web.push.apple.com/... with populated web_auth and web_p256)
+    if (pushModel.type === SubscriptionType.SafariLegacyPush) {
+      if (!window.Notification) return;
+      await Database.setTokenAndId({
+        token: serializedSubscriptionRecord.token,
+        id: pushModel.id,
+      });
+      pushModel.setProperty('type', SubscriptionType.SafariPush);
+    }
+
+    // update existing push subscription model
     for (const key in serializedSubscriptionRecord) {
       const modelKey = key as keyof typeof serializedSubscriptionRecord;
       pushModel.setProperty(modelKey, serializedSubscriptionRecord[modelKey]);

src/shared/services/Database.ts

@@ -534,6 +534,17 @@ export default class Database {
   static async setPushToken(pushToken: string | undefined): Promise<void> {
     await this.put('Options', { key: 'lastPushToken', value: pushToken });
   }
+  static async setTokenAndId({
+    token,
+    id,
+  }: {
+    token?: string;
+    id?: string;
+  }): Promise<void> {
+    if (token)
+      await this.put('Options', { key: 'lastPushToken', value: token });
+    if (id) await this.put('Options', { key: 'lastPushId', value: id });
+  }
 
   static async setIsPushEnabled(enabled: boolean): Promise<void> {
     return Database.singletonInstance.setIsPushEnabled(enabled);