s444498/gonito-frontend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mattyl006/gonito

Browse Source
This commit is contained in:
Mateusz Tylka 2023-02-01 14:26:33 +01:00
commit 1c6655f62b
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,5 +1,5 @@
REACT_APP_KC_URL=https://auth-dev.csi.wmi.amu.edu.pl/ REACT_APP_KC_URL=https://auth-dev.csi.wmi.amu.edu.pl/
REACT_APP_KC_REALM=gonito-dev REACT_APP_KC_REALM=gonito-dev
REACT_APP_KC_CLIENT_ID=gonito-dev-heroku REACT_APP_KC_CLIENT_ID=gonito-dev-localhost
REACT_APP_API=https://gonito.net/api REACT_APP_API=https://gonito.net/api

2
README.md
View File

@ -12,4 +12,4 @@ App will work on port 3000.
## Keycloak ## Keycloak
Set variables in *.env* to choose keycloak connect. Set variables in *.env* to choose keycloak connect and API url.

11
src/services/KeyCloakService.js
View File

@ -25,7 +25,14 @@ const initKeycloak = (onAuthenticatedCallback) => {
.catch(console.error); .catch(console.error);
}; };
const doLogin = _kc.login; const doLogin = () => {
const privacyPolicyAccept = localStorage.getItem('privacyPolicy');
if (privacyPolicyAccept !== 'accept') {
window.location = `${ROOT_URL}${POLICY_PRIVACY_PAGE}`;
} else {
_kc.login();
}
};
const doLogout = () => { const doLogout = () => {
sessionStorage.clear(); sessionStorage.clear();
@ -37,7 +44,7 @@ const getToken = () => _kc.token;
const doRegister = () => { const doRegister = () => {
const privacyPolicyAccept = localStorage.getItem('privacyPolicy'); const privacyPolicyAccept = localStorage.getItem('privacyPolicy');
if (privacyPolicyAccept !== 'accept') { if (privacyPolicyAccept !== 'accept') {
window.location.replace(`${ROOT_URL}${POLICY_PRIVACY_PAGE}`); window.location = `${ROOT_URL}${POLICY_PRIVACY_PAGE}`;
} else { } else {
_kc.register(); _kc.register();
} }