Updated secrets held in env vars.
This commit is contained in:
parent
d9247d2504
commit
b443c28e4b
11
.env.example
11
.env.example
@ -1,9 +1,2 @@
|
||||
DB_LINK="mongo-link-to-connect"
|
||||
|
||||
JWT_SECRET="token"
|
||||
|
||||
APP_URL_CLIENT=https://material-dashboard-react-node.creative-tim.com
|
||||
APP_URL_API=https://node-json-api-free.creative-tim.com/login
|
||||
|
||||
MAILTRAP_USER=
|
||||
MAILTRAP_PASSWORD=
|
||||
SESSION_SECRET='SECRET'
|
||||
KEYCLOAK_CLIENT_SECRET='SECRET'
|
||||
12
config.json
12
config.json
@ -9,11 +9,9 @@
|
||||
"keycloak": {
|
||||
"url": "https://auth.tombutcher.work",
|
||||
"realm": "master",
|
||||
"clientId": "farmcontrol-client",
|
||||
"clientSecret": "REDACTED"
|
||||
"clientId": "farmcontrol-client"
|
||||
},
|
||||
"requiredRoles": [],
|
||||
"sessionSecret": "REDACTED"
|
||||
"requiredRoles": []
|
||||
},
|
||||
"app": {
|
||||
"urlClient": "http://localhost:3000",
|
||||
@ -60,11 +58,9 @@
|
||||
"keycloak": {
|
||||
"url": "https://auth.tombutcher.work",
|
||||
"realm": "master",
|
||||
"clientId": "farmcontrol-client",
|
||||
"clientSecret": "REDACTED"
|
||||
"clientId": "farmcontrol-client"
|
||||
},
|
||||
"requiredRoles": [],
|
||||
"sessionSecret": "REDACTED"
|
||||
"requiredRoles": []
|
||||
},
|
||||
"app": {
|
||||
"urlClient": "http://localhost:3000",
|
||||
|
||||
@ -25,7 +25,27 @@ function loadConfig() {
|
||||
throw new Error(`Configuration for environment '${NODE_ENV}' not found in config.json`);
|
||||
}
|
||||
|
||||
return config[NODE_ENV];
|
||||
const envConfig = config[NODE_ENV];
|
||||
|
||||
// Override secrets with environment variables if available
|
||||
if (process.env.KEYCLOAK_CLIENT_SECRET) {
|
||||
if (!envConfig.auth) {
|
||||
envConfig.auth = {};
|
||||
}
|
||||
if (!envConfig.auth.keycloak) {
|
||||
envConfig.auth.keycloak = {};
|
||||
}
|
||||
envConfig.auth.keycloak.clientSecret = process.env.KEYCLOAK_CLIENT_SECRET;
|
||||
}
|
||||
|
||||
if (process.env.SESSION_SECRET) {
|
||||
if (!envConfig.auth) {
|
||||
envConfig.auth = {};
|
||||
}
|
||||
envConfig.auth.sessionSecret = process.env.SESSION_SECRET;
|
||||
}
|
||||
|
||||
return envConfig;
|
||||
} catch (err) {
|
||||
console.error('Error loading config:', err);
|
||||
throw err;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user