Skip to content

Refactor REMOTE_ENV for deployed code #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Refactor REMOTE_ENV for deployed code #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions packages/react-scripts/proxy/setupProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
const proxy = require('http-proxy-middleware')
const fsconfig = require('fs-config/config/default')

/* eslint-disable import/no-extraneous-dependencies */
/* eslint-disable-next-line import/no-extraneous-dependencies */
require('dotenv').config()
/* eslint-enable import/no-extraneous-dependencies */

// detect env
const env = process.env.REMOTE_ENV || 'beta'
// backwards compat for auth-middleware env implicit dependency
process.env.TARGET_ENV = env
const setProxies = (app, customProxies = []) => {
// detect env
const env = process.env.REMOTE_ENV || 'beta'
// backwards compat for auth-middleware env implicit dependency
if (process.env.TARGET_ENV === 'local') {
process.env.TARGET_ENV = env
}

// set keys directly from fs-config for the current env
function getFromEnv(thisEnv, key) {
return fsconfig[thisEnv][key] || fsconfig.default[key]
}
const keys = ['FS_KEY', 'CIS_WEB']
keys.forEach(key => {
process.env[key] = getFromEnv(env, key)
})
// set keys directly from fs-config for the current env
function getFromEnv(thisEnv, key) {
return fsconfig[thisEnv][key] || fsconfig.default[key]
}

// dev key is only in default
process.env.FS_DEV_KEY = fsconfig.default.FS_DEV_KEY
const keys = ['FS_KEY', 'CIS_WEB']
keys.forEach(key => {
process.env[key] = getFromEnv(env, key)
})

// bring in auth middleware once required keys are set
const cookieParser = require('cookie-parser')
const base = require('connect-base')
const metric = require('connect-metric')
const auth = require('auth-middleware')
const resolver = require('./resolver')
const proxyList = require('./proxies')
// dev key is only in default
process.env.FS_DEV_KEY = fsconfig.default.FS_DEV_KEY

// bring in auth middleware once required keys are set
const cookieParser = require('cookie-parser')
const base = require('connect-base')
const metric = require('connect-metric')
const auth = require('auth-middleware')
const resolver = require('./resolver')
const proxyList = require('./proxies')

const setProxies = (app, customProxies = []) => {
// middleware required for auth middleware
app.use(metric())
app.use(base())
Expand Down