react-onesignal 3.0.1 → 3.2.0

package/index.ts

@@ -110,16 +110,16 @@ const init = (options: IInitObject): Promise<void> => {
   });
 };
 
-interface AutoPromptOptions { force?: boolean; forceSlidedownOverNative?: boolean; slidedownPromptOptions?: IOneSignalAutoPromptOptions; }
-interface IOneSignalAutoPromptOptions { force?: boolean; forceSlidedownOverNative?: boolean; isInUpdateMode?: boolean; categoryOptions?: IOneSignalCategories; }
-interface IOneSignalCategories { positiveUpdateButton: string; negativeUpdateButton: string; savingButtonText: string; errorButtonText: string; updateMessage: string; tags: IOneSignalTagCategory[]; }
-interface IOneSignalTagCategory { tag: string; label: string; checked?: boolean; }
-type PushSubscriptionNamespaceProperties = { id: string | null | undefined; token: string | null | undefined; optedIn: boolean; };
-type SubscriptionChangeEvent = { previous: PushSubscriptionNamespaceProperties; current: PushSubscriptionNamespaceProperties; };
-type NotificationEventName = 'click' | 'foregroundWillDisplay' | 'dismiss' | 'permissionChange' | 'permissionPromptDisplay';
-type SlidedownEventName = 'slidedownShown';
-type OneSignalDeferredLoadedCallback = (onesignal: IOneSignalOneSignal) => void;
-interface IOSNotification {
+export interface AutoPromptOptions { force?: boolean; forceSlidedownOverNative?: boolean; slidedownPromptOptions?: IOneSignalAutoPromptOptions; }
+export interface IOneSignalAutoPromptOptions { force?: boolean; forceSlidedownOverNative?: boolean; isInUpdateMode?: boolean; categoryOptions?: IOneSignalCategories; }
+export interface IOneSignalCategories { positiveUpdateButton: string; negativeUpdateButton: string; savingButtonText: string; errorButtonText: string; updateMessage: string; tags: IOneSignalTagCategory[]; }
+export interface IOneSignalTagCategory { tag: string; label: string; checked?: boolean; }
+export type PushSubscriptionNamespaceProperties = { id: string | null | undefined; token: string | null | undefined; optedIn: boolean; };
+export type SubscriptionChangeEvent = { previous: PushSubscriptionNamespaceProperties; current: PushSubscriptionNamespaceProperties; };
+export type NotificationEventName = 'click' | 'foregroundWillDisplay' | 'dismiss' | 'permissionChange' | 'permissionPromptDisplay';
+export type SlidedownEventName = 'slidedownShown';
+export type OneSignalDeferredLoadedCallback = (onesignal: IOneSignalOneSignal) => void;
+export interface IOSNotification {
   /**
    * The OneSignal notification id;
    *  - Primary id on OneSignal's REST API and dashboard
@@ -161,7 +161,7 @@ interface IOSNotification {
    * If this value is the same as existing notification, it will replace it
    * Can be set when creating the notification with "Web Push Topic" on the dashboard
    * or web_push_topic from the REST API.
-  */
+   */
   readonly topic?: string;
 
   /**
@@ -181,7 +181,7 @@ interface IOSNotification {
   readonly confirmDelivery: boolean;
 }
 
-interface IOSNotificationActionButton {
+export interface IOSNotificationActionButton {
   /**
    * Any unique identifier to represent which button was clicked. This is typically passed back to the service worker
    * and host page through events to identify which button was clicked.
@@ -202,56 +202,246 @@ interface IOSNotificationActionButton {
   readonly launchURL?: string;
 }
 
-interface NotificationClickResult {
+export interface NotificationClickResult {
   readonly actionId?: string;
   readonly url?: string;
 }
 
-type NotificationEventTypeMap = {
+export type NotificationEventTypeMap = {
   'click': NotificationClickEvent;
   'foregroundWillDisplay': NotificationForegroundWillDisplayEvent;
   'dismiss': NotificationDismissEvent;
   'permissionChange': boolean;
   'permissionPromptDisplay': void;
-}
+};
 
-interface NotificationForegroundWillDisplayEvent {
+export interface NotificationForegroundWillDisplayEvent {
   readonly notification: IOSNotification;
   preventDefault(): void;
 }
 
-interface NotificationDismissEvent {
+export interface NotificationDismissEvent {
   notification: IOSNotification;
 }
 
-interface NotificationClickEvent {
+export interface NotificationClickEvent {
   readonly notification: IOSNotification;
   readonly result: NotificationClickResult;
 }
 
+export type UserChangeEvent = {
+  current: UserNamespaceProperties;
+};
+export type UserNamespaceProperties = {
+  onesignalId: string | undefined;
+  externalId: string | undefined;
+};
 
-interface IInitObject {
+export interface IInitObject {
   appId: string;
   subdomainName?: string;
   requiresUserPrivacyConsent?: boolean;
-  promptOptions?: object;
-  welcomeNotification?: object;
-  notifyButton?: object;
+  promptOptions?: {
+    slidedown: {
+      prompts: {
+        /**
+         * Whether to automatically display the prompt.
+         * `true` will display the prompt based on the delay options.
+         * `false` will prevent the prompt from displaying until the Slidedowns methods are used.
+         */
+        autoPrompt: boolean;
+
+        /**
+         * Only available for type: category. Up to 10 categories.
+         * @example
+         *  categories: [{ tag: 'local_news', label: 'Local News' }] // The user will be tagged with local_news but will see "Local News" in the prompt.
+         */
+        categories: {
+          /** Should identify the action. */
+          tag: string;
+
+          /** What the user will see. */
+          label: string;
+        }[];
+
+        /**
+         * The delay options for the prompt.
+         * @example delay: { pageViews: 3, timeDelay: 20 } // The user will not be shown the prompt until 20 seconds after the 3rd page view.
+         */
+        delay: {
+          /** The number of pages a user needs to visit before the prompt is displayed. */
+          pageViews?: number;
+
+          /** The number of seconds a user needs to wait before the prompt is displayed.Both options must be satisfied for the prompt to display */
+          timeDelay?: number;
+        };
+
+        /**
+         * The text to display in the prompt.
+         */
+        text?: {
+          /** The callout asking the user to opt-in. Up to 90 characters. */
+          actionMessage?: string;
+
+          /** Triggers the opt-in. Up to 15 characters. */
+          acceptButton?: string;
+
+          /** Cancels opt-in. Up to 15 characters. */
+          cancelMessage?: string;
+
+          /** The message of the confirmation prompt displayed after the email and/or phone number is provided. Up to 90 characters. */
+          confirmMessage?: string;
+
+          /** Identifies the email text field. Up to 15 characters. */
+          emailLabel?: string;
+
+          /** Cancels the category update. Up to 15 characters. */
+          negativeUpdateButton?: string;
+
+          /** Saves the updated category tags. Up to 15 characters. */
+          positiveUpdateButton?: string;
+
+          /** Identifies the phone number text field. Up to 15 characters. */
+          smsLabel?: string;
+
+          /** A different message shown to subscribers presented the prompt again to update categories. Up to 90 characters. */
+          updateMessage?: string;
+        };
+
+        /**
+         * The type of prompt to display.
+         * `push` which is the Slide Prompt without categories.
+         * `category` which is the Slide Prompt with categories.
+         * `sms` only asks for phone number.
+         * `email` only asks for email address.
+         * `smsAndEmail` asks for both phone number and email address.
+         */
+        type: 'push' | 'category' | 'sms' | 'email' | 'smsAndEmail';
+      }[];
+    };
+  };
+  welcomeNotification?: {
+    /**
+     * Disables sending a welcome notification to new site visitors. If you want to disable welcome notifications, this is the only option you need.
+     */
+    disabled?: boolean;
+
+    /**
+     * The welcome notification's message. You can localize this to your own language.
+     * If left blank or set to blank, the default of 'Thanks for subscribing!' will be used.
+     */
+    message: string;
+
+    /**
+     * The welcome notification's title. You can localize this to your own language. If not set, or left blank, the site's title will be used.
+     * Set to one space ' ' to clear the title, although this is not recommended.
+     */
+    title?: string;
+
+    /**
+     * By default, clicking the welcome notification does not open any link.
+     * This is recommended because the user has just visited your site and subscribed.
+     */
+    url: string;
+  };
+
+  /**
+   * Will enable customization of the notify/subscription bell button.
+   */
+  notifyButton?: {
+    /**
+     * A function you define that returns true to show the Subscription Bell, or false to hide it.
+     * Typically used the hide the Subscription Bell after the user is subscribed.
+     * This function is not re-evaluated on every state change; this function is only evaluated once when the Subscription Bell begins to show.
+     */
+    displayPredicate?: () => boolean | Promise<boolean>;
+
+    /**
+     * Enable the Subscription Bell. The Subscription Bell is otherwise disabled by default.
+     */
+    enable?: boolean;
+
+    /** Specify CSS-valid pixel offsets using bottom, left, and right. */
+    offset?: { bottom: string; left: string; right: string };
+
+    /**
+     * If `true`, the Subscription Bell will display an icon that there is 1 unread message.
+     * When hovering over the Subscription Bell, the user will see custom text set by message.prenotify.
+     */
+    prenotify: boolean;
+
+    /** Either `bottom-left` or `bottom-right`. The Subscription Bell will be fixed at this location on your page. */
+    position?: 'bottom-left' | 'bottom-right';
+
+    /**  Set `false` to hide the 'Powered by OneSignal' text in the Subscription Bell dialog popup. */
+    showCredit: boolean;
+
+    /**
+     * The Subscription Bell will initially appear at one of these sizes, and then shrink down to size `small` after the user subscribes.
+     */
+    size?: 'small' | 'medium' | 'large';
+
+    /** Customize the Subscription Bell text. */
+    text: {
+      'dialog.blocked.message': string;
+      'dialog.blocked.title': string;
+      'dialog.main.button.subscribe': string;
+      'dialog.main.button.unsubscribe': string;
+      'dialog.main.title': string;
+      'message.action.resubscribed': string;
+      'message.action.subscribed': string;
+      'message.action.subscribing': string;
+      'message.action.unsubscribed': string;
+      'message.prenotify': string;
+      'tip.state.blocked': string;
+      'tip.state.subscribed': string;
+      'tip.state.unsubscribed': string;
+    };
+  };
+
   persistNotification?: boolean;
