Return undefined for local onesignal id

__test__/setupTests.ts

@@ -18,7 +18,7 @@ beforeEach(async () => {
 afterEach(() => {
   server.resetHandlers();
   if (typeof OneSignal !== 'undefined') {
-    OneSignal.coreDirector?.operationRepo._clear();
+    OneSignal._coreDirector?.operationRepo._clear();
     OneSignal.emitter?.removeAllListeners();
   }
 });

__test__/support/environment/TestEnvironment.ts

@@ -32,7 +32,7 @@ export class TestEnvironment {
   ) {
     mockJsonp();
     const oneSignal = initOSGlobals(config);
-    OneSignal.coreDirector.operationRepo.queue = [];
+    OneSignal._coreDirector.operationRepo.queue = [];
 
     if (config.initOneSignalId) {
       updateIdentityModel('onesignal_id', ONESIGNAL_ID);

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -26,7 +26,7 @@ export function initOSGlobals(config: TestEnvironmentConfig = {}) {
   global.OneSignal.initialized = true;
   global.OneSignal.emitter = new Emitter();
   const core = new CoreModule();
-  global.OneSignal.coreDirector = new CoreModuleDirector(core);
+  global.OneSignal._coreDirector = new CoreModuleDirector(core);
 
   // Clear the User singleton before creating new instance
   User.singletonInstance = undefined;
@@ -92,7 +92,7 @@ export const setupSubModelStore = async ({
     pushModel.web_p256 = web_p256;
   }
   await setPushToken(pushModel.token);
-  OneSignal.coreDirector.subscriptionModelStore.replaceAll(
+  OneSignal._coreDirector.subscriptionModelStore.replaceAll(
     [pushModel],
     ModelChangeTags.NO_PROPAGATE,
   );

__test__/support/helpers/setup.ts

@@ -64,7 +64,7 @@ export const setupIdentityModel = async (
 ) => {
   const newIdentityModel = new IdentityModel();
   newIdentityModel.onesignalId = onesignalID;
-  OneSignal.coreDirector.identityModelStore.replace(
+  OneSignal._coreDirector.identityModelStore.replace(
     newIdentityModel,
     ModelChangeTags.NO_PROPAGATE,
   );
@@ -78,7 +78,7 @@ export const setupPropertiesModel = async (
 ) => {
   const newPropertiesModel = new PropertiesModel();
   newPropertiesModel.onesignalId = onesignalID;
-  OneSignal.coreDirector.propertiesModelStore.replace(
+  OneSignal._coreDirector.propertiesModelStore.replace(
     newPropertiesModel,
     ModelChangeTags.NO_PROPAGATE,
   );
@@ -96,7 +96,7 @@ export const updateIdentityModel = async <
   property: T,
   value?: IdentitySchema[T],
 ) => {
-  const identityModel = OneSignal.coreDirector.getIdentityModel();
+  const identityModel = OneSignal._coreDirector._getIdentityModel();
   identityModel.setProperty(property, value, ModelChangeTags.NO_PROPAGATE);
 };
 
@@ -112,7 +112,7 @@ export const updatePropertiesModel = async <
   property: T,
   value?: PropertiesSchema[T],
 ) => {
-  const propertiesModel = OneSignal.coreDirector.getPropertiesModel();
+  const propertiesModel = OneSignal._coreDirector._getPropertiesModel();
   propertiesModel.setProperty(property, value, ModelChangeTags.NO_PROPAGATE);
 };
 
@@ -126,7 +126,7 @@ export const setupSubscriptionModel = async (
   const subscriptionModel = new SubscriptionModel();
   subscriptionModel.id = id || '';
   subscriptionModel.token = token || '';
-  OneSignal.coreDirector.subscriptionModelStore.replaceAll(
+  OneSignal._coreDirector.subscriptionModelStore.replaceAll(
     [subscriptionModel],
     ModelChangeTags.NO_PROPAGATE,
   );

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -112,7 +112,7 @@ describe('Notification Types are set correctly on subscription change', () => {
         lastKnownPushToken: PUSH_TOKEN,
         lastKnownPushId: SUB_ID,
       });
-      OneSignal.coreDirector.addSubscriptionModel(pushModel);
+      OneSignal._coreDirector.addSubscriptionModel(pushModel);
 
       await checkAndTriggerSubscriptionChanged();
       expect(changeListener).not.toHaveBeenCalled();
@@ -130,7 +130,7 @@ describe('Notification Types are set correctly on subscription change', () => {
         lastKnownPushToken: PUSH_TOKEN_2,
         lastKnownPushId: SUB_ID_3,
       });
-      OneSignal.coreDirector.subscriptionModelStore.add(pushModel);
+      OneSignal._coreDirector.subscriptionModelStore.add(pushModel);
 
       await checkAndTriggerSubscriptionChanged();
       expect(changeListener).toHaveBeenCalledWith({

__test__/unit/user/user.test.ts

@@ -27,7 +27,7 @@ describe('User tests', () => {
     TestEnvironment.initialize();
 
     const tagsSample = { key1: 'value1' };
-    const propModel = OneSignal.coreDirector.getPropertiesModel();
+    const propModel = OneSignal._coreDirector._getPropertiesModel();
     propModel.tags = tagsSample;
 
     const user = User.createOrGetInstance();
@@ -41,7 +41,7 @@ describe('User tests', () => {
 
     const languageSample = 'fr';
 
-    const propModel = OneSignal.coreDirector.getPropertiesModel();
+    const propModel = OneSignal._coreDirector._getPropertiesModel();
     propModel.language = languageSample;
 
     const user = User.createOrGetInstance();
@@ -58,7 +58,7 @@ describe('User tests', () => {
     const user = User.createOrGetInstance();
     user.setLanguage(languageSample);
 
-    const propModel = OneSignal.coreDirector.getPropertiesModel();
+    const propModel = OneSignal._coreDirector._getPropertiesModel();
     expect(propModel.language).toBe(languageSample);
   });
 });

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "52.18 kB",
+      "limit": "52.13 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);
@@ -159,12 +159,12 @@ export class CoreModuleDirector {
     );
   }
 
-  public getIdentityModel(): IdentityModel {
+  public _getIdentityModel(): IdentityModel {
     logMethodCall('CoreModuleDirector.getIdentityModel');
     return this.core.identityModelStore.model;
   }
 
-  public getPropertiesModel(): PropertiesModel {
+  public _getPropertiesModel(): PropertiesModel {
     logMethodCall('CoreModuleDirector.getPropertiesModel');
     return this.core.propertiesModelStore.model;
   }

src/core/executors/IdentityOperationExecutor.test.ts

@@ -49,10 +49,10 @@ describe('IdentityOperationExecutor', () => {
     setAddAliasResponse();
     setDeleteAliasResponse();
 
-    identityModelStore = OneSignal.coreDirector.identityModelStore;
-    newRecordsState = OneSignal.coreDirector.newRecordsState;
-    propertiesModelStore = OneSignal.coreDirector.propertiesModelStore;
-    subscriptionModelStore = OneSignal.coreDirector.subscriptionModelStore;
+    identityModelStore = OneSignal._coreDirector.identityModelStore;
+    newRecordsState = OneSignal._coreDirector.newRecordsState;
+    propertiesModelStore = OneSignal._coreDirector.propertiesModelStore;
+    subscriptionModelStore = OneSignal._coreDirector.subscriptionModelStore;
 
     rebuildUserService = new RebuildUserService(
       identityModelStore,

src/core/executors/LoginUserOperationExecutor.test.ts

@@ -60,9 +60,9 @@ describe('LoginUserOperationExecutor', () => {
   });
 
   beforeEach(() => {
-    identityModelStore = OneSignal.coreDirector.identityModelStore;
-    propertiesModelStore = OneSignal.coreDirector.propertiesModelStore;
-    subscriptionModelStore = OneSignal.coreDirector.subscriptionModelStore;
+    identityModelStore = OneSignal._coreDirector.identityModelStore;
+    propertiesModelStore = OneSignal._coreDirector.propertiesModelStore;
+    subscriptionModelStore = OneSignal._coreDirector.subscriptionModelStore;
     rebuildUserService = new RebuildUserService(
       identityModelStore,
       propertiesModelStore,

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -47,10 +47,10 @@ describe('RefreshUserOperationExecutor', () => {
   });
 
   beforeEach(() => {
-    identityModelStore = OneSignal.coreDirector.identityModelStore;
-    propertiesModelStore = OneSignal.coreDirector.propertiesModelStore;
-    subscriptionModelStore = OneSignal.coreDirector.subscriptionModelStore;
-    newRecordsState = OneSignal.coreDirector.newRecordsState;
+    identityModelStore = OneSignal._coreDirector.identityModelStore;
+    propertiesModelStore = OneSignal._coreDirector.propertiesModelStore;
+    subscriptionModelStore = OneSignal._coreDirector.subscriptionModelStore;
+    newRecordsState = OneSignal._coreDirector.newRecordsState;
     buildUserService = new RebuildUserService(
       identityModelStore,
       propertiesModelStore,

src/core/executors/RefreshUserOperationExecutor.ts

@@ -119,7 +119,8 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
         }
       }
 
-      const pushModel = await OneSignal.coreDirector.getPushSubscriptionModel();
+      const pushModel =
+        await OneSignal._coreDirector.getPushSubscriptionModel();
       if (pushModel) {
         pushModel.onesignalId = op.onesignalId;
         subscriptionModels.push(pushModel);

src/core/executors/SubscriptionOperationExecutor.test.ts

@@ -55,13 +55,13 @@ describe('SubscriptionOperationExecutor', () => {
   });
 
   beforeEach(() => {
-    subscriptionModelStore = OneSignal.coreDirector.subscriptionModelStore;
-    newRecordsState = OneSignal.coreDirector.newRecordsState;
+    subscriptionModelStore = OneSignal._coreDirector.subscriptionModelStore;
+    newRecordsState = OneSignal._coreDirector.newRecordsState;
     newRecordsState._records.clear();
 
-    identityModelStore = OneSignal.coreDirector.identityModelStore;
-    propertiesModelStore = OneSignal.coreDirector.propertiesModelStore;
-    subscriptionsModelStore = OneSignal.coreDirector.subscriptionModelStore;
+    identityModelStore = OneSignal._coreDirector.identityModelStore;
+    propertiesModelStore = OneSignal._coreDirector.propertiesModelStore;
+    subscriptionsModelStore = OneSignal._coreDirector.subscriptionModelStore;
 
     buildUserService = new RebuildUserService(
       identityModelStore,

src/core/executors/UpdateUserOperationExecutor.test.ts

@@ -32,10 +32,10 @@ describe('UpdateUserOperationExecutor', () => {
   });
 
   beforeEach(() => {
-    identityModelStore = OneSignal.coreDirector.identityModelStore;
-    propertiesModelStore = OneSignal.coreDirector.propertiesModelStore;
-    newRecordsState = OneSignal.coreDirector.newRecordsState;
-    subscriptionsModelStore = OneSignal.coreDirector.subscriptionModelStore;
+    identityModelStore = OneSignal._coreDirector.identityModelStore;
+    propertiesModelStore = OneSignal._coreDirector.propertiesModelStore;
+    newRecordsState = OneSignal._coreDirector.newRecordsState;
+    subscriptionsModelStore = OneSignal._coreDirector.subscriptionModelStore;
     buildUserService = new RebuildUserService(
       identityModelStore,
       propertiesModelStore,

src/core/modelRepo/RebuildUserService.ts

@@ -54,7 +54,7 @@ export class RebuildUserService implements IRebuildUserService {
     );
 
     const pushSubscription =
-      await OneSignal.coreDirector.getPushSubscriptionModel();
+      await OneSignal._coreDirector.getPushSubscriptionModel();
     if (pushSubscription) {
       operations.push(
         new CreateSubscriptionOperation({

src/core/operations/BaseSubscriptionOperation.ts

@@ -43,8 +43,8 @@ export abstract class BaseSubscriptionOperation<
 
   override get canStartExecute(): boolean {
     return (
-      !IDManager.isLocalId(this.onesignalId) &&
-      !IDManager.isLocalId(this.subscriptionId)
+      !IDManager._isLocalId(this.onesignalId) &&
+      !IDManager._isLocalId(this.subscriptionId)
     );
   }
 

src/core/operations/CreateSubscriptionOperation.ts

@@ -20,7 +20,7 @@ export class CreateSubscriptionOperation extends BaseFullSubscriptionOperation {
   }
 
   override get canStartExecute(): boolean {
-    return !IDManager.isLocalId(this.onesignalId);
+    return !IDManager._isLocalId(this.onesignalId);
   }
 
   override get applyToRecordId(): string {

src/core/operations/LoginUserOperation.ts

@@ -74,7 +74,7 @@ export class LoginUserOperation extends Operation<ILoginOp> {
   override get canStartExecute(): boolean {
     return (
       !this.existingOnesignalId ||
-      !IDManager.isLocalId(this.existingOnesignalId)
+      !IDManager._isLocalId(this.existingOnesignalId)
     );
   }
 

src/core/operations/Operation.ts

@@ -85,7 +85,7 @@ export abstract class Operation<
    * Whether the operation can currently execute given its current state.
    */
   get canStartExecute(): boolean {
-    return !IDManager.isLocalId(this.onesignalId);
+    return !IDManager._isLocalId(this.onesignalId);
   }
 
   /**

src/core/operations/TrackCustomEventOperation.ts

@@ -78,7 +78,7 @@ export class TrackCustomEventOperation extends Operation<ITrackEventOp> {
     return GroupComparisonType.NONE;
   }
   override get canStartExecute(): boolean {
-    return !IDManager.isLocalId(this.onesignalId);
+    return !IDManager._isLocalId(this.onesignalId);
   }
   override get applyToRecordId(): string {
     return this.onesignalId;

src/entries/pageSdkInit.test.ts

@@ -38,7 +38,7 @@ describe('pageSdkInit', () => {
     await vi.waitUntil(async () => {
       return logoutSpy.mock.calls.length > 0;
     });
-    expect(window.OneSignal.coreDirector).toBeDefined();
+    expect(window.OneSignal._coreDirector).toBeDefined();
   });
 
   test('can process deferred items long after page init', async () => {

src/entries/pageSdkInit2.test.ts

@@ -28,7 +28,7 @@ describe('pageSdkInit 2', () => {
   });
 
   test('can login and addEmail', async () => {
-    const onesignalId = IDManager.createLocalId();
+    const onesignalId = IDManager._createLocalId();
     updateIdentityModel('onesignal_id', onesignalId);
 
     const email = 'joe@example.com';
@@ -74,7 +74,7 @@ describe('pageSdkInit 2', () => {
       OneSignal.User.addEmail(email);
 
       // waiting for indexedb to update, addEmail should add a new subscription item with temporary id
-      const subModels = OneSignal.coreDirector.subscriptionModelStore
+      const subModels = OneSignal._coreDirector.subscriptionModelStore
         .list()
         .map((m) => m.toJSON());
       subModels.sort((a, b) => a.type.localeCompare(b.type));
@@ -92,7 +92,7 @@ describe('pageSdkInit 2', () => {
           type: 'Email',
         },
       ]);
-      expect(IDManager.isLocalId(subModels[1].id)).toBe(true);
+      expect(IDManager._isLocalId(subModels[1].id)).toBe(true);
     });
 
     // wait user subscriptions to be refresh/replaced