yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-09 14:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditional SSO with env var

Browse Source 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
This commit is contained in:
HichamELBSI 2021-01-29 15:47:11 +01:00
parent 55433bd9a5
commit e80d9c9c3e
7 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.front.js
View File

@ -30,6 +30,7 @@ module.exports = {
expect: false, expect: false,
assert: false, assert: false,
chai: false, chai: false,
ENABLED_EE_FEATURES: false,
// TODO: put all this in process.env in webpack to avoid having to set them here // TODO: put all this in process.env in webpack to avoid having to set them here
REMOTE_URL: true, REMOTE_URL: true,
BACKEND_URL: true, BACKEND_URL: true,

1
jest.config.front.js
View File

@ -44,6 +44,7 @@ module.exports = {
PUBLIC_PATH: '/admin', PUBLIC_PATH: '/admin',
REMOTE_URL: '/', REMOTE_URL: '/',
NODE_ENV: 'test', NODE_ENV: 'test',
ENABLED_EE_FEATURES: [],
}, },
moduleDirectories: [ moduleDirectories: [
'node_modules', 'node_modules',

2
packages/strapi-admin/ee/admin/containers/AuthPage/components/Login/index.js
View File

@ -21,7 +21,7 @@ const Login = loginProps => {
const { isLoading, data: providers } = useAuthProviders(); const { isLoading, data: providers } = useAuthProviders();
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
if (!isLoading && providers.length === 0) { if (!ENABLED_EE_FEATURES.includes('sso') || (!isLoading && providers.length === 0)) {
return <BaseLogin {...loginProps} />; return <BaseLogin {...loginProps} />;
} }

2
packages/strapi-admin/ee/admin/containers/AuthPage/components/Providers/index.js
View File

@ -25,7 +25,7 @@ const Providers = () => {
push('/auth/login'); push('/auth/login');
}; };
if (!isLoading && providers.length === 0) { if (!ENABLED_EE_FEATURES.includes('sso') || (!isLoading && providers.length === 0)) {
return <Redirect to="/auth/login" />; return <Redirect to="/auth/login" />;
} }

18
packages/strapi-admin/ee/admin/containers/SettingsPage/utils/customRoutes.js
View File

@ -1,12 +1,16 @@
import { SETTINGS_BASE_URL } from '../../../../../admin/src/config'; import { SETTINGS_BASE_URL } from '../../../../../admin/src/config';
import SingleSignOn from '../SingleSignOn'; import SingleSignOn from '../SingleSignOn';
const customRoutes = [ const ssoRoutes = ENABLED_EE_FEATURES.includes('sso')
{ ? [
Component: SingleSignOn, {
to: `${SETTINGS_BASE_URL}/single-sign-on`, Component: SingleSignOn,
exact: true, to: `${SETTINGS_BASE_URL}/single-sign-on`,
}, exact: true,
]; },
]
: [];
const customRoutes = [...ssoRoutes];
export default customRoutes; export default customRoutes;

22
packages/strapi-admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js
View File

@ -1,14 +1,18 @@
import { SETTINGS_BASE_URL } from '../../../../../admin/src/config'; import { SETTINGS_BASE_URL } from '../../../../../admin/src/config';
import adminPermissions from '../../../../../admin/src/permissions'; import adminPermissions from '../../../../../admin/src/permissions';
const customGlobalLinks = [ const ssoGlobalRoutes = ENABLED_EE_FEATURES.includes('sso')
{ ? [
title: { id: 'Settings.sso.title' }, {
to: `${SETTINGS_BASE_URL}/single-sign-on`, title: { id: 'Settings.sso.title' },
name: 'sso', to: `${SETTINGS_BASE_URL}/single-sign-on`,
isDisplayed: false, name: 'sso',
permissions: adminPermissions.settings.sso.main, isDisplayed: false,
}, permissions: adminPermissions.settings.sso.main,
]; },
]
: [];
const customGlobalLinks = [...ssoGlobalRoutes];
export default customGlobalLinks; export default customGlobalLinks;

1
packages/strapi-admin/webpack.config.dev.js
View File

@ -15,6 +15,7 @@ module.exports = () => {
const options = { const options = {
backend: 'http://localhost:1337', backend: 'http://localhost:1337',
publicPath: '/admin/', publicPath: '/admin/',
features: process.env.ENABLED_EE_FEATURES || [],
}; };
const args = { const args = {