-  webhooks?: object;
+  webhooks?: {
+    /**
+     * Enable this setting only if your server has CORS enabled and supports non-simple CORS requests.
+     * If this setting is disabled, your webhook will not need CORS to receive data, but it will not receive the custom headers.
+     * The simplest option is to leave it disabled.
+     * @default false
+     */
+    cors: boolean;
+
+    /**
+     * This event occurs after a notification is clicked.
+     * @example https://site.com/hook
+     */
+    'notification.clicked'?: string;
+
+    /**
+     * This event occurs after a notification is intentionally dismissed by the user (clicking the notification body or one of the notification action buttons does not trigger the dismissed webhook),
+     * after a group of notifications are all dismissed (with this notification as part of that group), or after a notification expires on its own time and disappears. This event is supported on Chrome only.
+     * @example https://site.com/hook
+     */
+    'notification.dismissed'?: string;
+
+    /**
+     * This event occurs after a notification is displayed.
+     * @example https://site.com/hook
+     */
+    'notification.willDisplay'?: string;
+  };
   autoResubscribe?: boolean;
   autoRegister?: boolean;
   notificationClickHandlerMatch?: string;
   notificationClickHandlerAction?: string;
+  path?: string;
   serviceWorkerParam?: { scope: string };
   serviceWorkerPath?: string;
