remove all proxy frame classes

src/onesignal/OneSignal.ts

@@ -2,12 +2,6 @@ import { EnvironmentInfoHelper } from '../page/helpers/EnvironmentInfoHelper';
 import ConfigManager from '../page/managers/ConfigManager';
 import Context from '../page/models/Context';
 import { EnvironmentInfo } from '../page/models/EnvironmentInfo';
-import ProxyFrame from '../page/modules/frames/ProxyFrame';
-import ProxyFrameHost from '../page/modules/frames/ProxyFrameHost';
-import SubscriptionModal from '../page/modules/frames/SubscriptionModal';
-import SubscriptionModalHost from '../page/modules/frames/SubscriptionModalHost';
-import SubscriptionPopup from '../page/modules/frames/SubscriptionPopup';
-import SubscriptionPopupHost from '../page/modules/frames/SubscriptionPopupHost';
 import TimedLocalStorage from '../page/modules/TimedLocalStorage';
 import { ProcessOneSignalPushCalls } from '../page/utils/ProcessOneSignalPushCalls';
 import { SdkInitError, SdkInitErrorKind } from '../shared/errors/SdkInitError';
@@ -297,12 +291,6 @@ export default class OneSignal {
   static event = OneSignalEvent;
   private static pendingInit = true;
 
-  static subscriptionPopup: SubscriptionPopup;
-  static subscriptionPopupHost: SubscriptionPopupHost;
-  static subscriptionModal: SubscriptionModal;
-  static subscriptionModalHost: SubscriptionModalHost;
-  static proxyFrameHost: ProxyFrameHost;
-  static proxyFrame: ProxyFrame;
   static emitter: Emitter = new Emitter();
   static cache: any = {};
   static _LOGGING = false;
@@ -321,12 +309,6 @@ export default class OneSignal {
   static Debug = new DebugNamespace();
   /* END NEW USER MODEL CHANGES */
 
-  /**
-   * Used by Rails-side HTTP popup. Must keep the same name.
-   * @InternalApi
-   */
-  static _initPopup = () => OneSignal.subscriptionPopup.subscribe();
-
   static POSTMAM_COMMANDS = {
     CONNECTED: 'connect',
     REMOTE_NOTIFICATION_PERMISSION: 'postmam.remoteNotificationPermission',

src/onesignal/OneSignalEvents.ts

@@ -1,10 +1,4 @@
 export const ONESIGNAL_EVENTS = {
-  /**
-   * Occurs when the user clicks the "Continue" or "No Thanks" button on the HTTP popup or HTTPS modal prompt.
-   * For HTTP sites (and HTTPS sites using the modal prompt), this event is fired before the native permission
-   * prompt is shown. This event is mostly used for HTTP sites.
-   */
-  CUSTOM_PROMPT_CLICKED: 'customPromptClick',
   /**
    * Occurs immediately when the notification permission changes for the domain at the browser level.
    * This normally happens when the user clicks "Allow" or "Block" on the native permission prompt

src/page/managers/slidedownManager/SlidedownManager.ts

@@ -24,9 +24,7 @@ import PushPermissionNotGrantedError, {
   PushPermissionNotGrantedErrorReason,
 } from '../../../shared/errors/PushPermissionNotGrantedError';
 import { DismissHelper } from '../../../shared/helpers/DismissHelper';
-import InitHelper, {
-  RegisterOptions,
-} from '../../../shared/helpers/InitHelper';
+import InitHelper from '../../../shared/helpers/InitHelper';
 import PromptsHelper from '../../../shared/helpers/PromptsHelper';
 import Log from '../../../shared/libraries/Log';
 import { DelayedPromptType } from '../../../shared/models/Prompts';
@@ -135,9 +133,7 @@ export class SlidedownManager {
   }
 
   private registerForPush(): void {
-    const autoAccept = !OneSignal.environmentInfo.requiresUserInteraction;
-    const options: RegisterOptions = { autoAccept, slidedown: true };
-    InitHelper.registerForPushNotifications(options);
+    InitHelper.registerForPushNotifications();
   }
 
   private async handleAllowForCategoryType(): Promise<void> {

src/shared/helpers/InitHelper.ts

@@ -4,15 +4,11 @@ import { AppConfig } from '../models/AppConfig';
 import MainHelper from './MainHelper';
 import SubscriptionHelper from './SubscriptionHelper';
 import { SdkInitError, SdkInitErrorKind } from '../errors/SdkInitError';
-import { WorkerMessengerCommand } from '../libraries/WorkerMessenger';
 import { SubscriptionStrategyKind } from '../models/SubscriptionStrategyKind';
-import { Subscription } from '../models/Subscription';
 import Log from '../libraries/Log';
 import { CustomLinkManager } from '../managers/CustomLinkManager';
 import Bell from '../../page/bell/Bell';
 import { ContextInterface } from '../../page/models/Context';
-import SubscriptionModalHost from '../../page/modules/frames/SubscriptionModalHost';
-import SubscriptionPopupHost from '../../page/modules/frames/SubscriptionPopupHost';
 import { DynamicResourceLoader } from '../../page/services/DynamicResourceLoader';
 import Database from '../services/Database';
 import LimitStore from '../services/LimitStore';
@@ -23,11 +19,6 @@ import { bowserCastle } from '../utils/bowserCastle';
 
 declare let OneSignal: any;
 
-export interface RegisterOptions extends SubscriptionPopupHostOptions {
-  modalPrompt?: boolean;
-  slidedown?: boolean;
-}
-
 export default class InitHelper {
   /** Main methods */
 
@@ -110,21 +101,7 @@ export default class InitHelper {
     await OneSignalEvent.trigger(OneSignal.EVENTS.SDK_INITIALIZED);
   }
 
-  // In-Addition to registering for push, this shows a native browser
-  // notification permission prompt, if needed.
-  public static async registerForPushNotifications(
-    options: RegisterOptions = {},
-  ): Promise<void> {
-    if (options && options.modalPrompt) {
-      /* Show the HTTPS fullscreen modal permission message. */
-      OneSignal.subscriptionModalHost = new SubscriptionModalHost(
-        OneSignal.config.appId,
-        options,
-      );
-      await OneSignal.subscriptionModalHost.load();
-      return;
-    }
-
+  public static async registerForPushNotifications(): Promise<void> {
     await SubscriptionHelper.registerForPush();
   }
 
@@ -164,23 +141,6 @@ export default class InitHelper {
     await OneSignalEvent.trigger(OneSignal.EVENTS.SDK_INITIALIZED_PUBLIC);
   }
 
-  public static async loadSubscriptionPopup(
-    options?: SubscriptionPopupHostOptions,
-  ) {
-    /**
-     * Users may be subscribed to either .onesignal.com or .os.tc. By this time
-     * that they are subscribing to the popup, the Proxy Frame has already been
-     * loaded and the user's subscription status has been obtained. We can then
-     * use the Proxy Frame present now and check its URL to see whether the user
-     * is finally subscribed to .onesignal.com or .os.tc.
-     */
-    OneSignal.subscriptionPopupHost = new SubscriptionPopupHost(
-      OneSignal.proxyFrameHost.url,
-      options,
-    );
-    await OneSignal.subscriptionPopupHost.load();
-  }
-
   /** Helper methods */
 
   public static async storeInitialValues() {
@@ -249,25 +209,6 @@ export default class InitHelper {
     return true;
   }
 
-  public static async registerSubscriptionInProxyFrame(
-    context: ContextInterface,
-  ): Promise<Subscription> {
-    const newSubscription = await new Promise<Subscription>((resolve) => {
-      context.workerMessenger.once(
-        WorkerMessengerCommand.SubscribeNew,
-        (subscription) => {
-          resolve(Subscription.deserialize(subscription));
-        },
-      );
-      context.workerMessenger.unicast(
-        WorkerMessengerCommand.SubscribeNew,
-        context.appConfig,
-      );
-    });
-    Log.debug('Finished registering brand new subscription:', newSubscription);
-    return newSubscription;
-  }
-
   public static async doInitialize(): Promise<void> {
     const promises: Promise<void>[] = [];
 

src/shared/helpers/MainHelper.ts

@@ -166,12 +166,6 @@ export default class MainHelper {
     return hash;
   }
 
-  static triggerCustomPromptClicked(clickResult) {
-    OneSignalEvent.trigger(OneSignal.EVENTS.CUSTOM_PROMPT_CLICKED, {
-      result: clickResult,
-    });
-  }
-
   static async getAppId(): Promise<string> {
     if (OneSignal.config.appId) {
       return Promise.resolve(OneSignal.config.appId);

src/shared/managers/CustomLinkManager.ts

@@ -4,7 +4,6 @@ import {
   CUSTOM_LINK_CSS_SELECTORS,
 } from '../slidedown/constants';
 import { addCssClass } from '../utils/utils';
-import InitHelper, { RegisterOptions } from '../helpers/InitHelper';
 import Log from '../libraries/Log';
 import { AppUserConfigCustomLinkOptions } from '../models/Prompts';
 

src/shared/managers/ServiceWorkerManager.ts

@@ -6,7 +6,6 @@ import Database from '../services/Database';
 import { WindowEnvironmentKind } from '../models/WindowEnvironmentKind';
 import Log from '../libraries/Log';
 import OneSignalEvent from '../services/OneSignalEvent';
-import ProxyFrame from '../../page/modules/frames/ProxyFrame';
 import ServiceWorkerRegistrationError from '../errors/ServiceWorkerRegistrationError';
 import OneSignalUtils from '../utils/OneSignalUtils';
 import ServiceWorkerHelper, {
@@ -321,19 +320,6 @@ export class ServiceWorkerManager {
       },
     );
 
-    workerMessenger.on(WorkerMessengerCommand.RedirectPage, (data) => {
-      Log.debug(
-        `${SdkEnvironment.getWindowEnv().toString()} Picked up command.redirect to ${data}, forwarding to host page.`,
-      );
-      const proxyFrame: ProxyFrame = OneSignal.proxyFrame;
-      if (proxyFrame) {
-        proxyFrame.messenger.message(
-          OneSignal.POSTMAM_COMMANDS.SERVICEWORKER_COMMAND_REDIRECT,
-          data,
-        );
-      }
-    });
-
     workerMessenger.on(
       WorkerMessengerCommand.NotificationDismissed,
       async (data) => {
@@ -361,17 +347,6 @@ export class ServiceWorkerManager {
             WorkerMessengerCommand.AreYouVisibleResponse,
             payload,
           );
-        } else {
-          const httpPayload: PageVisibilityRequest = {
-            timestamp: incomingPayload.timestamp,
-          };
-          const proxyFrame: ProxyFrame | undefined = OneSignal.proxyFrame;
-          if (proxyFrame) {
-            proxyFrame.messenger.message(
-              OneSignal.POSTMAM_COMMANDS.ARE_YOU_VISIBLE_REQUEST,
-              httpPayload,
-            );
-          }
         }
       },
     );