kaizenkodo/HEL
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor read_password function to take just the name as argument, not the prompt.

Browse Source
This commit is contained in:
Oleksandr Kozachuk
2023-01-07 13:40:00 +01:00
parent 54c2c0e5a1
commit 122aeaf75b
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hel/src/commands.rs
+4 -4
View File
@@ -46,7 +46,7 @@ impl<'a> LKEval<'a> {
(_, Some(s)) => Some(s.to_string()),
(None, None) => {
if read {
match (self.read_password)("Master: ".to_string()) {
match (self.read_password)("/".to_string()) {
Ok(password) => {
let name = "/".to_string();
self.cmd_correct(&out, &name, true, Some(password.clone()));
@@ -61,7 +61,7 @@ impl<'a> LKEval<'a> {
}
(Some(pn), None) => {
let password = if read {
(self.read_password)(format!("Password for {}: ", pn.lock().borrow().name)).ok()
(self.read_password)(pn.lock().borrow().name.to_string()).ok()
} else {
None
};
@@ -139,7 +139,7 @@ impl<'a> LKEval<'a> {
Some(p) => {
let pwd = match pass {
Some(pp) => pp.to_string(),
None => (self.read_password)(format!("Password for {}: ", p.lock().borrow().name)).unwrap(),
None => (self.read_password)(p.lock().borrow().name.to_string()).unwrap(),
};
self.cmd_correct(&out, &p.lock().borrow().name, true, Some(pwd.clone()));
self.state.lock().borrow_mut().secrets.insert(p.lock().borrow().name.to_string(), pwd);
@@ -148,7 +148,7 @@ impl<'a> LKEval<'a> {
if name == "/" {
let pwd = match pass {
Some(pp) => pp.to_string(),
None => (self.read_password)("Master: ".to_string()).unwrap(),
None => (self.read_password)("/".to_string()).unwrap(),
};
self.cmd_correct(&out, &"/".to_string(), true, Some(pwd.clone()));
self.state.lock().borrow_mut().secrets.insert("/".to_string(), pwd);