+  serviceWorkerOverrideForTypical?: boolean;
   serviceWorkerUpdaterPath?: string;
-  path?: string;
   allowLocalhostAsSecureOrigin?: boolean;
   [key: string]: any;
 }
 
-interface IOneSignalOneSignal {
+export interface IOneSignalOneSignal {
 	Slidedown: IOneSignalSlidedown;
 	Notifications: IOneSignalNotifications;
 	Session: IOneSignalSession;
@@ -263,7 +453,7 @@ interface IOneSignalOneSignal {
 	setConsentGiven(consent: boolean): Promise<void>;
 	setConsentRequired(requiresConsent: boolean): Promise<void>;
 }
-interface IOneSignalNotifications {
+export interface IOneSignalNotifications {
 	permissionNative: NotificationPermission;
 	permission: boolean;
 	setDefaultUrl(url: string): Promise<void>;
@@ -273,7 +463,7 @@ interface IOneSignalNotifications {
 	addEventListener<K extends NotificationEventName>(event: K, listener: (obj: NotificationEventTypeMap[K]) => void): void;
 	removeEventListener<K extends NotificationEventName>(event: K, listener: (obj: NotificationEventTypeMap[K]) => void): void;
 }
-interface IOneSignalSlidedown {
+export interface IOneSignalSlidedown {
 	promptPush(options?: AutoPromptOptions): Promise<void>;
 	promptPushCategories(options?: AutoPromptOptions): Promise<void>;
 	promptSms(options?: AutoPromptOptions): Promise<void>;
@@ -282,14 +472,16 @@ interface IOneSignalSlidedown {
 	addEventListener(event: SlidedownEventName, listener: (wasShown: boolean) => void): void;
 	removeEventListener(event: SlidedownEventName, listener: (wasShown: boolean) => void): void;
 }
-interface IOneSignalDebug {
+export interface IOneSignalDebug {
 	setLogLevel(logLevel: string): void;
 }
-interface IOneSignalSession {
+export interface IOneSignalSession {
 	sendOutcome(outcomeName: string, outcomeWeight?: number): Promise<void>;
 	sendUniqueOutcome(outcomeName: string): Promise<void>;
 }
-interface IOneSignalUser {
+export interface IOneSignalUser {
+	onesignalId: string | undefined;
+	externalId: string | undefined;
 	PushSubscription: IOneSignalPushSubscription;
 	addAlias(label: string, id: string): void;
 	addAliases(aliases: { [key: string]: string }): void;
@@ -303,8 +495,13 @@ interface IOneSignalUser {
 	addTags(tags: { [key: string]: string }): void;
 	removeTag(key: string): void;
 	removeTags(keys: string[]): void;
+	getTags(): { [key: string]: string };
+	addEventListener(event: 'change', listener: (change: UserChangeEvent) => void): void;
+	removeEventListener(event: 'change', listener: (change: UserChangeEvent) => void): void;
+	setLanguage(language: string): void;
+	getLanguage(): string;
 }
-interface IOneSignalPushSubscription {
+export interface IOneSignalPushSubscription {
 	id: string | null | undefined;
 	token: string | null | undefined;
 	optedIn: boolean | undefined;
@@ -313,17 +510,16 @@ interface IOneSignalPushSubscription {
 	addEventListener(event: 'change', listener: (change: SubscriptionChangeEvent) => void): void;
 	removeEventListener(event: 'change', listener: (change: SubscriptionChangeEvent) => void): void;
 }
-
 function oneSignalLogin(externalId: string, jwtToken?: string): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.login(externalId, jwtToken)
-          .then((value: any) => resolve(value))
+        OneSignal.login(externalId, jwtToken).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -331,17 +527,16 @@ function oneSignalLogin(externalId: string, jwtToken?: string): Promise<void> {
     }
   });
 }
-
 function oneSignalLogout(): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.logout()
-          .then((value: any) => resolve(value))
+        OneSignal.logout().then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -349,17 +544,16 @@ function oneSignalLogout(): Promise<void> {
     }
   });
 }
-
 function oneSignalSetConsentGiven(consent: boolean): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.setConsentGiven(consent)
-          .then((value: any) => resolve(value))
+        OneSignal.setConsentGiven(consent).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -367,17 +561,16 @@ function oneSignalSetConsentGiven(consent: boolean): Promise<void> {
     }
   });
 }
-
 function oneSignalSetConsentRequired(requiresConsent: boolean): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.setConsentRequired(requiresConsent)
-          .then((value: any) => resolve(value))
+        OneSignal.setConsentRequired(requiresConsent).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -385,17 +578,16 @@ function oneSignalSetConsentRequired(requiresConsent: boolean): Promise<void> {
     }
   });
 }
