0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 16:22:44 +00:00

Add local_environments to configuration files

Add `local` parameter to global `config` object to avoid repeating tests
JWT key `secret` only added to global object `config` when local installation detected
This commit is contained in:
G.Ambatte
2022-03-07 14:14:32 +13:00
parent 7c2663fa56
commit 535291a91a
3 changed files with 12 additions and 6 deletions

View File

@@ -43,8 +43,6 @@ const Account = createClass({
},
render : function(){
const localEnvironments = ['local', 'docker'];
// Logged in
if(global.account){
return <Nav.dropdown>
@@ -75,7 +73,7 @@ const Account = createClass({
// Logged out
// LOCAL ONLY
if(localEnvironments.includes(global.config.environment)) {
if(global.config.local) {
return <Nav.item color='teal' icon='fas fa-sign-in-alt' onClick={this.localLogin}>
login
</Nav.item>;

View File

@@ -3,5 +3,6 @@
"naturalcrit_url" : "local.naturalcrit.com:8010",
"secret" : "secret",
"web_port" : 8000,
"enable_v3" : true
"enable_v3" : true,
"local_environments" : ["docker", "local"]
}

View File

@@ -262,9 +262,16 @@ app.get('/print/:id', asyncHandler(async (req, res, next)=>{
//Render the page
const templateFn = require('./../client/template.js');
app.use((req, res)=>{
// Create configuration object
const configuration = {
environment : config.get('node_env'),
secret : config.get('secret')
local : false,
environment : config.get('node_env')
};
// Add local only items to configuration object
const localEnvironments = config.get('local_environments');
if(localEnvironments.includes(configuration.environment)){
configuration.local = true;
configuration.secret = config.get('secret');
};
const props = {
version : require('./../package.json').version,