Merge branch 'songtronix/hotfix' into 'master'

fix: do not store the password in the settings

See merge request veloren/veloren!1107
This commit is contained in:
Songtronix 2020-06-24 09:09:41 +00:00
commit c8b708b2d3
2 changed files with 0 additions and 3 deletions

View File

@ -258,7 +258,6 @@ fn attempt_login(
) {
let mut net_settings = &mut global_state.settings.networking;
net_settings.username = username.clone();
net_settings.password = password.clone();
if !net_settings.servers.contains(&server_address) {
net_settings.servers.push(server_address.clone());
}

View File

@ -506,7 +506,6 @@ impl Default for GameplaySettings {
#[serde(default)]
pub struct NetworkingSettings {
pub username: String,
pub password: String,
pub servers: Vec<String>,
pub default_server: usize,
pub trusted_auth_servers: HashSet<String>,
@ -516,7 +515,6 @@ impl Default for NetworkingSettings {
fn default() -> Self {
Self {
username: "Username".to_string(),
password: String::default(),
servers: vec!["server.veloren.net".to_string()],
default_server: 0,
trusted_auth_servers: ["https://auth.veloren.net"]