-
 function slidedownPromptPush(options?: AutoPromptOptions): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Slidedown.promptPush(options)
-          .then((value: any) => resolve(value))
+        OneSignal.Slidedown.promptPush(options).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -403,17 +595,16 @@ function slidedownPromptPush(options?: AutoPromptOptions): Promise<void> {
     }
   });
 }
-
 function slidedownPromptPushCategories(options?: AutoPromptOptions): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Slidedown.promptPushCategories(options)
-          .then((value: any) => resolve(value))
+        OneSignal.Slidedown.promptPushCategories(options).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -421,17 +612,16 @@ function slidedownPromptPushCategories(options?: AutoPromptOptions): Promise<voi
     }
   });
 }
-
 function slidedownPromptSms(options?: AutoPromptOptions): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Slidedown.promptSms(options)
-          .then((value: any) => resolve(value))
+        OneSignal.Slidedown.promptSms(options).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -439,17 +629,16 @@ function slidedownPromptSms(options?: AutoPromptOptions): Promise<void> {
     }
   });
 }
-
 function slidedownPromptEmail(options?: AutoPromptOptions): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Slidedown.promptEmail(options)
-          .then((value: any) => resolve(value))
+        OneSignal.Slidedown.promptEmail(options).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -457,17 +646,16 @@ function slidedownPromptEmail(options?: AutoPromptOptions): Promise<void> {
     }
   });
 }
