add tests for multiple addSms and addEmail calls

Author: fadi-george

package-lock.json

@@ -42,7 +42,7 @@
     "@types/node": "^18.18.0",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",
-    "@vitest/coverage-v8": "3.0.9",
+    "@vitest/coverage-v8": "3.1.1",
     "deepmerge": "^4.2.2",
     "eslint": "^8.23.0",
     "eslint-config-prettier": "9.0.0",
@@ -57,7 +57,7 @@
     "vite-bundle-analyzer": "^0.17.1",
     "vite-plugin-mkcert": "^1.17.6",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "3.0.9"
+    "vitest": "3.1.1"
   },
   "size-limit": [
     {

package.json

@@ -171,7 +171,6 @@ export class CoreModuleDirector {
     modelStores[modelName].add(model, propagate);
   }
 
-
   public remove(modelName: ModelName, modelId: string): void {
     logMethodCall('CoreModuleDirector.remove', { modelName, modelId });
     const modelStores = this.getModelStores();

src/core/CoreModuleDirector.ts

@@ -1,4 +1,4 @@
-import { APP_ID } from '__test__/support/constants';
+import { APP_ID, DUMMY_ONESIGNAL_ID } from '__test__/support/constants';
 import { TestEnvironment } from '__test__/support/environment/TestEnvironment';
 import { mockServerConfig } from '__test__/support/helpers/configHelper';
 import { server } from '__test__/support/mocks/server';
@@ -31,7 +31,6 @@ describe('pageSdkInit', () => {
   afterEach(async () => {
     vi.resetModules();
     localStorage.clear();
-    sessionStorage.clear();
     OneSignal._initCalled = false;
   });
 
@@ -70,4 +69,41 @@ describe('pageSdkInit', () => {
     await vi.runOnlyPendingTimersAsync();
     expect(initSpy).toHaveBeenCalled();
   });
+
+  test('multiple addEmail/addSms calls should not create duplicate subscriptions', async () => {
+    server.use(
+      http.post('**/apps/*/users', () =>
+        HttpResponse.json({
+          identity: {
+            onesignal_id: DUMMY_ONESIGNAL_ID,
+          },
+        }),
+      ),
+      http.post('**/apps/*/users/by/onesignal_id/*/subscriptions', () =>
+        HttpResponse.json({
+          identity: {
+            onesignal_id: DUMMY_ONESIGNAL_ID,
+          },
+        }),
+      ),
+    );
+
+    window.OneSignalDeferred = window.OneSignalDeferred || [];
+    window.OneSignalDeferred.push(async function (OneSignal) {
+      await OneSignal.init({ appId: APP_ID });
+      await OneSignal.User.addEmail('jd@mail.com');
+      await OneSignal.User.addEmail('jd@mail.com');
+      await OneSignal.User.addSms('1234567890');
+      await OneSignal.User.addSms('1234567890');
+    });
+    await import('./pageSdkInit');
+
+    await vi.advanceTimersByTimeAsync(30000);
+    const emailSubscriptions =
+      OneSignal.coreDirector.getEmailSubscriptionModels();
+    expect(Object.keys(emailSubscriptions).length).toBe(1);
+
+    const smsSubscriptions = OneSignal.coreDirector.getSmsSubscriptionModels();
+    expect(Object.keys(smsSubscriptions).length).toBe(1);
+  });
 });

src/entries/pageSdkInit.test.ts

@@ -337,10 +337,10 @@ export default class User {
     }
   }
 
-  public getTags(): { [key: string]: string } {
+  public getTags(): { [key: string]: string } | undefined {
     logMethodCall('getTags');
 
-    return OneSignal.coreDirector.getPropertiesModel()?.data?.tags || {};
+    return OneSignal.coreDirector.getPropertiesModel()?.data?.tags;
   }
 
   public setLanguage(language: string): void {

src/onesignal/User.ts

@@ -27,5 +27,5 @@
     },
     "types": ["vitest/globals"]
   },
-  "include": ["src"]
+  "include": ["src", "__test__"]
 }