Fix logic for adding email/sms subscriptions

index.html

@@ -42,6 +42,14 @@ <h1>OneSignal Dev</h1>
       //     });
       //   });
       // }, 5000);
+
+      // For testing addEmail / addSms records
+      window.OneSignalDeferred = window.OneSignalDeferred || [];
+      OneSignalDeferred.push(async function (OneSignal) {
+        await OneSignal.login('spicy-new');
+        OneSignal.User.addEmail('jd@mail.com');
+        // OneSignal.User.addSms('6191234567');
+      });
     </script>
   </body>
 </html>

package.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": [
     {

src/core/modelRepo/OSModelStore.ts

@@ -1,14 +1,14 @@
-import { OSModel } from './OSModel';
 import Subscribable from '../Subscribable';
+import { CoreChangeType } from '../models/CoreChangeType';
 import {
-  ModelStoreChange,
   ModelStoreAdded,
+  ModelStoreChange,
+  ModelStoreHydrated,
   ModelStoreRemoved,
   ModelStoreUpdated,
-  ModelStoreHydrated,
 } from '../models/ModelStoreChange';
-import { CoreChangeType } from '../models/CoreChangeType';
 import { isOSModel, isOSModelUpdatedArgs } from '../utils/typePredicates';
+import { OSModel } from './OSModel';
 
 export class OSModelStore<Model> extends Subscribable<ModelStoreChange<Model>> {
   public models: { [key: string]: OSModel<Model> } = {};

src/core/requestService/SubscriptionRequests.ts

@@ -1,5 +1,6 @@
-import MainHelper from '../../shared/helpers/MainHelper';
+import OneSignalApiBaseResponse from '../../shared/api/OneSignalApiBaseResponse';
 import OneSignalError from '../../shared/errors/OneSignalError';
+import MainHelper from '../../shared/helpers/MainHelper';
 import { logMethodCall } from '../../shared/utils/utils';
 import {
   ExecutorResult,
@@ -12,10 +13,9 @@ import {
   SupportedSubscription,
 } from '../models/SubscriptionModels';
 import { Operation } from '../operationRepo/Operation';
+import { isCompleteSubscriptionObject } from '../utils/typePredicates';
 import { processSubscriptionOperation } from './helpers';
 import { RequestService } from './RequestService';
-import OneSignalApiBaseResponse from '../../shared/api/OneSignalApiBaseResponse';
-import { isCompleteSubscriptionObject } from '../utils/typePredicates';
 
 /**
  * This class contains logic for all the Subscription model related requests that can be made to the OneSignal API

src/entries/pageSdkInit.test.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);
+  });
 });