-
 function slidedownPromptSmsAndEmail(options?: AutoPromptOptions): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Slidedown.promptSmsAndEmail(options)
-          .then((value: any) => resolve(value))
+        OneSignal.Slidedown.promptSmsAndEmail(options).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -475,29 +663,30 @@ function slidedownPromptSmsAndEmail(options?: AutoPromptOptions): Promise<void>
     }
   });
 }
-
 function slidedownAddEventListener(event: SlidedownEventName, listener: (wasShown: boolean) => void): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.Slidedown.addEventListener(event, listener)
+    OneSignal.Slidedown.addEventListener(event, listener);
   });
+  
 }
-
 function slidedownRemoveEventListener(event: SlidedownEventName, listener: (wasShown: boolean) => void): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.Slidedown.removeEventListener(event, listener)
+    OneSignal.Slidedown.removeEventListener(event, listener);
   });
+  
 }
-
 function notificationsSetDefaultUrl(url: string): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Notifications.setDefaultUrl(url)
-          .then((value: any) => resolve(value))
+        OneSignal.Notifications.setDefaultUrl(url).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -505,17 +694,16 @@ function notificationsSetDefaultUrl(url: string): Promise<void> {
     }
   });
 }
-
 function notificationsSetDefaultTitle(title: string): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Notifications.setDefaultTitle(title)
-          .then((value: any) => resolve(value))
+        OneSignal.Notifications.setDefaultTitle(title).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -523,17 +711,16 @@ function notificationsSetDefaultTitle(title: string): Promise<void> {
     }
   });
 }
