Merge pull request #1146 from OneSignal/clean/player_references

Cleanup player references

__test__/support/environment/TestContext.ts

@@ -184,9 +184,6 @@ export default class TestContext {
           enable: true,
           mixpanel_reporting_token: '7c2582e45a6ecf1501aa3ca7887f3673',
         },
-        email: {
-          require_auth: true,
-        },
         web_on_focus_enabled: true,
         session_threshold: 30,
       },

__test__/support/environment/TestEnvironment.ts

@@ -1,10 +1,8 @@
-import SdkEnvironment from '../../../src/shared/managers/SdkEnvironment';
 import {
   AppUserConfig,
   ConfigIntegrationKind,
   ServerAppConfig,
 } from '../../../src/shared/models/AppConfig';
-import { TestEnvironmentKind } from '../../../src/shared/models/TestEnvironmentKind';
 import BrowserUserAgent from '../models/BrowserUserAgent';
 import {
   resetDatabase,
@@ -72,8 +70,6 @@ export class TestEnvironment {
       );
     }
 
-    SdkEnvironment.getTestEnv = () => TestEnvironmentKind.UnitTesting;
-
     await stubDomEnvironment(config);
     config.environment = 'dom';
     stubNotification(config);

__test__/support/helpers/sdkVersion.ts

@@ -1,11 +1,11 @@
 export function expectHeaderToBeSent() {
-  expect(window.fetch).toHaveBeenCalledWith(
-    expect.any(String),
-    expect.objectContaining({
-      headers: expect.objectContaining({
-        // made undercase automatically
-        'sdk-version': expect.stringMatching(/onesignal\/web\/[0-9]+[0-9]+/),
-      }),
-    }),
-  );
+  jest.mocked(window.fetch).mock.calls.forEach((params) => {
+    expect(typeof params[0]).toBe('string');
+
+    const requestInit = params[1] as RequestInit;
+    const headers = requestInit.headers as Headers;
+    expect(headers.get('sdk-version')).toMatch(
+      new RegExp(/^onesignal\/web\/[0-9]{6}$/),
+    );
+  });
 }

__test__/support/mocks/models/MockServiceWorker.ts

@@ -2,7 +2,6 @@ import NotImplementedError from '../../../../src/shared/errors/NotImplementedErr
 
 export class MockServiceWorker implements ServiceWorker {
   scriptURL: string;
-  state: ServiceWorkerState;
 
   constructor() {}
 

src/core/CoreModuleDirector.ts

@@ -177,6 +177,11 @@ export class CoreModuleDirector {
     };
   }
 
+  public async hasEmail(): Promise<boolean> {
+    const emails = await this.getEmailSubscriptionModels();
+    return Object.keys(emails).length > 0;
+  }
+
   public getSmsSubscriptionModels(): {
     [key: string]: OSModel<SupportedSubscription>;
   } {
@@ -187,6 +192,11 @@ export class CoreModuleDirector {
     };
   }
 
+  public async hasSms(): Promise<boolean> {
+    const smsModels = await this.getSmsSubscriptionModels();
+    return Object.keys(smsModels).length > 0;
+  }
+
   /**
    * Returns all push subscription models, including push subscriptions from other browsers.
    */

src/core/models/SubscriptionModels.ts

@@ -3,20 +3,13 @@ import { SubscriptionStateKind } from '../../shared/models/SubscriptionStateKind
 export type SupportedSubscription = SubscriptionModel | FutureSubscriptionModel;
 
 export enum SubscriptionType {
-  iOS = 'iOS',
-  Android = 'Android',
-  FireOS = 'FireOS',
-  ChromeExtension = 'ChromeExtension',
   ChromePush = 'ChromePush',
-  WindowPush = 'WindowPush',
   SafariPush = 'SafariPush',
   SafariLegacyPush = 'SafariLegacyPush',
   FirefoxPush = 'FirefoxPush',
-  HuaweiPush = 'HuaweiPush',
-  macOSPush = 'macOSPush',
-  AlexaPush = 'AlexaPush',
   Email = 'Email',
   SMS = 'SMS',
+  // There are other OneSignal types, but only including ones used here.
 }
 
 export interface FutureSubscriptionModel {

src/onesignal/OneSignal.ts

@@ -13,7 +13,6 @@ import Emitter from '../shared/libraries/Emitter';
 import Log from '../shared/libraries/Log';
 import SdkEnvironment from '../shared/managers/SdkEnvironment';
 import { AppUserConfig, AppConfig } from '../shared/models/AppConfig';
-import { DeviceRecord } from '../shared/models/DeviceRecord';
 import { AppUserConfigNotifyButton } from '../shared/models/Prompts';
 import Database from '../shared/services/Database';
 import { logMethodCall } from '../shared/utils/utils';
@@ -293,7 +292,6 @@ export default class OneSignal {
   static _initCalled = false;
   static __initAlreadyCalled = false;
   static context: Context;
-  static DeviceRecord = DeviceRecord;
 
   /* NEW USER MODEL CHANGES */
   static coreDirector: CoreModuleDirector;

src/onesignal/OneSignalEvents.ts

@@ -54,14 +54,6 @@ export const ONESIGNAL_EVENTS = {
    * Occurs when the native permission prompt is displayed.
    */
   PERMISSION_PROMPT_DISPLAYED: 'permissionPromptDisplay',
-  /**
-   * Occurs when the email subscription changes
-   */
-  EMAIL_SUBSCRIPTION_CHANGED: 'emailSubscriptionChanged',
-  /**
-   * Occurs when the SMS subscription changes
-   */
-  SMS_SUBSCRIPTION_CHANGED: 'smsSubscriptionChanged',
   /**
    * For internal testing only. Used for all sorts of things.
    */