diff --git a/client/index.html b/client/index.html index 91b12349..3e650edd 100644 --- a/client/index.html +++ b/client/index.html @@ -3,6 +3,8 @@ Nuage + + diff --git a/client/pages/connectpage/form.js b/client/pages/connectpage/form.js index 84808500..a791f08f 100644 --- a/client/pages/connectpage/form.js +++ b/client/pages/connectpage/form.js @@ -488,9 +488,7 @@ function formHelper(WrappedComponent){ const helpers = { should_appear: function(key){ const val = props.config[key]; - if(val === false) return false; - else if(val === null) return false; - else if(val === undefined) return true; + if(val === undefined) return true; return false; }, input_type: function(key){ diff --git a/client/pages/connectpage/rememberme.js b/client/pages/connectpage/rememberme.js index c0b30c2d..76aedd89 100644 --- a/client/pages/connectpage/rememberme.js +++ b/client/pages/connectpage/rememberme.js @@ -2,9 +2,12 @@ import React from 'react'; import './rememberme.scss'; export const RememberMe = (props) => { - return ( - - ); + if(CONFIG.remember_me !== false){ + return ( + + ); + } + return null; }; diff --git a/server/common/config.go b/server/common/config.go index bc7dce0a..253ded11 100644 --- a/server/common/config.go +++ b/server/common/config.go @@ -29,6 +29,7 @@ type Config struct { ForkButton bool `json:"fork_button"` DisplayHidden bool `json:"display_hidden"` AutoConnect bool `json:"auto_connect"` + RememberMe *bool `json:"remember_me"` } `json:"general"` Log struct { Enable bool `json:"enable"` @@ -56,9 +57,10 @@ type Config struct { Password *string `json:"password,omitempty"` Url *string `json:"url,omitempty"` Advanced *bool `json:"advanced,omitempty"` - Port *uint `json:"port,omitempty"` + Port *string `json:"port,omitempty"` Path *string `json:"path,omitempty"` Passphrase *string `json:"passphrase,omitempty"` + Conn *string `json:"conn"` SecretAccessKey *string `json:"secret_access_key,omitempty"` AccessKeyId *string `json:"access_key_id,omitempty"` Endpoint *string `json:"endpoint,omitempty"` @@ -172,6 +174,7 @@ func (c *Config) Export() (string, error) { DisplayHidden bool `json:"display_hidden"` AutoConnect bool `json:"auto_connect"` Name string `json:"name"` + RememberMe *bool `json:"remember_me"` Connections interface{} `json:"connections"` MimeTypes map[string]string `json:"mime"` }{ @@ -182,6 +185,7 @@ func (c *Config) Export() (string, error) { Connections: c.Connections, MimeTypes: c.MimeTypes, Name: c.General.Name, + RememberMe: c.General.RememberMe, } j, err := json.Marshal(publicConf) if err != nil {