diff --git a/buildtime/client/logical-editor/src/keycloak.ts b/buildtime/client/logical-editor/src/keycloak.ts new file mode 100644 index 000000000..65719eceb --- /dev/null +++ b/buildtime/client/logical-editor/src/keycloak.ts @@ -0,0 +1,7 @@ +import Keycloak from 'keycloak-js'; + const keycloak = new Keycloak({ + url: 'https://barefacedlean.ddnss.de:9099', + realm: 'simplycpq', + clientId: 'simplycpq', +}); +export default keycloak; diff --git a/buildtime/client/logical-editor/src/main.jsx b/buildtime/client/logical-editor/src/main.jsx index 9d3b33bfc..6cc4f2f9d 100644 --- a/buildtime/client/logical-editor/src/main.jsx +++ b/buildtime/client/logical-editor/src/main.jsx @@ -1,11 +1,16 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' +import keycloak from './keycloak'; import './index.css' import App from './App.jsx' -createRoot(document.getElementById('root')).render( - - - , -) +keycloak.init({ onLoad: 'login-required' }).then(() => { + createRoot(document.getElementById('root')).render( + + + + , + ) +}); + diff --git a/buildtime/client/material-editor/package-lock.json b/buildtime/client/material-editor/package-lock.json index 7ad351638..2fa15e454 100644 --- a/buildtime/client/material-editor/package-lock.json +++ b/buildtime/client/material-editor/package-lock.json @@ -14,6 +14,7 @@ "@mui/icons-material": "^9.2.0", "@mui/material": "^9.2.0", "@mui/x-data-grid": "^9.10.1", + "keycloak-js": "^26.2.4", "ky": "^2.0.2", "react": "^19.2.8", "react-dom": "^19.2.8", @@ -2570,6 +2571,15 @@ "node": ">=6" } }, + "node_modules/keycloak-js": { + "version": "26.2.4", + "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-26.2.4.tgz", + "integrity": "sha512-PnXpR3ubETGOt0B/Qt2lxmPbkZr5bc3vlQsOqDoTPPQsZRp7JjhTKxlJ187uWh8qJhvBab6Gsjb06a8ayOPfuw==", + "license": "Apache-2.0", + "workspaces": [ + "test" + ] + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", diff --git a/buildtime/client/material-editor/package.json b/buildtime/client/material-editor/package.json index 31de935dc..52533958c 100644 --- a/buildtime/client/material-editor/package.json +++ b/buildtime/client/material-editor/package.json @@ -16,6 +16,7 @@ "@mui/icons-material": "^9.2.0", "@mui/material": "^9.2.0", "@mui/x-data-grid": "^9.10.1", + "keycloak-js": "^26.2.4", "ky": "^2.0.2", "react": "^19.2.8", "react-dom": "^19.2.8", diff --git a/buildtime/server/src/scpq-editor-server/config.toml b/buildtime/server/src/scpq-editor-server/config.toml index 97ad78f39..f49905779 100644 --- a/buildtime/server/src/scpq-editor-server/config.toml +++ b/buildtime/server/src/scpq-editor-server/config.toml @@ -4,7 +4,7 @@ # password= dbname= [database] -connection_string = "host=192.168.178.50 port=5432 user=tsindt password=XD14ko8d dbname=simply_cpq_master_data sslmode=disable" +connection_string = "host=barefaced.ddnss.de port=5432 user=tsindt password=XD14ko8d dbname=simply_cpq_master_data sslmode=disable" driver_name = "postgres" ################################################################ @@ -13,4 +13,4 @@ driver_name = "postgres" [http] server_address = ":8088" -################################################################ \ No newline at end of file +################################################################