From c7e2a2bd666f8a2526f40cb42486eb457adf203e Mon Sep 17 00:00:00 2001 From: soupette Date: Wed, 5 May 2021 17:52:41 +0200 Subject: [PATCH] Prefix global variables by STRAPI_ADMIN Signed-off-by: soupette --- packages/core/admin/admin/src/StrapiApp.js | 4 ++++ .../LeftMenu/LeftMenuFooter/index.js | 4 +--- .../admin/admin/src/containers/Admin/index.js | 6 +++--- .../admin/admin/src/containers/App/index.js | 2 +- .../core/admin/admin/src/utils/basename.js | 2 +- .../ModalCreateBody/utils/formDataModel.js | 2 +- .../ModalCreateBody/utils/roleSettingsForm.js | 2 +- .../AuthPage/components/Login/index.js | 2 +- .../AuthPage/components/Providers/index.js | 2 +- .../SettingsPage/utils/customRoutes.js | 2 +- .../useSettingsMenu/utils/customGlobalLinks.js | 2 +- packages/core/admin/env.js | 18 +++++++++--------- packages/core/admin/webpack.config.dev.js | 2 +- 13 files changed, 26 insertions(+), 24 deletions(-) diff --git a/packages/core/admin/admin/src/StrapiApp.js b/packages/core/admin/admin/src/StrapiApp.js index c96aa241e5..d549e23e75 100644 --- a/packages/core/admin/admin/src/StrapiApp.js +++ b/packages/core/admin/admin/src/StrapiApp.js @@ -14,6 +14,10 @@ import translationMessages from './translations'; // const App = () => 'todo'; +window.strapi = { + backendURL: process.env.STRAPI_ADMIN_BACKEND_URL, +}; + class StrapiApp { plugins = {}; diff --git a/packages/core/admin/admin/src/components/LeftMenu/LeftMenuFooter/index.js b/packages/core/admin/admin/src/components/LeftMenu/LeftMenuFooter/index.js index cd57484560..316995e3f8 100644 --- a/packages/core/admin/admin/src/components/LeftMenu/LeftMenuFooter/index.js +++ b/packages/core/admin/admin/src/components/LeftMenu/LeftMenuFooter/index.js @@ -9,9 +9,7 @@ import { PropTypes } from 'prop-types'; import Wrapper, { A } from './Wrapper'; function LeftMenuFooter({ version }) { - // PROJECT_TYPE is an env variable defined in the webpack config - // eslint-disable-next-line no-undef - const projectType = PROJECT_TYPE; + const projectType = process.env.STRAPI_ADMIN_PROJECT_TYPE; return ( diff --git a/packages/core/admin/admin/src/containers/Admin/index.js b/packages/core/admin/admin/src/containers/Admin/index.js index bf24a63f52..a6412300d9 100644 --- a/packages/core/admin/admin/src/containers/Admin/index.js +++ b/packages/core/admin/admin/src/containers/Admin/index.js @@ -94,7 +94,7 @@ export class Admin extends React.Component { event, // PROJECT_TYPE is an env variable defined in the webpack config // eslint-disable-next-line no-undef - properties: { ...properties, projectType: PROJECT_TYPE }, + properties: { ...properties, projectType: process.env.STRAPI_ADMIN_PROJECT_TYPE }, uuid, }); } catch (err) { @@ -120,7 +120,7 @@ export class Admin extends React.Component { getStrapiLatestReleaseSucceeded, } = this.props; - if (!STRAPI_ADMIN_UPDATE_NOTIFICATION === 'true') { + if (!process.env.STRAPI_ADMIN_UPDATE_NOTIFICATION === 'true') { return; } @@ -292,7 +292,7 @@ export class Admin extends React.Component { isOpen={blockApp && showGlobalAppBlocker} {...overlayBlockerData} /> - {STRAPI_ADMIN_SHOW_TUTORIALS === 'true' && } + {process.env.STRAPI_ADMIN_SHOW_TUTORIALS === 'true' && } diff --git a/packages/core/admin/admin/src/containers/App/index.js b/packages/core/admin/admin/src/containers/App/index.js index 207e6336c6..fcb34d4817 100644 --- a/packages/core/admin/admin/src/containers/App/index.js +++ b/packages/core/admin/admin/src/containers/App/index.js @@ -47,7 +47,7 @@ window.strapi = Object.assign(window.strapi || {}, { notification: { toggle: () => {}, }, - backendURL: BACKEND_URL, + lockApp: () => console.log('todo lockApp'), unlockApp: () => console.log('todo unlockApp'), lockAppWithOverlay: () => console.log('todo unlockAppWithOverlay'), diff --git a/packages/core/admin/admin/src/utils/basename.js b/packages/core/admin/admin/src/utils/basename.js index 8cff6bba1a..7ac6644b79 100644 --- a/packages/core/admin/admin/src/utils/basename.js +++ b/packages/core/admin/admin/src/utils/basename.js @@ -1,3 +1,3 @@ -const basename = ADMIN_PATH.replace(window.location.origin, ''); +const basename = process.env.ADMIN_PATH.replace(window.location.origin, ''); export default basename; diff --git a/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/formDataModel.js b/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/formDataModel.js index 15c945499d..214f9cf9b6 100644 --- a/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/formDataModel.js +++ b/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/formDataModel.js @@ -1,6 +1,6 @@ import baseModel from '../../../../../../admin/src/components/Users/ModalCreateBody/utils/formDataModel'; -const ssoInputsModel = ENABLED_EE_FEATURES.includes('sso') +const ssoInputsModel = process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES.includes('sso') ? { useSSORegistration: true, } diff --git a/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/roleSettingsForm.js b/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/roleSettingsForm.js index 0e9eb1848b..c1868cd6a9 100644 --- a/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/roleSettingsForm.js +++ b/packages/core/admin/ee/admin/components/Users/ModalCreateBody/utils/roleSettingsForm.js @@ -1,6 +1,6 @@ import baseForm from '../../../../../../admin/src/components/Users/ModalCreateBody/utils/roleSettingsForm'; -const ssoInputs = ENABLED_EE_FEATURES.includes('sso') +const ssoInputs = process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES.includes('sso') ? { useSSORegistration: { label: 'Settings.permissions.users.form.sso', diff --git a/packages/core/admin/ee/admin/containers/AuthPage/components/Login/index.js b/packages/core/admin/ee/admin/containers/AuthPage/components/Login/index.js index 700d6f2b00..69187a5d4f 100644 --- a/packages/core/admin/ee/admin/containers/AuthPage/components/Login/index.js +++ b/packages/core/admin/ee/admin/containers/AuthPage/components/Login/index.js @@ -17,7 +17,7 @@ import { import { useAuthProviders } from '../../../../hooks'; const Login = loginProps => { - const ssoEnabled = ENABLED_EE_FEATURES.includes('sso'); + const ssoEnabled = process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES.includes('sso'); const theme = useTheme(); const { isLoading, data: providers } = useAuthProviders({ ssoEnabled }); diff --git a/packages/core/admin/ee/admin/containers/AuthPage/components/Providers/index.js b/packages/core/admin/ee/admin/containers/AuthPage/components/Providers/index.js index 0e14a090d9..36fd673641 100644 --- a/packages/core/admin/ee/admin/containers/AuthPage/components/Providers/index.js +++ b/packages/core/admin/ee/admin/containers/AuthPage/components/Providers/index.js @@ -17,7 +17,7 @@ const ProviderWrapper = styled.div` `; const Providers = () => { - const ssoEnabled = ENABLED_EE_FEATURES.includes('sso'); + const ssoEnabled = process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES.includes('sso'); const { push } = useHistory(); const { formatMessage } = useIntl(); diff --git a/packages/core/admin/ee/admin/containers/SettingsPage/utils/customRoutes.js b/packages/core/admin/ee/admin/containers/SettingsPage/utils/customRoutes.js index be5dcfd0da..50a153c76d 100644 --- a/packages/core/admin/ee/admin/containers/SettingsPage/utils/customRoutes.js +++ b/packages/core/admin/ee/admin/containers/SettingsPage/utils/customRoutes.js @@ -1,6 +1,6 @@ import SingleSignOn from '../SingleSignOn'; -const ssoRoutes = ENABLED_EE_FEATURES.includes('sso') +const ssoRoutes = process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES.includes('sso') ? [ { Component: SingleSignOn, diff --git a/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js b/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js index e57c051db8..87ccf0a457 100644 --- a/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js +++ b/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js @@ -1,6 +1,6 @@ import adminPermissions from '../../../../../admin/src/permissions'; -const ssoGlobalRoutes = ENABLED_EE_FEATURES.includes('sso') +const ssoGlobalRoutes = process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES.includes('sso') ? [ { title: { id: 'Settings.sso.title' }, diff --git a/packages/core/admin/env.js b/packages/core/admin/env.js index 77476a9903..60bb50f52a 100644 --- a/packages/core/admin/env.js +++ b/packages/core/admin/env.js @@ -23,21 +23,21 @@ const getClientEnvironment = (useEE, options) => { }, { ADMIN_PATH: options.adminPath, - BACKEND_URL: options.backend, - ENABLED_EE_FEATURES: options.features, - PROJECT_TYPE: useEE ? 'Enterprise' : 'Community', NODE_ENV: process.env.NODE_ENV || 'development', - // REQUIRED STRAPI_ADMIN variables - // TODO + STRAPI_ADMIN_BACKEND_URL: options.backend, + STRAPI_ADMIN_ENABLED_EE_FEATURES: options.features, + STRAPI_ADMIN_PROJECT_TYPE: useEE ? 'Enterprise' : 'Community', STRAPI_ADMIN_SHOW_TUTORIALS: 'true', STRAPI_ADMIN_UPDATE_NOTIFICATION: 'true', } ); - const stringified = Object.keys(raw).reduce((env, key) => { - env[key] = JSON.stringify(raw[key]); - return env; - }, {}); + const stringified = { + 'process.env': Object.keys(raw).reduce((env, key) => { + env[key] = JSON.stringify(raw[key]); + return env; + }, {}), + }; return { raw, stringified }; }; diff --git a/packages/core/admin/webpack.config.dev.js b/packages/core/admin/webpack.config.dev.js index dcffdc0927..0d4cd1e0c9 100644 --- a/packages/core/admin/webpack.config.dev.js +++ b/packages/core/admin/webpack.config.dev.js @@ -18,7 +18,7 @@ module.exports = () => { const options = { backend: 'http://localhost:1337', adminPath: '/admin/', - features: process.env.ENABLED_EE_FEATURES || ['sso'], + features: process.env.STRAPI_ADMIN_ENABLED_EE_FEATURES || ['sso'], }; const useEE = process.env.STRAPI_DISABLE_EE === 'true' ? false : true;