gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: use env.json in both client and server (#42359)

Browse Source
This commit is contained in:
Oliver Eyton-Williams
2021-06-08 14:12:44 +02:00
committed by GitHub
parent 104cbc596e
commit 3875c6e619
9 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api-server/src/common/models/user.js
View File

@ -15,7 +15,7 @@ import _ from 'lodash';
import generate from 'nanoid/generate'; import generate from 'nanoid/generate';
import badwordFilter from 'bad-words'; import badwordFilter from 'bad-words';
import { apiLocation } from '../../../../config/env'; import { apiLocation } from '../../../../config/env.json';
import { import {
fixCompletedChallengeItem, fixCompletedChallengeItem,

2
api-server/src/server/middlewares/constant-headers.js
View File

@ -1,4 +1,4 @@
import { homeLocation } from '../../../../config/env'; import { homeLocation } from '../../../../config/env.json';
import { allowedOrigins } from '../../../../config/cors-settings'; import { allowedOrigins } from '../../../../config/cors-settings';
export default function constantHeaders() { export default function constantHeaders() {

2
api-server/src/server/middlewares/csp.js
View File

@ -1,6 +1,6 @@
import helmet from 'helmet'; import helmet from 'helmet';
import { homeLocation } from '../../../../config/env'; import { homeLocation } from '../../../../config/env.json';
let trusted = [ let trusted = [
"'self'", "'self'",

2
api-server/src/server/middlewares/request-authorization.test.js
View File

@ -2,7 +2,7 @@
import { mockReq as mockRequest, mockRes } from '../boot_tests/challenge.test'; import { mockReq as mockRequest, mockRes } from '../boot_tests/challenge.test';
import jwt from 'jsonwebtoken'; import jwt from 'jsonwebtoken';
import { homeLocation } from '../../../../config/env'; import { homeLocation } from '../../../../config/env.json';
import createRequestAuthorization, { import createRequestAuthorization, {
isAllowedPath isAllowedPath
} from './request-authorization'; } from './request-authorization';

2
api-server/src/server/passport-providers.js
View File

@ -1,5 +1,5 @@
import { auth0 } from '../../../config/secrets'; import { auth0 } from '../../../config/secrets';
import { homeLocation, apiLocation } from '../../../config/env'; import { homeLocation, apiLocation } from '../../../config/env.json';
const { clientID, clientSecret, domain } = auth0; const { clientID, clientSecret, domain } = auth0;

2
api-server/src/server/utils/redirection.js
View File

@ -3,7 +3,7 @@ const { availableLangs } = require('../../../../config/i18n/all-langs');
const { allowedOrigins } = require('../../../../config/cors-settings'); const { allowedOrigins } = require('../../../../config/cors-settings');
// homeLocation is being used as a fallback here. If the one provided by the // homeLocation is being used as a fallback here. If the one provided by the
// client is invalid we default to this. // client is invalid we default to this.
const { homeLocation } = require('../../../../config/env'); const { homeLocation } = require('../../../../config/env.json');
function getReturnTo(encryptedParams, secret, _homeLocation = homeLocation) { function getReturnTo(encryptedParams, secret, _homeLocation = homeLocation) {
let params; let params;

2
client/gatsby-node.js
View File

@ -1,4 +1,4 @@
const env = require('../config/env'); const env = require('../config/env.json');
const webpack = require('webpack'); const webpack = require('webpack');
const { createFilePath } = require('gatsby-source-filesystem'); const { createFilePath } = require('gatsby-source-filesystem');

0
config/env.js → config/read-env.js
View File

2
tools/scripts/build/ensure-env.js
View File

@ -1,7 +1,7 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const env = require('../../../config/env'); const env = require('../../../config/read-env');
const { availableLangs } = require('../../../config/i18n/all-langs'); const { availableLangs } = require('../../../config/i18n/all-langs');
const globalConfigPath = path.resolve(__dirname, '../../../config'); const globalConfigPath = path.resolve(__dirname, '../../../config');