diff --git a/.env b/.env index ea19c51..2488d38 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -KC_URL="https://auth-dev.csi.wmi.amu.edu.pl/" -KC_REALM="gonito-dev" -KC_CLIENT_ID="gonito-dev-heroku" +REACT_APP_KC_URL=https://auth-dev.csi.wmi.amu.edu.pl/ +REACT_APP_KC_REALM=gonito-dev +REACT_APP_KC_CLIENT_ID=gonito-dev-heroku diff --git a/Dockerfile b/Dockerfile index bbbe6cb..8242a89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,11 @@ COPY package.json ./ COPY package-lock.json ./ RUN npm install --silent RUN npm install react-scripts@3.4.1 -g --silent +RUN npm install -g serve --save +RUN npm audit fix # add app -COPY . ./ +COPY . /app/ # start app CMD ["npm", "start"] diff --git a/docker-compose.yml b/docker-compose.yml index 623893a..1ed62ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,14 @@ version: '3.7' - services: - - sample: - container_name: gonito + gonito: + container_name: gonito_frontend build: context: . dockerfile: Dockerfile - # volumes: - # - '.:/app' - # - '/app/node_modules' ports: - - 3001:3000 + - 3000:3000 environment: - - CHOKIDAR_USEPOLLING=true \ No newline at end of file + - CHOKIDAR_USEPOLLING=true + - REACT_APP_KC_URL=${REACT_APP_KC_URL} + - REACT_APP_KC_REALM=${REACT_APP_KC_REALM} + - REACT_APP_KC_CLIENT_ID=${REACT_APP_KC_CLIENT_ID} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9d9f2b3..e519ef9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6619,14 +6619,6 @@ "tslib": "^2.0.3" } }, - "node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "engines": { - "node": ">=10" - } - }, "node_modules/dotenv-expand": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", @@ -14245,6 +14237,14 @@ } } }, + "node_modules/react-scripts/node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -21726,11 +21726,6 @@ "tslib": "^2.0.3" } }, - "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" - }, "dotenv-expand": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", @@ -27080,6 +27075,13 @@ "webpack-dev-server": "^4.6.0", "webpack-manifest-plugin": "^4.0.2", "workbox-webpack-plugin": "^6.4.1" + }, + "dependencies": { + "dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" + } } }, "read-cache": { diff --git a/public/index.html b/public/index.html index ee79038..706204d 100644 --- a/public/index.html +++ b/public/index.html @@ -39,5 +39,22 @@ To begin the development, run `npm start` or `yarn start`. To create a production bundle, use `npm run build` or `yarn build`. --> + diff --git a/src/services/KeyCloakService.js b/src/services/KeyCloakService.js index 8e55196..64e0930 100644 --- a/src/services/KeyCloakService.js +++ b/src/services/KeyCloakService.js @@ -1,9 +1,9 @@ import Keycloak from 'keycloak-js'; const _kc = new Keycloak({ - url: 'https://auth-dev.csi.wmi.amu.edu.pl/', - realm: 'gonito-dev', - clientId: 'gonito-dev-heroku' + url: process.env.REACT_APP_KC_URL, + realm: process.env.REACT_APP_KC_REALM, + clientId: process.env.REACT_APP_KC_CLIENT_ID }); const initKeycloak = (onAuthenticatedCallback) => {