vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-11-22 05:06:37 +00:00
Code Issues Releases Wiki Activity

Fix folder notifications, enable template strict mode and add missing option to env template

Browse Source
This commit is contained in:
Daniel García 2019-01-15 15:28:25 +01:00
parent 0e4a746eeb
commit 4bf32af60e
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.template
View File

@ -23,6 +23,9 @@
# WEB_VAULT_FOLDER=web-vault/ # WEB_VAULT_FOLDER=web-vault/
# WEB_VAULT_ENABLED=true # WEB_VAULT_ENABLED=true
## Enables websocket notifications
# WEBSOCKET_ENABLED=false
## Controls the WebSocket server address and port ## Controls the WebSocket server address and port
# WEBSOCKET_ADDRESS=0.0.0.0 # WEBSOCKET_ADDRESS=0.0.0.0
# WEBSOCKET_PORT=3012 # WEBSOCKET_PORT=3012

5
src/api/core/ciphers.rs
View File

@ -299,11 +299,12 @@ pub fn update_cipher_from_data(
cipher.data = type_data.to_string(); cipher.data = type_data.to_string();
cipher.password_history = data.PasswordHistory.map(|f| f.to_string()); cipher.password_history = data.PasswordHistory.map(|f| f.to_string());
cipher.move_to_folder(data.FolderId, &headers.user.uuid, &conn)?;
cipher.save(&conn)?; cipher.save(&conn)?;
nt.send_cipher_update(ut, &cipher, &cipher.update_users_revision(&conn)); nt.send_cipher_update(ut, &cipher, &cipher.update_users_revision(&conn));
cipher.move_to_folder(data.FolderId, &headers.user.uuid, &conn) Ok(())
} }
use super::folders::FolderData; use super::folders::FolderData;
@ -884,7 +885,7 @@ fn delete_all(data: JsonUpcase<PasswordData>, headers: Headers, conn: DbConn, nt
// Delete folders // Delete folders
for f in Folder::find_by_user(&user.uuid, &conn) { for f in Folder::find_by_user(&user.uuid, &conn) {
f.delete(&conn)?; f.delete(&conn)?;
nt.send_folder_update(UpdateType::FolderCreate, &f); nt.send_folder_update(UpdateType::FolderDelete, &f);
} }
Ok(()) Ok(())

2
src/main.rs
View File

@ -334,6 +334,8 @@ pub struct Config {
fn load_templates(path: String) -> Handlebars { fn load_templates(path: String) -> Handlebars {
let mut hb = Handlebars::new(); let mut hb = Handlebars::new();
// Error on missing params
hb.set_strict_mode(true);
macro_rules! reg { macro_rules! reg {
($name:expr) => { ($name:expr) => {