From cd99d653dd840689f53acb1168607eabb5f0ceca Mon Sep 17 00:00:00 2001 From: Borelli-7 Date: Mon, 12 Feb 2024 18:16:19 +0100 Subject: [PATCH] Remove password commited --- .../src/test/resources/jwt-config.properties | 12 +++++------- frontend/datasafe-ui/src/env.js | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/datasafe-rest-impl/src/test/resources/jwt-config.properties b/datasafe-rest-impl/src/test/resources/jwt-config.properties index 7402462a6..a35818175 100644 --- a/datasafe-rest-impl/src/test/resources/jwt-config.properties +++ b/datasafe-rest-impl/src/test/resources/jwt-config.properties @@ -1,7 +1,5 @@ -debug=false -management.endpoints.web.exposure.include=* - -jwt_secret=n2r5u8x/A%D*G-KaPdSgVkYp3s6v9y$B&E(H+MbQeThWmZq4t7w!z%C*F-J@NcRf -default_user=username -default_password=password -token_expiration=864000000 +jwt_secret=${JWT_SECRET} +default_user=${DEFAULT_USER} +default_password=${DEFAULT_PASSWORD} +#10 Days in ms +token_expiration=${TOKEN_EXPIRATION:864000000} \ No newline at end of file diff --git a/frontend/datasafe-ui/src/env.js b/frontend/datasafe-ui/src/env.js index 5526ce23a..6d0d1f1c2 100644 --- a/frontend/datasafe-ui/src/env.js +++ b/frontend/datasafe-ui/src/env.js @@ -1,9 +1,9 @@ (function (window) { window.__env = window.__env || {}; - window.__env.apiUrl = 'http://localhost:8080'; + window.__env.apiUrl = '${API_URL}'; // ideally these are not necessary, but API is protected, so supplying it for docker-local deployment - window.__env.apiUsername = 'username'; - window.__env.apiPassword = 'password'; + window.__env.apiUsername = '${API_USERNAME}'; + window.__env.apiPassword = '${API_PASSWORD}'; }(this)); \ No newline at end of file