move env vars to config

Iterable · May 23, 2024 · 1f37c88 · 1f37c88
1 parent ad433f3
commit 1f37c88
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 26 deletions.
diff --git a/react-example/src/index.tsx b/react-example/src/index.tsx
@@ -1,4 +1,4 @@
-import { initialize } from '@iterable/web-sdk';
+import { initialize, config } from '@iterable/web-sdk';
 import axios from 'axios';
 import ReactDOM from 'react-dom';
 import './styles/index.css';
@@ -38,6 +38,10 @@ const HomeLink = styled(Link)`
 `;
 
 ((): void => {
+  config.setConfig({
+    isEuIterableService: false,
+    dangerouslyAllowJsPopups: true
+  });
   const { setEmail, logout, refreshJwtToken } = initialize(
     process.env.API_KEY || '',
     ({ email }) => {

diff --git a/src/constants.ts b/src/constants.ts
@@ -1,21 +1,19 @@
+import config from './utils/config';
+
 /* number of MS to wait between in-app messages to show the next one */
 export const DISPLAY_INTERVAL_DEFAULT = 30000;
 
 /* how many times we try to create a new user when _setUserID_ is invoked */
 export const RETRY_USER_ATTEMPTS = 0;
 
-const IS_EU_ITERABLE_SERVICE =
-  process.env.IS_EU_ITERABLE_SERVICE === 'true' ? true : false;
-
-export const dangerouslyAllowJsPopupExecution =
-  process.env.DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION === 'true' ? true : false;
-
 const US_ITERABLE_DOMAIN = 'api.iterable.com';
 
 const EU_ITERABLE_DOMAIN = 'api.eu.iterable.com';
 
 const ITERABLE_API_URL = `https://${
-  IS_EU_ITERABLE_SERVICE ? EU_ITERABLE_DOMAIN : US_ITERABLE_DOMAIN
+  config.getConfig('isEuIterableService')
+    ? EU_ITERABLE_DOMAIN
+    : US_ITERABLE_DOMAIN
 }/api`;
 
 // Do not set `process.env.BASE_URL` if intending on using the prod or EU APIs.

diff --git a/src/inapp/utils.ts b/src/inapp/utils.ts
@@ -1,13 +1,13 @@
 import { by } from '@pabra/sortby';
 import {
   ANIMATION_DURATION,
-  dangerouslyAllowJsPopupExecution,
   DEFAULT_CLOSE_BUTTON_OFFSET_PERCENTAGE
 } from 'src/constants';
 import { WebInAppDisplaySettings } from 'src/inapp';
 import { srSpeak } from 'src/utils/srSpeak';
 import { trackInAppDelivery } from '../events';
 import { CloseButtonPosition, InAppMessage } from './types';
+import { config } from '..';
 
 interface Breakpoints {
   smMatches: boolean;
@@ -288,7 +288,9 @@ const generateSecuredIFrame = () => {
   iframe.setAttribute(
     'sandbox',
     `allow-same-origin allow-popups allow-top-navigation ${
-      dangerouslyAllowJsPopupExecution ? 'allow-popups-to-escape-sandbox' : ''
+      config.getConfig('dangerouslyAllowJsPopups')
+        ? 'allow-popups-to-escape-sandbox'
+        : ''
     }`
   );
   /*

diff --git a/src/request.ts b/src/request.ts
@@ -35,6 +35,7 @@ export const baseIterableRequest = <T = any>(
         abortEarly: false
       });
     }
+
     return baseAxiosRequest({
       ...payload,
       baseURL: config.getConfig('baseURL') || BASE_URL,

diff --git a/src/utils/config.ts b/src/utils/config.ts
@@ -1,18 +1,24 @@
 import { BASE_URL } from '../constants';
 
-interface Options {
+type Options = {
   logLevel: 'none' | 'verbose';
   baseURL: string;
-}
+  isEuIterableService: boolean;
+  dangerouslyAllowJsPopups: boolean;
+};
 
 const _config = () => {
   let options: Options = {
     logLevel: 'none',
-    baseURL: BASE_URL
+    baseURL: BASE_URL,
+    isEuIterableService: false,
+    dangerouslyAllowJsPopups: false
   };
 
+  const getConfig = <K extends keyof Options>(option: K) => options[option];
+
   return {
-    getConfig: (option: keyof Options) => options[option],
+    getConfig,
     setConfig: (newOptions: Partial<Options>) => {
       options = {
         ...options,

diff --git a/webpack.config.js b/webpack.config.js
@@ -7,10 +7,7 @@ function getParsedEnv() {
   if (!env.error) {
     return {
       ...env.parsed,
-      VERSION: version,
-      IS_EU_ITERABLE_SERVICE: process.env.IS_EU_ITERABLE_SERVICE || false,
-      DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION:
-        process.env.DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION || false
+      VERSION: version
     };
   }
 

diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -7,10 +7,7 @@ function getParsedEnv() {
   if (!env.error) {
     return {
       ...env.parsed,
-      VERSION: version,
-      IS_EU_ITERABLE_SERVICE: process.env.IS_EU_ITERABLE_SERVICE || false,
-      DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION:
-        process.env.DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION || false
+      VERSION: version
     };
   }
 

diff --git a/webpack.node.config.js b/webpack.node.config.js
@@ -7,10 +7,7 @@ function getParsedEnv() {
   if (!env.error) {
     return {
       ...env.parsed,
-      VERSION: version,
-      IS_EU_ITERABLE_SERVICE: process.env.IS_EU_ITERABLE_SERVICE || false,
-      DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION:
-        process.env.DANGEROUSLY_ALLOW_JS_POPUP_EXECUTION || false
+      VERSION: version
     };
   }