scottk/OptimCloud-gw-ui
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/OptimCloud-gw-ui.git synced 2025-10-30 01:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using .env file to hide the gateway url field

Browse Source
This commit is contained in:
bourquecharles
2021-06-21 12:05:40 -04:00
parent 805ee425f7
commit 95bc4d91a0
7 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env Normal file
View File

@@ -0,0 +1,2 @@
REACT_APP_DEFAULT_GATEWAY_URL=https://ucentral.dpaas.arilia.com:16001
REACT_APP_ALLOW_GATEWAY_CHANGE=false

2
public/locales/de/translation.json
View File

@@ -124,7 +124,7 @@
},
"login": {
"login": "Anmeldung",
"login error": "Anmeldefehler, bestätigen Sie, dass Ihr Benutzername, Ihr Passwort und Ihre Gateway-URL gültig sind",
"login_error": "Anmeldefehler, bestätigen Sie, dass Ihr Benutzername, Ihr Passwort und Ihre Gateway-URL gültig sind",
"password": "Passwort",
"please_enter_gateway": "Bitte geben Sie eine Gateway-URL ein",
"please_enter_password": "Bitte geben Sie Ihr Passwort ein",

2
public/locales/en/translation.json
View File

@@ -124,7 +124,7 @@
},
"login": {
"login": "Login",
"login error": "Login error, confirm that your username, password and gateway url are valid",
"login_error": "Login error, confirm that your username, password and gateway url are valid",
"password": "Password",
"please_enter_gateway": "Please enter a gateway URL",
"please_enter_password": "Please enter your password",

2
public/locales/es/translation.json
View File

@@ -124,7 +124,7 @@
},
"login": {
"login": "Iniciar sesión",
"login error": "Error de inicio de sesión, confirme que su nombre de usuario, contraseña y URL de puerta de enlace son válidos",
"login_error": "Error de inicio de sesión, confirme que su nombre de usuario, contraseña y URL de puerta de enlace son válidos",
"password": "Contraseña",
"please_enter_gateway": "Ingrese una URL de puerta de enlace",
"please_enter_password": "Por favor, introduzca su contraseña",

2
public/locales/fr/translation.json
View File

@@ -124,7 +124,7 @@
},
"login": {
"login": "S'identifier",
"login error": "Erreur de connexion, confirmez que votre nom d'utilisateur, mot de passe et URL de passerelle sont valides",
"login_error": "Erreur de connexion, confirmez que votre nom d'utilisateur, mot de passe et URL de passerelle sont valides",
"password": "Mot de passe",
"please_enter_gateway": "Veuillez saisir une URL de passerelle",
"please_enter_password": "s'il vous plait entrez votre mot de passe",

2
public/locales/pt/translation.json
View File

@@ -124,7 +124,7 @@
},
"login": {
"login": "Entrar",
"login error": "Erro de login, confirme se seu nome de usuário, senha e url de gateway são válidos",
"login_error": "Erro de login, confirme se seu nome de usuário, senha e url de gateway são válidos",
"password": "Senha",
"please_enter_gateway": "Insira um URL de gateway",
"please_enter_password": "Por favor, insira sua senha",

12
src/pages/LoginPage/index.js
View File

@@ -30,12 +30,14 @@ const Login = () => {
const dispatch = useDispatch();
const [userId, setUsername] = useState('');
const [password, setPassword] = useState('');
const [gatewayUrl, setGatewayUrl] = useState('https://ucentral.dpaas.arilia.com:16001');
const [gatewayUrl, setGatewayUrl] = useState(process.env.REACT_APP_DEFAULT_GATEWAY_URL);
const [hadError, setHadError] = useState(false);
const [emptyUsername, setEmptyUsername] = useState(false);
const [emptyPassword, setEmptyPassword] = useState(false);
const [emptyGateway, setEmptyGateway] = useState(false);
const placeholderUrl = 'Gateway URL (ex: https://ucentral.dpaas.arilia.com:16001)';
const defaultGatewayUrl = process.env.REACT_APP_DEFAULT_GATEWAY_URL;
const allowUrlChange = process.env.REACT_APP_ALLOW_GATEWAY_CHANGE === "true";
const loginErrorText = t('login.login_error');
const formValidation = () => {
@@ -62,10 +64,12 @@ const Login = () => {
};
const SignIn = (credentials) => {
const gatewayUrlToUse = allowUrlChange ? gatewayUrl : defaultGatewayUrl;
axiosInstance
.post(`${gatewayUrl}/api/v1/oauth2`, credentials)
.post(`${gatewayUrlToUse}/api/v1/oauth2`, credentials)
.then((response) => {
sessionStorage.setItem('gw_url', `${gatewayUrl}/api/v1`);
sessionStorage.setItem('gw_url', `${gatewayUrlToUse}/api/v1`);
sessionStorage.setItem('access_token', response.data.access_token);
dispatch({ type: 'set', connected: true });
})
@@ -147,7 +151,7 @@ const Login = () => {
{t('login.please_enter_password')}
</CInvalidFeedback>
</CInputGroup>
<CInputGroup className="mb-4">
<CInputGroup className="mb-4" hidden={!allowUrlChange}>
<CPopover content="Gateway URL">
<CInputGroupPrepend>
<CInputGroupText>