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

api-server/src/common/models/user.js

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

api-server/src/server/middlewares/constant-headers.js

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

api-server/src/server/middlewares/csp.js

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

api-server/src/server/middlewares/request-authorization.test.js

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

api-server/src/server/passport-providers.js

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

api-server/src/server/utils/redirection.js

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

client/gatsby-node.js

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

tools/scripts/build/ensure-env.js

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