Added parseVersionString to Utils| moved Utils to shared dir| type fixes

Author: rgomezp

src/Event.ts

@@ -2,7 +2,7 @@ import Environment from './Environment';
 import SdkEnvironment from './managers/SdkEnvironment';
 import { WindowEnvironmentKind } from './models/WindowEnvironmentKind';
 import Log from './libraries/Log';
-import Utils from "./utils/Utils";
+import Utils from "./context/shared/utils/Utils";
 
 
 const SILENT_EVENTS = [

src/OneSignalApiBase.ts

@@ -1,6 +1,6 @@
 import Environment from './Environment';
 import SdkEnvironment from './managers/SdkEnvironment';
-import { Utils } from "./utils/Utils";
+import { Utils } from "./context/shared/utils/Utils";
 import { OneSignalApiError, OneSignalApiErrorKind } from './errors/OneSignalApiError';
 
 type Headers = any[] & {[key: string]: any};

src/OneSignalApiSW.ts

@@ -2,7 +2,7 @@ import { ServerAppConfig } from "./models/AppConfig";
 import { OneSignalApiBase } from "./OneSignalApiBase";
 import { SubscriptionStateKind } from "./models/SubscriptionStateKind";
 import Log from "./libraries/Log";
-import { Utils } from "./utils/Utils";
+import { Utils } from "./context/shared/utils/Utils";
 
 export class OneSignalApiSW {
   static async downloadServerAppConfig(appId: string): Promise<ServerAppConfig> {

src/OneSignalApiShared.ts

@@ -4,7 +4,7 @@ import { OneSignalApiErrorKind, OneSignalApiError } from './errors/OneSignalApiE
 import { EmailProfile } from './models/EmailProfile';
 import { EmailDeviceRecord } from './models/EmailDeviceRecord';
 import OneSignalApiBase from "./OneSignalApiBase";
-import Utils from "./utils/Utils";
+import Utils from "./context/shared/utils/Utils";
 
 export default class OneSignalApiShared {
   static getPlayer(appId: string, playerId: string) {

src/Postmam.ts

@@ -4,7 +4,7 @@ import Environment from './Environment';
 import SdkEnvironment from './managers/SdkEnvironment';
 import Emitter from './libraries/Emitter';
 import Log from './libraries/Log';
-import { Utils } from "./utils/Utils";
+import { Utils } from "./context/shared/utils/Utils";
 import { OneSignalUtils } from "./utils/OneSignalUtils";
 
 /**

src/context/browser/helpers/EnvironmentInfoHelper.ts

@@ -3,6 +3,7 @@ import { EnvironmentInfo } from '../models/EnvironmentInfo';
 import { Browser } from '../models/Browser';
 import { OneSignalUtils } from '../../../utils/OneSignalUtils';
 import { isMacOSSafariInIframe } from '../utils/BrowserSupportsPush';
+import Utils from '../../shared/utils/Utils';
 
 /**
  * EnvironmentInfoHelper is used to save page ("browser") context environment information to
@@ -42,8 +43,8 @@ export class EnvironmentInfoHelper {
         return isMacOSSafariInIframe();
     }
 
-    private static getBrowserVersion(): string|number {
-        return bowser.version;
+    private static getBrowserVersion(): number {
+        return Utils.parseVersionString(bowser.version);
     }
 
     private static isHttps(): boolean {

src/context/browser/models/EnvironmentInfo.ts

@@ -3,7 +3,7 @@ import { Browser } from './Browser';
 // for runtime environment info
 export interface EnvironmentInfo {
     browserType: Browser;
-    browserVersion: string|number;
+    browserVersion: number;
     isHttps: boolean;
     isUsingSubscriptionWorkaround: boolean;
     isBrowserAndSupportsServiceWorkers: boolean;

src/utils/Utils.ts renamed to src/context/shared/utils/Utils.ts

@@ -1,4 +1,4 @@
-import TimeoutError from '../errors/TimeoutError';
+import TimeoutError from '../../../errors/TimeoutError';
 
 interface IndexOfAble {
   indexOf(match:string): number;
@@ -119,15 +119,12 @@ export class Utils {
   }
 
   /**
-   * Checks if a version is number is greater than or equal (AKA at least) to a specific compare
-   *   to version.
-   * Limited to only checking for major and minor version values, patch versions are ignored
-   * @param toCheck - Version we want to check
-   * @param compareTo - Version we want to be at or higher
-   * @returns {string} - Returns true if toCheck >= compareTo
+   * Returns trimmed version number
+   * e.g: "10.01.30" becomes "10.01"
+   * @param version - version number we want to check
    */
-  public static isVersionAtLeast(toCheck: string | number, compareTo: number): boolean {
-    const osVersionParts = toCheck.toString().split(".");
+  public static parseVersionString(version: string | number): number {
+    const osVersionParts = version.toString().split(".");
     const majorVersion = Utils.padStart(osVersionParts[0], 2, "0");
     let minorVersion: string;
     if (osVersionParts[1]) {
@@ -137,8 +134,19 @@ export class Utils {
       minorVersion = "00";
     }
 
-    const majorAndMinor = Number(`${majorVersion}.${minorVersion}`);
-    return majorAndMinor >= compareTo;
+    return Number(`${majorVersion}.${minorVersion}`);
+  }
+
+  /**
+   * Checks if a version is number is greater than or equal (AKA at least) to a specific compare
+   *   to version.
+   * Limited to only checking for major and minor version values, patch versions are ignored
+   * @param toCheck - Version we want to check
+   * @param compareTo - Version we want to be at or higher
+   * @returns {string} - Returns true if toCheck >= compareTo
+   */
+  public static isVersionAtLeast(toCheck: string | number, compareTo: number): boolean {
+    return this.parseVersionString(toCheck) >= compareTo;
   }
 
   public static enforceAppId(appId: string | undefined | null): void {

src/helpers/ConfigHelper.ts

@@ -5,7 +5,7 @@ import { WindowEnvironmentKind } from "../models/WindowEnvironmentKind";
 import { SdkInitError, SdkInitErrorKind } from "../errors/SdkInitError";
 import SdkEnvironment from "../managers/SdkEnvironment";
 import OneSignalUtils from "../utils/OneSignalUtils";
-import Utils from "../utils/Utils";
+import Utils from "../context/shared/utils/Utils";
 import MainHelper from './MainHelper';
 
 export enum IntegrationConfigurationKind {

src/helpers/MainHelper.ts

@@ -9,7 +9,7 @@ import { SubscriptionStateKind } from '../models/SubscriptionStateKind';
 import { NotificationPermission } from "../models/NotificationPermission";
 import { OneSignalUtils } from "../utils/OneSignalUtils";
 import { PermissionUtils } from "../utils/PermissionUtils";
-import { Utils } from "../utils/Utils";
+import { Utils } from "../context/shared/utils/Utils";
 
 export default class MainHelper {