Merge pull request #749 from topcoder-platform/env-fixes

Env fixes

Author: vas3a

.circleci/config.yml

@@ -5,9 +5,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
 # Stripe configs
 REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
 REACT_APP_STRIPE_API_VERSION=2020-08-27
-# not really used anywhere
-REACT_APP_STRIPE_ADMIN_TOKEN=
-REACT_APP_STRIPE_CUSTOMER_TOKEN=
 
 # Vanilla Forums
 REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV

.environments/.env.dev

@@ -5,9 +5,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
 # Stripe configs
 REACT_APP_STRIPE_API_KEY=pk_live_m3bCBVSfkfMOEp3unZFRsHXi
 REACT_APP_STRIPE_API_VERSION=2020-08-27
-# not really used anywhere
-REACT_APP_STRIPE_ADMIN_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIiwiYWRtaW5pc3RyYXRvciJdLCJpc3MiOiJodHRwczovL2FwaS50b3Bjb2Rlci1kZXYuY29tIiwiaGFuZGxlIjoidGVzdDEiLCJleHAiOjI1NjMwNzY2ODksInVzZXJJZCI6IjQwMDUxMzMzIiwiaWF0IjoxNDYzMDc2MDg5LCJlbWFpbCI6InRlc3RAdG9wY29kZXIuY29tIiwianRpIjoiYjMzYjc3Y2QtYjUyZS00MGZlLTgzN2UtYmViOGUwYWU2YTRhIn0.wKWUe0-SaiFVN-VR_-GwgFlvWaDkSbc8H55ktb9LAVw
-REACT_APP_STRIPE_CUSTOMER_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg
 
 # Vanilla Forums
 REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV

.environments/.env.prod

@@ -5,9 +5,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
 # Stripe configs
 REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
 REACT_APP_STRIPE_API_VERSION=2020-08-27
-# not really used anywhere
-REACT_APP_STRIPE_ADMIN_TOKEN=
-REACT_APP_STRIPE_CUSTOMER_TOKEN=
 
 # Vanilla Forums
 REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV

.environments/.env.qa

@@ -4,10 +4,10 @@
   "private": true,
   "license": "ISC",
   "scripts": {
-    "dev": "craco start --mode ${REACT_APP_HOST_ENV:-dev}",
+    "dev": "craco start --mode ${LOGICAL_ENV:-dev}",
     "start": "bash start.sh",
-    "build": "export CI=false && craco build --mode ${REACT_APP_HOST_ENV:-prod}",
-    "build:dev": "craco build --mode ${REACT_APP_HOST_ENV:-dev}",
+    "build": "export CI=false && craco build --mode ${LOGICAL_ENV:-prod}",
+    "build:dev": "craco build --mode ${LOGICAL_ENV:-dev}",
     "demo": "npx http-server --port 443 -a 0.0.0.0 -S -C ./ssl/rootCA.crt -K ./ssl/rootCA.key -P https://local.topcoder-dev.com? --proxy-options.secure false ./build",
     "lint": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx,js,jsx}'",
     "lint:fix": "yarn lint --fix",

package.json

@@ -42,10 +42,8 @@ export const VANILLA_FORUM = {
 }
 
 export const STRIPE = {
-    ADMIN_TOKEN: getReactEnv<string | undefined>('STRIPE_ADMIN_TOKEN', undefined),
     API_KEY: getReactEnv<string>('STRIPE_API_KEY', ''),
     API_VERSION: getReactEnv<string | undefined>('STRIPE_API_VERSION', undefined),
-    CUSTOMER_TOKEN: getReactEnv<string | undefined>('STRIPE_CUSTOMER_TOKEN', undefined),
 }
 
 export const URLS = {

src/config/environments/default.env.ts

@@ -22,10 +22,8 @@ export interface GlobalConfig {
         ENVIRONMENT_ID: string | undefined
     }
     STRIPE: {
-        ADMIN_TOKEN: string | undefined
         API_KEY: string
         API_VERSION: string | undefined
-        CUSTOMER_TOKEN: string | undefined
     }
     URLS: {
         USER_PROFILE: string

src/config/environments/global-config.model.ts

@@ -1,12 +1,28 @@
+/* eslint-disable unicorn/no-null */
 /* eslint-disable @typescript-eslint/typedef */
 
 export function getReactEnv<T>(varName: string, defaultValue?: string | boolean | number): T {
     const hasDefaultValue: boolean = arguments.length > 1
-    const value = process.env[`REACT_APP_${varName}`]
+    let value = process.env[`REACT_APP_${varName}`] as unknown as T
 
     if (value === undefined && !hasDefaultValue) {
         throw new Error(`${varName} is not defined in process.env!`)
     }
 
+    // convert to boolean
+    if (value === 'false' || value === 'true') {
+        value = (value === 'true' as unknown) as T
+    }
+
+    // convert to null
+    if (value === 'null') {
+        value = (null as unknown) as T
+    }
+
+    // convert to number
+    if (!Number.isNaN(Number(value))) {
+        value = (null as unknown) as T
+    }
+
     return (value ?? defaultValue) as T
 }