address merge conflict with size optimization changes

fadi-george · fadi-george · commit 2130b0f6e111 · 2025-07-30T11:18:38.000-07:00
diff --git a/__test__/support/environment/TestEnvironmentHelpers.ts b/__test__/support/environment/TestEnvironmentHelpers.ts
@@ -139,7 +139,7 @@ export const createPushSub = ({
   const pushSubscription = new SubscriptionModel();
   pushSubscription.initializeFromJson({
     device_model: '',
-    device_os: 56,
+    device_os: '56',
     enabled: true,
     id,
     notification_types: NotificationType.Subscribed,
diff --git a/src/core/executors/CustomEventOperationExecutor.ts b/src/core/executors/CustomEventOperationExecutor.ts
@@ -1,4 +1,8 @@
-import Environment from 'src/shared/helpers/Environment';
+import {
+  getDeviceModel,
+  getDeviceOS,
+  getSubscriptionType,
+} from 'src/shared/environment';
 import {
   getResponseStatusType,
   ResponseStatusType,
@@ -25,9 +29,9 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
   private get eventMetadata(): ICustomEventMetadata {
     return {
       sdk: VERSION,
-      device_model: Environment.getDeviceModel(),
-      device_os: Environment.getDeviceOS(),
-      type: Environment.getSubscriptionType(),
+      device_model: getDeviceModel(),
+      device_os: getDeviceOS(),
+      type: getSubscriptionType(),
     };
   }
 
diff --git a/src/core/models/SubscriptionModel.ts b/src/core/models/SubscriptionModel.ts
@@ -1,4 +1,5 @@
-import Environment from 'src/shared/helpers/Environment';
+import { getDeviceModel, getDeviceOS } from 'src/shared/environment';
+import { VERSION } from 'src/shared/utils/EnvVariables';
 import type { ISubscription } from '../types/api';
 import {
   type NotificationTypeValue,
@@ -27,9 +28,9 @@ type ISubscriptionModel = Pick<
 export class SubscriptionModel extends Model<ISubscriptionModel> {
   constructor() {
     super();
-    this.sdk = Environment.version();
-    this.device_model = Environment.getDeviceModel();
-    this.device_os = Environment.getDeviceOS();
+    this.sdk = VERSION;
+    this.device_model = getDeviceModel();
+    this.device_os = getDeviceOS();
   }
 
   /**
@@ -96,10 +97,10 @@ export class SubscriptionModel extends Model<ISubscriptionModel> {
     this.setProperty('device_model', value);
   }
 
-  get device_os(): number | undefined {
+  get device_os(): string | undefined {
     return this.getProperty('device_os');
   }
-  set device_os(value: number | undefined) {
+  set device_os(value: string | undefined) {
     this.setProperty('device_os', value);
   }
 
diff --git a/src/core/operations/BaseFullSubscriptionOperation.ts b/src/core/operations/BaseFullSubscriptionOperation.ts
@@ -1,4 +1,5 @@
-import Environment from 'src/shared/helpers/Environment';
+import { getDeviceModel, getDeviceOS } from 'src/shared/environment';
+import { VERSION } from 'src/shared/utils/EnvVariables';
 import type { ICreateUserSubscription } from '../types/api';
 import {
   type NotificationTypeValue,
@@ -28,9 +29,9 @@ export abstract class BaseFullSubscriptionOperation extends BaseSubscriptionOper
     super(operationName, appId, onesignalId);
 
     if (subscription) {
-      this.sdk = Environment.version();
-      this.device_model = Environment.getDeviceModel();
-      this.device_os = Environment.getDeviceOS();
+      this.sdk = VERSION;
+      this.device_model = getDeviceModel();
+      this.device_os = getDeviceOS();
       this.enabled = subscription.enabled;
       this.notification_types = subscription.notification_types;
       this.subscriptionId = subscription.subscriptionId;
@@ -104,10 +105,10 @@ export abstract class BaseFullSubscriptionOperation extends BaseSubscriptionOper
   /**
    * The device OS version
    */
-  get device_os(): number | undefined {
+  get device_os(): string | undefined {
     return this.getProperty('device_os');
   }
-  protected set device_os(value: number | undefined) {
+  protected set device_os(value: string | undefined) {
     this.setProperty('device_os', value);
   }
 
diff --git a/src/core/operations/TrackEventOperation.ts b/src/core/operations/TrackEventOperation.ts
@@ -1,10 +1,10 @@
 import { IDManager } from 'src/shared/managers/IDManager';
 import { OPERATION_NAME } from '../constants';
-import { ICustomEvent } from '../types/customEvents';
+import type { ICustomEvent } from '../types/customEvents';
 import {
   GroupComparisonType,
-  GroupComparisonValue,
   Operation,
+  type GroupComparisonValue,
 } from './Operation';
 
 type OperationProps = {
diff --git a/src/core/types/api.ts b/src/core/types/api.ts
@@ -35,7 +35,7 @@ export interface ICreateUserIdentity {
 export interface ICreateUserSubscription {
   // app_version?: string; // For Mobile
   device_model?: string;
-  device_os?: number;
+  device_os?: string;
   enabled?: boolean;
   notification_types?: NotificationTypeValue;
   // rooted?: boolean; // For Android
diff --git a/src/core/types/customEvents.ts b/src/core/types/customEvents.ts
@@ -11,7 +11,7 @@ export interface ICustomEventController {
 
 export interface ICustomEventMetadata {
   device_model: string;
-  device_os: number;
+  device_os: string;
   sdk: string;
   type: SubscriptionTypeValue;
 }
diff --git a/src/onesignal/OneSignal.test.ts b/src/onesignal/OneSignal.test.ts
@@ -197,7 +197,7 @@ describe('OneSignal', () => {
               id: DUMMY_SUBSCRIPTION_ID_2,
               token: 'test@test.com',
               type: 'Email',
-              device_os: 56,
+              device_os: '56',
               device_model: '',
               sdk: __VERSION__,
               enabled: true,
@@ -290,7 +290,7 @@ describe('OneSignal', () => {
               id: DUMMY_SUBSCRIPTION_ID_3,
               token: sms,
               type: 'SMS',
-              device_os: 56,
+              device_os: '56',
               device_model: '',
               sdk: __VERSION__,
             },
diff --git a/src/page/userModel/FuturePushSubscriptionRecord.ts b/src/page/userModel/FuturePushSubscriptionRecord.ts
@@ -3,8 +3,13 @@ import type {
   SubscriptionTypeValue,
 } from 'src/core/types/subscription';
 import { NotificationType } from 'src/core/types/subscription';
+import {
+  getDeviceModel,
+  getDeviceOS,
+  getSubscriptionType,
+} from 'src/shared/environment';
 import { RawPushSubscription } from 'src/shared/models/RawPushSubscription';
-import Environment from '../../shared/helpers/Environment';
+import { VERSION } from 'src/shared/utils/EnvVariables';
 import type { Serializable } from '../models/Serializable';
 
 export default class FuturePushSubscriptionRecord implements Serializable {
@@ -14,18 +19,18 @@ export default class FuturePushSubscriptionRecord implements Serializable {
   readonly notificationTypes?: NotificationTypeValue;
   readonly sdk: string;
   readonly deviceModel: string;
-  readonly deviceOs: number;
+  readonly deviceOs: string;
   readonly webAuth?: string;
   readonly webp256?: string;
 
   constructor(rawPushSubscription: RawPushSubscription) {
     this.token = this._getToken(rawPushSubscription);
-    this.type = Environment.getSubscriptionType();
+    this.type = getSubscriptionType();
     this.enabled = true;
     this.notificationTypes = NotificationType.Subscribed;
-    this.sdk = Environment.version();
-    this.deviceModel = Environment.getDeviceModel();
-    this.deviceOs = Environment.getDeviceOS();
+    this.sdk = VERSION;
+    this.deviceModel = getDeviceModel();
+    this.deviceOs = getDeviceOS();
     this.webAuth = rawPushSubscription.w3cAuth;
     this.webp256 = rawPushSubscription.w3cP256dh;
   }
diff --git a/src/shared/api/OneSignalApiSW.ts b/src/shared/api/OneSignalApiSW.ts
@@ -3,10 +3,10 @@ import { NotificationType } from 'src/core/types/subscription';
 import AliasPair from '../../core/requestService/AliasPair';
 import { RequestService } from '../../core/requestService/RequestService';
 import type { OutcomeRequestData } from '../../page/models/OutcomeRequestData';
+import type { ServerAppConfig } from '../config';
 import Utils from '../context/Utils';
-import Environment from '../helpers/Environment';
+import { getSubscriptionType } from '../environment';
 import Log from '../libraries/Log';
-import type { ServerAppConfig } from '../models/AppConfig';
 import type { DeliveryPlatformKindValue } from '../models/DeliveryPlatformKind';
 import {
   OutcomeAttributionType,
@@ -111,7 +111,7 @@ export class OneSignalApiSW {
       notification_ids: attribution.notificationIds,
       subscription: {
         id: subscriptionId,
-        type: Environment.getSubscriptionType(),
+        type: getSubscriptionType(),
       },
       onesignal_id: onesignalId,
     };
diff --git a/src/shared/environment/environment.ts b/src/shared/environment/environment.ts
@@ -1,5 +1,15 @@
+import {
+  SubscriptionType,
+  type SubscriptionTypeValue,
+} from 'src/core/types/subscription';
+import { EnvironmentInfoHelper } from 'src/page/helpers/EnvironmentInfoHelper';
+import {
+  DeliveryPlatformKind,
+  type DeliveryPlatformKindValue,
+} from '../models/DeliveryPlatformKind';
 import { bowserCastle } from '../utils/bowserCastle';
 import { API_ORIGIN, API_TYPE, IS_SERVICE_WORKER } from '../utils/EnvVariables';
+import OneSignalUtils from '../utils/OneSignalUtils';
 import { EnvironmentKind } from './constants';
 
 export const isBrowser = typeof window !== 'undefined';
@@ -61,3 +71,45 @@ const isTurbineEndpoint = (action?: string): boolean => {
     (turbine_endpoint) => action.indexOf(turbine_endpoint) > -1,
   );
 };
+
+export const getSubscriptionType = (): SubscriptionTypeValue => {
+  const browser = OneSignalUtils.redetectBrowserUserAgent();
+  if (browser.firefox) {
+    return SubscriptionType.FirefoxPush;
+  }
+  if (useSafariVapidPush()) {
+    return SubscriptionType.SafariPush;
+  }
+  if (useSafariLegacyPush) {
+    return SubscriptionType.SafariLegacyPush;
+  }
+  // Other browsers, like Edge, are Chromium based so we consider them "Chrome".
+  return SubscriptionType.ChromePush;
+};
+
+/**
+ * Get the legacy player.device_type
+ * NOTE: Use getSubscriptionType() instead when possible.
+ */
+export function getDeviceType(): DeliveryPlatformKindValue {
+  switch (getSubscriptionType()) {
+    case SubscriptionType.FirefoxPush:
+      return DeliveryPlatformKind.Firefox;
+    case SubscriptionType.SafariLegacyPush:
+      return DeliveryPlatformKind.SafariLegacy;
+    case SubscriptionType.SafariPush:
+      return DeliveryPlatformKind.SafariVapid;
+  }
+  return DeliveryPlatformKind.ChromeLike;
+}
+
+export function getDeviceOS(): string {
+  const environment = EnvironmentInfoHelper.getEnvironmentInfo();
+  return String(
+    isNaN(environment.browserVersion) ? -1 : environment.browserVersion,
+  );
+}
+
+export function getDeviceModel(): string {
+  return navigator.platform;
+}
diff --git a/src/shared/managers/UpdateManager.ts b/src/shared/managers/UpdateManager.ts
@@ -2,8 +2,8 @@ import { NotificationType } from 'src/core/types/subscription';
 import { isCompleteSubscriptionObject } from '../../core/utils/typePredicates';
 import User from '../../onesignal/User';
 import type { OutcomeRequestData } from '../../page/models/OutcomeRequestData';
-import FuturePushSubscriptionRecord from '../../page/userModel/FuturePushSubscriptionRecord';
 import OneSignalApiShared from '../api/OneSignalApiShared';
+import { getSubscriptionType } from '../environment';
 import Log from '../libraries/Log';
 import type { ContextSWInterface } from '../models/ContextSW';
 import { SessionOrigin } from '../models/Session';
@@ -97,7 +97,7 @@ export class UpdateManager {
         direct: true,
         subscription: {
           id: pushSubscriptionModel.id,
-          type: FuturePushSubscriptionRecord.getSubscriptionType(),
+          type: getSubscriptionType(),
         },
       };
       if (value !== undefined) {
@@ -132,7 +132,7 @@ export class UpdateManager {
         direct: false,
         subscription: {
           id: pushSubscriptionModel.id,
-          type: FuturePushSubscriptionRecord.getSubscriptionType(),
+          type: getSubscriptionType(),
         },
       };
       if (value !== undefined) {
@@ -164,7 +164,7 @@ export class UpdateManager {
         app_id: appId,
         subscription: {
           id: pushSubscriptionModel.id,
-          type: FuturePushSubscriptionRecord.getSubscriptionType(),
+          type: getSubscriptionType(),
         },
       };
       if (value !== undefined) {
diff --git a/src/sw/serviceWorker/ServiceWorker.ts b/src/sw/serviceWorker/ServiceWorker.ts
@@ -40,8 +40,11 @@ import {
   NotificationType,
   type NotificationTypeValue,
 } from 'src/core/types/subscription';
-import type { AppConfig } from 'src/shared/models/AppConfig';
+import { type AppConfig, getServerAppConfig } from 'src/shared/config';
+import { getDeviceType } from 'src/shared/environment';
+import ContextSW from 'src/shared/models/ContextSW';
 import type { DeliveryPlatformKindValue } from 'src/shared/models/DeliveryPlatformKind';
+import { VERSION } from 'src/shared/utils/EnvVariables';
 import { bowserCastle } from '../../shared/utils/bowserCastle';
 import { ModelCacheDirectAccess } from '../helpers/ModelCacheDirectAccess';
 import { OSNotificationButtonsConverter } from '../models/OSNotificationButtonsConverter';
@@ -349,7 +352,7 @@ export class ServiceWorker {
     const postData = {
       player_id: pushSubscriptionId,
       app_id: appId,
-      device_type: Environment.getDeviceType(),
+      device_type: getDeviceType(),
     };
 
     Log.debug(
@@ -791,7 +794,7 @@ export class ServiceWorker {
     const notificationOpensLink: boolean =
       ServiceWorker.shouldOpenNotificationUrl(launchUrl);
     const appId = await ServiceWorker.getAppId();
-    const deviceType = Environment.getDeviceType();
+    const deviceType = getDeviceType();
 
     const notificationClickEvent: NotificationClickEventInternal = {
       notification: osNotification,
@@ -1041,7 +1044,7 @@ export class ServiceWorker {
         // We don't have the device ID stored, but we can look it up from our old subscription
         deviceId = await OneSignalApiSW.getUserIdFromSubscriptionIdentifier(
           appId,
-          Environment.getDeviceType(),
+          getDeviceType(),
           event.oldSubscription.endpoint,
         );
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export interface ICustomEventController {`
`11`	`11`
`12`	`12`	`export interface ICustomEventMetadata {`
`13`	`13`	`device_model: string;`
`14`		`- device_os: number;`
	`14`	`+ device_os: string;`
`15`	`15`	`sdk: string;`
`16`	`16`	`type: SubscriptionTypeValue;`
`17`	`17`	`}`