diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js index e0f3789c0b..7bc7be156e 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js @@ -62,7 +62,7 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) => const { data: { data }, } = await axios.get( - `${strapi.backendURL}/admin/registration-info?registrationToken=${registrationToken}` + `${window.strapi.backendURL}/admin/registration-info?registrationToken=${registrationToken}` ); if (data) { diff --git a/packages/core/admin/admin/src/pages/AuthPage/index.js b/packages/core/admin/admin/src/pages/AuthPage/index.js index eb09f3d7f7..f6d7631293 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/index.js @@ -87,7 +87,7 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => { try { await axios({ method: 'POST', - url: `${strapi.backendURL}${requestURL}`, + url: `${window.strapi.backendURL}${requestURL}`, data: body, cancelToken: source.token, }); @@ -110,7 +110,7 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => { }, } = await axios({ method: 'POST', - url: `${strapi.backendURL}${requestURL}`, + url: `${window.strapi.backendURL}${requestURL}`, data: omit(body, fieldsToOmit), cancelToken: source.token, }); @@ -158,7 +158,7 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => { }, } = await axios({ method: 'POST', - url: `${strapi.backendURL}${requestURL}`, + url: `${window.strapi.backendURL}${requestURL}`, data: omit(body, fieldsToOmit), cancelToken: source.token, }); @@ -214,7 +214,7 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => { }, } = await axios({ method: 'POST', - url: `${strapi.backendURL}${requestURL}`, + url: `${window.strapi.backendURL}${requestURL}`, data: { ...body, resetPasswordToken: query.get('code') }, cancelToken: source.token, }); diff --git a/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js b/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js index 36abccbaba..30c6407012 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js @@ -13,7 +13,7 @@ const DividerFull = styled(Divider)` `; const Login = (loginProps) => { - const ssoEnabled = strapi.features.isEnabled(strapi.features.SSO); + const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO); const { isLoading, data: providers } = useAuthProviders({ ssoEnabled }); const { formatMessage } = useIntl(); diff --git a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js index b211bb1f8a..404fefe0b2 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js @@ -35,7 +35,7 @@ const SSOProvidersWrapper = styled(Flex)` const SSOProviderButton = ({ provider }) => { return ( - + {provider.icon ? ( ) : ( diff --git a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js index a847cc0043..03c259c02b 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js @@ -17,7 +17,7 @@ const DividerFull = styled(Divider)` `; const Providers = () => { - const ssoEnabled = strapi.features.isEnabled(strapi.features.SSO); + const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO); const { push } = useHistory(); const { formatMessage } = useIntl(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel.js index 6524349ac9..5922deac80 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel.js @@ -1,6 +1,6 @@ import baseModel from '../../../../../../../../../admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel'; -const ssoInputsModel = strapi.features.isEnabled(strapi.features.SSO) +const ssoInputsModel = window.strapi.features.isEnabled(window.strapi.features.SSO) ? { useSSORegistration: true, } diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js index 02974fe48d..1a707c2547 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js @@ -1,4 +1,4 @@ -const form = strapi.features.isEnabled(strapi.features.SSO) +const form = window.strapi.features.isEnabled(window.strapi.features.SSO) ? [ [ { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/serverRestartWatcher.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/serverRestartWatcher.js index 9d6e209348..52f1d26cf8 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/serverRestartWatcher.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/serverRestartWatcher.js @@ -10,7 +10,7 @@ const SERVER_HAS_BEEN_KILLED_MESSAGE = 'server is down'; */ export default function serverRestartWatcher(response, didShutDownServer) { return new Promise((resolve) => { - fetch(`${strapi.backendURL}/_health`, { + fetch(`${window.strapi.backendURL}/_health`, { method: 'HEAD', mode: 'no-cors', headers: { diff --git a/packages/plugins/documentation/admin/src/utils/openWithNewTab.js b/packages/plugins/documentation/admin/src/utils/openWithNewTab.js index cc101759b1..d6c9026ab6 100755 --- a/packages/plugins/documentation/admin/src/utils/openWithNewTab.js +++ b/packages/plugins/documentation/admin/src/utils/openWithNewTab.js @@ -1,14 +1,14 @@ const openWithNewTab = (path) => { const url = (() => { if (path.startsWith('/')) { - return `${strapi.backendURL}${path}`; + return `${window.strapi.backendURL}${path}`; } if (path.startsWith('http')) { return path; } - return `${strapi.backendURL}/${path}`; + return `${window.strapi.backendURL}/${path}`; })(); window.open(url, '_blank'); diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js index dc3424b330..7d6add2d87 100644 --- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js +++ b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js @@ -23,7 +23,9 @@ const Input = ({ }) => { const { formatMessage } = useIntl(); const inputValue = - name === 'noName' ? `${strapi.backendURL}/api/connect/${providerToEditName}/callback` : value; + name === 'noName' + ? `${window.strapi.backendURL}/api/connect/${providerToEditName}/callback` + : value; const label = formatMessage( { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage }, diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js index e89248c105..d1816d104a 100644 --- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js @@ -184,7 +184,9 @@ describe('', () => { it('should set the value correctly when the input\'s name is "noName"', () => { const { getByLabelText } = render(makeApp('noName', 'text', 'test')); - expect(getByLabelText('noName').value).toBe(`${strapi.backendURL}/api/connect/email/callback`); + expect(getByLabelText('noName').value).toBe( + `${window.strapi.backendURL}/api/connect/email/callback` + ); }); it('should display the toggleCheckbox correctly', () => {