-
 function notificationsRequestPermission(): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Notifications.requestPermission()
-          .then((value: any) => resolve(value))
+        OneSignal.Notifications.requestPermission().then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -541,29 +728,30 @@ function notificationsRequestPermission(): Promise<void> {
     }
   });
 }
-
 function notificationsAddEventListener<K extends NotificationEventName>(event: K, listener: (obj: NotificationEventTypeMap[K]) => void): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.Notifications.addEventListener(event, listener)
+    OneSignal.Notifications.addEventListener(event, listener);
   });
+  
 }
-
 function notificationsRemoveEventListener<K extends NotificationEventName>(event: K, listener: (obj: NotificationEventTypeMap[K]) => void): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.Notifications.removeEventListener(event, listener)
+    OneSignal.Notifications.removeEventListener(event, listener);
   });
+  
 }
-
 function sessionSendOutcome(outcomeName: string, outcomeWeight?: number): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Session.sendOutcome(outcomeName, outcomeWeight)
-          .then((value: any) => resolve(value))
+        OneSignal.Session.sendOutcome(outcomeName, outcomeWeight).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -571,17 +759,16 @@ function sessionSendOutcome(outcomeName: string, outcomeWeight?: number): Promis
     }
   });
 }
-
 function sessionSendUniqueOutcome(outcomeName: string): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.Session.sendUniqueOutcome(outcomeName)
-          .then((value: any) => resolve(value))
+        OneSignal.Session.sendUniqueOutcome(outcomeName).then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -589,89 +776,135 @@ function sessionSendUniqueOutcome(outcomeName: string): Promise<void> {
     }
   });
 }
-
 function userAddAlias(label: string, id: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.addAlias(label, id)
+    OneSignal.User.addAlias(label, id);
   });
+  
 }
-
 function userAddAliases(aliases: { [key: string]: string }): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.addAliases(aliases)
+    OneSignal.User.addAliases(aliases);
   });
+  
 }
-
 function userRemoveAlias(label: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.removeAlias(label)
+    OneSignal.User.removeAlias(label);
   });
+  
 }
-
 function userRemoveAliases(labels: string[]): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.removeAliases(labels)
+    OneSignal.User.removeAliases(labels);
   });
+  
 }
-
 function userAddEmail(email: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.addEmail(email)
+    OneSignal.User.addEmail(email);
   });
+  
 }
-
 function userRemoveEmail(email: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.removeEmail(email)
+    OneSignal.User.removeEmail(email);
   });
+  
 }
-
 function userAddSms(smsNumber: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.addSms(smsNumber)
+    OneSignal.User.addSms(smsNumber);
   });
+  
 }
-
 function userRemoveSms(smsNumber: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.removeSms(smsNumber)
+    OneSignal.User.removeSms(smsNumber);
   });
+  
 }
-
 function userAddTag(key: string, value: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.addTag(key, value)
+    OneSignal.User.addTag(key, value);
   });
+  
 }
-
 function userAddTags(tags: { [key: string]: string }): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.addTags(tags)
+    OneSignal.User.addTags(tags);
   });
+  
 }
-
 function userRemoveTag(key: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.removeTag(key)
+    OneSignal.User.removeTag(key);
   });
+  
 }
-
 function userRemoveTags(keys: string[]): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.removeTags(keys)
+    OneSignal.User.removeTags(keys);
   });
+  
+}
+function userGetTags(): { [key: string]: string } {
+  let retVal: { [key: string]: string };
+  window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
+    retVal = OneSignal.User.getTags();
+  });
+  return retVal;
+}
+function userAddEventListener(event: 'change', listener: (change: UserChangeEvent) => void): void {
+  
+  window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
+    OneSignal.User.addEventListener(event, listener);
+  });
+  
+}
+function userRemoveEventListener(event: 'change', listener: (change: UserChangeEvent) => void): void {
+  
+  window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
+    OneSignal.User.removeEventListener(event, listener);
+  });
+  
+}
+function userSetLanguage(language: string): void {
+  
+  window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
+    OneSignal.User.setLanguage(language);
+  });
+  
+}
+function userGetLanguage(): string {
+  let retVal: string;
+  window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
+    retVal = OneSignal.User.getLanguage();
+  });
+  return retVal;
 }
