diff --git a/src/WrapperApp/components/Login/LoginPanel.tsx b/src/WrapperApp/components/Login/LoginPanel.tsx index 0e0dd23c7..5712c4640 100644 --- a/src/WrapperApp/components/Login/LoginPanel.tsx +++ b/src/WrapperApp/components/Login/LoginPanel.tsx @@ -8,7 +8,7 @@ import NamePasswordLoginPanel from './NamePasswordLoginPanel'; export default function LoginPanel() { const theme = useTheme(); - const { altAuth } = useConfig(); + const { altAuth, useBasicAuth } = useConfig(); const { keycloak, initialized } = useKeycloakAuth(); const [namePasswordLogin, setNamePasswordLogin] = useState(!altAuth); @@ -16,6 +16,8 @@ export default function LoginPanel() { if (initialized && !keycloak.authenticated) keycloak.login(); }, [initialized, keycloak]); + const showPasswordLogin = useBasicAuth; + return ( Connect with PLGrid - setNamePasswordLogin(true)} - sx={{ cursor: 'pointer' }}> - use password login - + {showPasswordLogin && ( + setNamePasswordLogin(true)} + sx={{ cursor: 'pointer' }}> + use password login + + )} ) : ( <> diff --git a/src/config/ConfigService.tsx b/src/config/ConfigService.tsx index dd9b291ee..02563942e 100644 --- a/src/config/ConfigService.tsx +++ b/src/config/ConfigService.tsx @@ -7,6 +7,7 @@ import { snakeToCamelCase } from '../util/Notation/Notation'; const BACKEND_URL = process.env.REACT_APP_BACKEND_URL ?? 'http://localhost:5000'; const DEMO_MODE = process.env.REACT_APP_TARGET === 'demo'; const ALT_AUTH = process.env.REACT_APP_ALT_AUTH === 'plg'; +const USE_BASIC_AUTH = process.env.REACT_APP_USE_BASIC_AUTH === 'true'; export const DEPLOYMENT = (process.env.REACT_APP_DEPLOYMENT as ConfigDeployment) ?? 'prod'; export type ConfigDeployment = 'dev' | 'prod' | undefined; @@ -18,6 +19,7 @@ interface Config { deployment: ConfigDeployment; demoMode: boolean; altAuth: boolean; + useBasicAuth: boolean; } declare global { @@ -36,7 +38,8 @@ const ConfigProvider = ({ children }: { children?: ReactNode }) => { backendUrl: BACKEND_URL, deployment: DEPLOYMENT, demoMode: DEMO_MODE, - altAuth: ALT_AUTH + altAuth: ALT_AUTH, + useBasicAuth: USE_BASIC_AUTH }); window.BACKEND_URL ??= BACKEND_URL; @@ -75,6 +78,7 @@ const ConfigProvider = ({ children }: { children?: ReactNode }) => { defineProperty('DEPLOYMENT', true); defineProperty('DEMO_MODE'); defineProperty('ALT_AUTH'); + defineProperty('USE_BASIC_AUTH'); } }, [config]);