more clean up

- remove redundant environment constants

Author: fadi-george

package.json

@@ -82,7 +82,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "52.245 kB",
+      "limit": "52.2 kB",
       "gzip": true
     },
     {

src/page/services/DynamicResourceLoader.ts

@@ -1,4 +1,3 @@
-import { EnvironmentKind } from 'src/shared/environment/constants';
 import { EnumOutOfRangeArgumentError } from 'src/shared/errors/common';
 import {
   BUILD_ORIGIN,
@@ -38,11 +37,11 @@ const getOneSignalCssFileName = () => {
   const baseFileName = 'OneSignalSDK.page.styles.css';
 
   // using if statements to have better dead code elimination
-  if (BUILD_TYPE === EnvironmentKind.Development) return `Dev-${baseFileName}`;
+  if (BUILD_TYPE === 'development') return `Dev-${baseFileName}`;
 
-  if (BUILD_TYPE === EnvironmentKind.Staging) return `Staging-${baseFileName}`;
+  if (BUILD_TYPE === 'staging') return `Staging-${baseFileName}`;
 
-  if (BUILD_TYPE === EnvironmentKind.Production) return baseFileName;
+  if (BUILD_TYPE === 'production') return baseFileName;
 };
 
 const RESOURCE_HTTP_PORT = 4000;
@@ -54,13 +53,13 @@ const getOneSignalResourceUrlPath = () => {
   let origin: string;
 
   // using if statements to have better dead code elimination
-  if (BUILD_TYPE === EnvironmentKind.Development) {
+  if (BUILD_TYPE === 'development') {
     origin = NO_DEV_PORT
       ? `${protocol}://${BUILD_ORIGIN}`
       : `${protocol}://${BUILD_ORIGIN}:${port}`;
-  } else if (BUILD_TYPE === EnvironmentKind.Staging) {
+  } else if (BUILD_TYPE === 'staging') {
     origin = `https://${BUILD_ORIGIN}`;
-  } else if (BUILD_TYPE === EnvironmentKind.Production) {
+  } else if (BUILD_TYPE === 'production') {
     origin = 'https://onesignal.com';
   } else {
     throw EnumOutOfRangeArgumentError('buildEnv');

src/shared/environment/constants.ts

@@ -7,7 +7,6 @@ import type { SubscriptionTypeValue } from '../subscriptions/types';
 import { Browser } from '../useragent/constants';
 import { getBrowserName, getBrowserVersion } from '../useragent/detect';
 import { API_ORIGIN, API_TYPE, IS_SERVICE_WORKER } from '../utils/EnvVariables';
-import { EnvironmentKind } from './constants';
 
 export const isBrowser = typeof window !== 'undefined';
 
@@ -46,16 +45,15 @@ export const getOneSignalApiUrl = ({
   legacy?: boolean;
 } = {}): URL => {
   // using if statements to have better dead code elimination
-  if (API_TYPE === EnvironmentKind.Development) {
+  if (API_TYPE === 'development') {
     return isTurbineEndpoint(action)
       ? new URL(`http://${API_ORIGIN}:${TURBINE_API_URL_PORT}/api/v1/`)
       : new URL(`http://${API_ORIGIN}:${API_URL_PORT}/api/v1/`);
   }
 
-  if (API_TYPE === EnvironmentKind.Staging)
-    return new URL(`https://${API_ORIGIN}/api/v1/`);
+  if (API_TYPE === 'staging') return new URL(`https://${API_ORIGIN}/api/v1/`);
 
-  if (API_TYPE === EnvironmentKind.Production)
+  if (API_TYPE === 'production')
     return new URL(
       legacy ? 'https://onesignal.com/api/v1/' : 'https://api.onesignal.com/',
     );

src/shared/environment/detect.ts

@@ -1,11 +1,11 @@
 // Implements logic similar to Android SDK's NetworkUtils
 // Reference: https://github.com/OneSignal/OneSignal-Android-SDK/blob/5.1.31/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/NetworkUtils.kt
 export const ResponseStatusType = {
-  INVALID: 'INVALID',
-  RETRYABLE: 'RETRYABLE',
-  UNAUTHORIZED: 'UNAUTHORIZED',
-  MISSING: 'MISSING',
-  CONFLICT: 'CONFLICT',
+  INVALID: 0,
+  RETRYABLE: 1,
+  UNAUTHORIZED: 2,
+  MISSING: 3,
+  CONFLICT: 4,
 } as const;
 
 type ResponseStatusValue =

src/shared/helpers/NetworkUtils.ts

@@ -17,7 +17,7 @@ declare const __API_ORIGIN__: string;
 /**
  * Which API environment to use (development, staging, production)
  */
-declare const __API_TYPE__: string;
+declare const __API_TYPE__: 'development' | 'staging' | 'production';
 
 /**
  * Whether or not a dev port should be used
@@ -32,7 +32,7 @@ declare const __BUILD_ORIGIN__: string;
 /**
  * Which build environment to use (development, staging, production)
  */
-declare const __BUILD_TYPE__: string;
+declare const __BUILD_TYPE__: 'development' | 'staging' | 'production';
 
 /**
  * Whether the current build is for a service worker