-
 function pushSubscriptionOptIn(): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.User.PushSubscription.optIn()
-          .then((value: any) => resolve(value))
+        OneSignal.User.PushSubscription.optIn().then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -679,17 +912,16 @@ function pushSubscriptionOptIn(): Promise<void> {
     }
   });
 }
-
 function pushSubscriptionOptOut(): Promise<void> {
   return new Promise((resolve, reject) => {
     if (isOneSignalScriptFailed) {
-      reject();
+      reject(new Error('OneSignal script failed to load.'));
+      return;
     }
 
     try {
       window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-        OneSignal.User.PushSubscription.optOut()
-          .then((value: any) => resolve(value))
+        OneSignal.User.PushSubscription.optOut().then(() => resolve())
           .catch((error: any) => reject(error));
       });
     } catch (error) {
@@ -697,28 +929,31 @@ function pushSubscriptionOptOut(): Promise<void> {
     }
   });
 }
-
 function pushSubscriptionAddEventListener(event: 'change', listener: (change: SubscriptionChangeEvent) => void): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.PushSubscription.addEventListener(event, listener)
+    OneSignal.User.PushSubscription.addEventListener(event, listener);
   });
+  
 }
-
 function pushSubscriptionRemoveEventListener(event: 'change', listener: (change: SubscriptionChangeEvent) => void): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.User.PushSubscription.removeEventListener(event, listener)
+    OneSignal.User.PushSubscription.removeEventListener(event, listener);
   });
+  
 }
-
 function debugSetLogLevel(logLevel: string): void {
+  
   window.OneSignalDeferred?.push((OneSignal: IOneSignalOneSignal) => {
-    OneSignal.Debug.setLogLevel(logLevel)
+    OneSignal.Debug.setLogLevel(logLevel);
   });
+  
 }
 const PushSubscriptionNamespace: IOneSignalPushSubscription = {
-	get id(): string | null | undefined { return window.OneSignal?.User?.PushSubscription?.id },
-	get token(): string | null | undefined { return window.OneSignal?.User?.PushSubscription?.token },
-	get optedIn(): boolean | undefined { return window.OneSignal?.User?.PushSubscription?.optedIn },
+	get id(): string | null | undefined { return window.OneSignal?.User?.PushSubscription?.id; },
+	get token(): string | null | undefined { return window.OneSignal?.User?.PushSubscription?.token; },
+	get optedIn(): boolean | undefined { return window.OneSignal?.User?.PushSubscription?.optedIn; },
 	optIn: pushSubscriptionOptIn,
 	optOut: pushSubscriptionOptOut,
 	addEventListener: pushSubscriptionAddEventListener,
@@ -726,6 +961,8 @@ const PushSubscriptionNamespace: IOneSignalPushSubscription = {
 };
 
 const UserNamespace: IOneSignalUser = {
+	get onesignalId(): string | undefined { return window.OneSignal?.User?.onesignalId; },
+	get externalId(): string | undefined { return window.OneSignal?.User?.externalId; },
 	addAlias: userAddAlias,
 	addAliases: userAddAliases,
 	removeAlias: userRemoveAlias,
@@ -738,6 +975,11 @@ const UserNamespace: IOneSignalUser = {
 	addTags: userAddTags,
 	removeTag: userRemoveTag,
 	removeTags: userRemoveTags,
+	getTags: userGetTags,
+	addEventListener: userAddEventListener,
+	removeEventListener: userRemoveEventListener,
+	setLanguage: userSetLanguage,
+	getLanguage: userGetLanguage,
 	PushSubscription: PushSubscriptionNamespace,
 };