add more prefix usages

Author: fadi-george

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -87,12 +87,12 @@ export const setupSubModelStore = async ({
     onesignalId,
   });
   if (web_auth) {
-    pushModel.web_auth = web_auth;
+    pushModel._web_auth = web_auth;
   }
   if (web_p256) {
-    pushModel.web_p256 = web_p256;
+    pushModel._web_p256 = web_p256;
   }
-  await setPushToken(pushModel.token);
+  await setPushToken(pushModel._token);
   OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [pushModel],
     ModelChangeTags._NoPropogate,

__test__/support/helpers/setup.ts

@@ -124,8 +124,8 @@ export const setupSubscriptionModel = async (
   token: string | undefined,
 ) => {
   const subscriptionModel = new SubscriptionModel();
-  subscriptionModel.id = id || '';
-  subscriptionModel.token = token || '';
+  subscriptionModel._id = id || '';
+  subscriptionModel._token = token || '';
   OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [subscriptionModel],
     ModelChangeTags._NoPropogate,

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "45.393 kB",
+      "limit": "45.364 kB",
       "gzip": true
     },
     {

src/core/CoreModuleDirector.ts

@@ -64,7 +64,7 @@ export class CoreModuleDirector {
     model._initializeFromJson(
       new FuturePushSubscriptionRecord(rawPushSubscription)._serialize(),
     );
-    model.id = IDManager._createLocalId();
+    model._id = IDManager._createLocalId();
 
     // we enqueue a login operation w/ a create subscription operation the first time we generate/save a push subscription model
     this._core._subscriptionModelStore._add(model, ModelChangeTags._Hydrate);
@@ -83,7 +83,7 @@ export class CoreModuleDirector {
   public _getEmailSubscriptionModels(): SubscriptionModel[] {
     logMethodCall('CoreModuleDirector.getEmailSubscriptionModels');
     const subscriptions = this._core._subscriptionModelStore._list();
-    return subscriptions.filter((s) => s.type === SubscriptionType._Email);
+    return subscriptions.filter((s) => s._type === SubscriptionType._Email);
   }
 
   public async _hasEmail(): Promise<boolean> {
@@ -94,7 +94,7 @@ export class CoreModuleDirector {
   public _getSmsSubscriptionModels(): SubscriptionModel[] {
     logMethodCall('CoreModuleDirector.getSmsSubscriptionModels');
     const subscriptions = this._core._subscriptionModelStore._list();
-    return subscriptions.filter((s) => s.type === SubscriptionType._SMS);
+    return subscriptions.filter((s) => s._type === SubscriptionType._SMS);
   }
 
   public async _hasSms(): Promise<boolean> {
@@ -108,7 +108,7 @@ export class CoreModuleDirector {
   public _getAllPushSubscriptionModels(): SubscriptionModel[] {
     logMethodCall('CoreModuleDirector.getAllPushSubscriptionModels');
     const subscriptions = this._core._subscriptionModelStore._list();
-    return subscriptions.filter((s) => isPushSubscriptionType(s.type));
+    return subscriptions.filter((s) => isPushSubscriptionType(s._type));
   }
 
   async _getPushSubscriptionModelByCurrentToken(): Promise<
@@ -205,6 +205,6 @@ export class CoreModuleDirector {
         return undefined;
     }
 
-    return subscriptions.find((subscription) => subscription.token === token);
+    return subscriptions.find((subscription) => subscription._token === token);
   }
 }

src/core/executors/IdentityOperationExecutor.ts

@@ -82,15 +82,15 @@ export class IdentityOperationExecutor implements IOperationExecutor {
             label: IdentityConstants._OneSignalID,
             id: lastOperation._onesignalId,
           },
-          { [lastOperation.label]: lastOperation.value },
+          { [lastOperation._label]: lastOperation._value },
         )
       : deleteAlias(
           { appId: lastOperation._appId },
           {
             label: IdentityConstants._OneSignalID,
             id: lastOperation._onesignalId,
           },
-          lastOperation.label,
+          lastOperation._label,
         );
 
     const { ok, status, retryAfterSeconds } = await request;
@@ -100,8 +100,8 @@ export class IdentityOperationExecutor implements IOperationExecutor {
         lastOperation._onesignalId
       ) {
         this._identityModelStore._model._setProperty(
-          lastOperation.label,
-          isSetAlias ? lastOperation.value : undefined,
+          lastOperation._label,
+          isSetAlias ? lastOperation._value : undefined,
           ModelChangeTags._Hydrate,
         );
       }

src/core/executors/LoginUserOperationExecutor.ts

@@ -282,15 +282,15 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
         return {
           ...currentSubs,
           [subscriptionId]: {
-            enabled: operation.enabled,
-            device_model: operation.device_model,
-            device_os: operation.device_os,
-            notification_types: operation.notification_types,
-            sdk: operation.sdk,
-            token: operation.token,
-            type: operation.type,
-            web_auth: operation.web_auth,
-            web_p256: operation.web_p256,
+            enabled: operation._enabled,
+            device_model: operation._device_model,
+            device_os: operation._device_os,
+            notification_types: operation._notification_types,
+            sdk: operation._sdk,
+            token: operation._token,
+            type: operation._type,
+            web_auth: operation._web_auth,
+            web_p256: operation._web_p256,
           },
         };
       }
@@ -303,9 +303,9 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
             ...currentSubs,
             [subscriptionId]: {
               ...currentSubs[subscriptionId],
-              enabled: operation.enabled,
-              notification_types: operation.notification_types,
-              token: operation.token,
+              enabled: operation._enabled,
+              notification_types: operation._notification_types,
+              token: operation._token,
             },
           };
         }

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -178,9 +178,9 @@ describe('RefreshUserOperationExecutor', () => {
     test('should preserve cached push subscription when updating models', async () => {
       // Set up a push subscription in the store
       const pushSubModel = new SubscriptionModel();
-      pushSubModel.id = SUB_ID_2;
-      pushSubModel.type = SubscriptionType._ChromePush;
-      pushSubModel.token = PUSH_TOKEN;
+      pushSubModel._id = SUB_ID_2;
+      pushSubModel._type = SubscriptionType._ChromePush;
+      pushSubModel._token = PUSH_TOKEN;
       pushSubModel._notification_types = NotificationType._Subscribed;
 
       subscriptionModelStore._add(pushSubModel, ModelChangeTags._NoPropogate);
@@ -209,11 +209,11 @@ describe('RefreshUserOperationExecutor', () => {
 
       // Find the push subscription
       const pushSub = subscriptions.find(
-        (sub: SubscriptionModel) => sub.type === SubscriptionType._ChromePush,
+        (sub: SubscriptionModel) => sub._type === SubscriptionType._ChromePush,
       );
       expect(pushSub).toBeDefined();
-      expect(pushSub?.id).toBe(SUB_ID_2);
-      expect(pushSub?.token).toBe(PUSH_TOKEN);
+      expect(pushSub?._id).toBe(SUB_ID_2);
+      expect(pushSub?._token).toBe(PUSH_TOKEN);
     });
 
     test('should handle network errors', async () => {

src/core/executors/RefreshUserOperationExecutor.ts

@@ -100,21 +100,21 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
       for (const sub of subscriptions) {
         const model = new SubscriptionModel();
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        model.id = sub.id!;
-        model.token = sub.token ?? '';
+        model._id = sub.id!;
+        model._token = sub.token ?? '';
         model._notification_types =
           sub.notification_types ?? NotificationType._Subscribed;
-        model.type = sub.type;
-        model.enabled =
+        model._type = sub.type;
+        model._enabled =
           model._notification_types !== NotificationType._UserOptedOut;
-        model.sdk = sub.sdk;
-        model.device_os = sub.device_os;
-        model.device_model = sub.device_model;
+        model._sdk = sub.sdk;
+        model._device_os = sub.device_os;
+        model._device_model = sub.device_model;
         model._onesignalId = op._onesignalId;
 
         // We only add a non-push subscriptions. For push, the device is the source of truth
         // so we don't want to cache these subscriptions from the backend.
-        if (!isPushSubscriptionType(model.type)) {
+        if (!isPushSubscriptionType(model._type)) {
           subscriptionModels.push(model);
         }
       }

src/core/executors/SubscriptionOperationExecutor.test.ts

@@ -288,7 +288,7 @@ describe('SubscriptionOperationExecutor', () => {
 
       // Missing error with rebuild ops
       subscriptionsModelStore._add(pushSubscription, ModelChangeTags._Hydrate);
-      await setPushToken(pushSubscription.token);
+      await setPushToken(pushSubscription._token);
 
       const res6 = await executor._execute([createOp]);
 
@@ -299,8 +299,8 @@ describe('SubscriptionOperationExecutor', () => {
           onesignalId: ONESIGNAL_ID,
           enabled: true,
           notification_types: NotificationType._Subscribed,
-          subscriptionId: pushSubscription.id,
-          token: pushSubscription.token,
+          subscriptionId: pushSubscription._id,
+          token: pushSubscription._token,
           type: SubscriptionType._ChromePush,
         }),
         new RefreshUserOperation(APP_ID, ONESIGNAL_ID),

src/core/executors/SubscriptionOperationExecutor.ts

@@ -92,15 +92,15 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
     const lastUpdateOperation = [...operations]
       .reverse()
       .find((op) => op instanceof UpdateSubscriptionOperation);
-    const enabled = lastUpdateOperation?.enabled ?? createOperation.enabled;
-    const token = lastUpdateOperation?.token ?? createOperation.token;
+    const enabled = lastUpdateOperation?._enabled ?? createOperation._enabled;
+    const token = lastUpdateOperation?._token ?? createOperation._token;
     const notification_types =
-      lastUpdateOperation?.notification_types ??
-      createOperation.notification_types;
+      lastUpdateOperation?._notification_types ??
+      createOperation._notification_types;
 
     const subscription = {
-      sdk: createOperation.sdk,
-      type: createOperation.type,
+      sdk: createOperation._sdk,
+      type: createOperation._type,
       enabled,
       token,
       notification_types,
@@ -209,12 +209,12 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
     ] as UpdateSubscriptionOperation;
 
     const subscription = {
-      type: lastOp.type,
-      enabled: lastOp.enabled,
-      token: lastOp.token,
-      notification_types: lastOp.notification_types,
-      web_auth: lastOp.web_auth,
-      web_p256: lastOp.web_p256,
+      type: lastOp._type,
+      enabled: lastOp._enabled,
+      token: lastOp._token,
+      notification_types: lastOp._notification_types,
+      web_auth: lastOp._web_auth,
+      web_p256: lastOp._web_p256,
     };
 
     const response = await updateSubscriptionById(
@@ -254,12 +254,12 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
           _operations: [
             new CreateSubscriptionOperation({
               appId: lastOp._appId,
-              enabled: lastOp.enabled,
-              notification_types: lastOp.notification_types,
+              enabled: lastOp._enabled,
+              notification_types: lastOp._notification_types,
               onesignalId: lastOp._onesignalId,
               subscriptionId: lastOp._subscriptionId,
-              token: lastOp.token,
-              type: lastOp.type,
+              token: lastOp._token,
+              type: lastOp._type,
             }),
           ],
         };