Merge pull request #1323 from OneSignal/fg/sub-fix

Fix logic when Re-registrating Service Worker

Author: fadi-george

src/core/CoreModuleDirector.ts

@@ -124,7 +124,7 @@ export class CoreModuleDirector {
     logMethodCall(
       'CoreModuleDirector.getPushSubscriptionModelByLastKnownToken',
     );
-    const { lastKnownPushToken } = await Database.getAppState();
+    const lastKnownPushToken = await Database.getPushToken();
     if (lastKnownPushToken) {
       return this.getSubscriptionOfTypeWithToken(
         SubscriptionChannel.Push,

src/core/executors/SubscriptionOperationExecutor.test.ts

@@ -343,6 +343,8 @@ describe('SubscriptionOperationExecutor', () => {
         token: 'updated-token',
         enabled: false,
         notification_types: NotificationType.UserOptedOut,
+        web_auth: 'some-web-auth',
+        web_p256: 'some-web-p256',
       });
 
       const result = await executor.execute([updateOp]);
@@ -354,6 +356,8 @@ describe('SubscriptionOperationExecutor', () => {
           enabled: false,
           token: 'updated-token',
           notification_types: NotificationType.UserOptedOut,
+          web_auth: 'some-web-auth',
+          web_p256: 'some-web-p256',
         },
       });
     });
@@ -368,6 +372,8 @@ describe('SubscriptionOperationExecutor', () => {
         token: 'first-update',
         enabled: true,
         notification_types: NotificationType.Subscribed,
+        web_auth: 'some-web-auth',
+        web_p256: 'some-web-p256',
       });
 
       const updateOp2 = new UpdateSubscriptionOperation({
@@ -378,6 +384,8 @@ describe('SubscriptionOperationExecutor', () => {
         token: 'second-update',
         enabled: false,
         notification_types: NotificationType.UserOptedOut,
+        web_auth: 'some-web-auth-2',
+        web_p256: 'some-web-p256-2',
       });
 
       const result = await executor.execute([updateOp1, updateOp2]);
@@ -390,6 +398,8 @@ describe('SubscriptionOperationExecutor', () => {
           enabled: false,
           token: 'second-update',
           notification_types: NotificationType.UserOptedOut,
+          web_auth: 'some-web-auth-2',
+          web_p256: 'some-web-p256-2',
         },
       });
     });

src/core/executors/SubscriptionOperationExecutor.ts

@@ -207,6 +207,8 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
       enabled: lastOp.enabled,
       token: lastOp.token,
       notification_types: lastOp.notification_types,
+      web_auth: lastOp.web_auth,
+      web_p256: lastOp.web_p256,
     };
 
     const response = await RequestService.updateSubscription(

src/core/listeners/SubscriptionModelStoreListener.ts

@@ -62,6 +62,8 @@ export class SubscriptionModelStoreListener extends ModelStoreListener<Subscript
       enabled,
       token: model.token,
       notification_types,
+      web_auth: model.web_auth,
+      web_p256: model.web_p256,
     });
   }
 

src/shared/managers/SubscriptionManager.ts

@@ -183,7 +183,10 @@ export class SubscriptionManager {
     const serializedSubscriptionRecord = new FuturePushSubscriptionRecord(
       rawPushSubscription,
     ).serialize();
-    pushModel.mergeData(serializedSubscriptionRecord);
+    for (const key in serializedSubscriptionRecord) {
+      const modelKey = key as keyof typeof serializedSubscriptionRecord;
+      pushModel.setProperty(modelKey, serializedSubscriptionRecord[modelKey]);
+    }
   }
 
   async updateNotificationTypes(): Promise<void> {