mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-28 17:09:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Added equivalent domains to /api/sync

Browse source
This commit is contained in:
Daniel García 2018-02-20 14:09:00 +01:00
parent e9a771057e
commit c8b45f5fe5
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/api/core/ciphers.rs
View file

@ -16,30 +16,28 @@ use db::models::*;
use util; use util;
use crypto; use crypto;
use api::{JsonResult, EmptyResult}; use api::{self, JsonResult, EmptyResult};
use auth::Headers; use auth::Headers;
use CONFIG; use CONFIG;
#[get("/sync")] #[get("/sync")]
fn sync(headers: Headers, conn: DbConn) -> JsonResult { fn sync(headers: Headers, conn: DbConn) -> JsonResult {
let user = &headers.user; let user_json = headers.user.to_json();
let folders = Folder::find_by_user(&user.uuid, &conn); let folders = Folder::find_by_user(&headers.user.uuid, &conn);
let folders_json: Vec<Value> = folders.iter().map(|c| c.to_json()).collect(); let folders_json: Vec<Value> = folders.iter().map(|c| c.to_json()).collect();
let ciphers = Cipher::find_by_user(&user.uuid, &conn); let ciphers = Cipher::find_by_user(&headers.user.uuid, &conn);
let ciphers_json: Vec<Value> = ciphers.iter().map(|c| c.to_json(&headers.host, &conn)).collect(); let ciphers_json: Vec<Value> = ciphers.iter().map(|c| c.to_json(&headers.host, &conn)).collect();
let domains_json = api::core::get_eq_domains(headers).unwrap().into_inner();
Ok(Json(json!({ Ok(Json(json!({
"Profile": user.to_json(), "Profile": user_json,
"Folders": folders_json, "Folders": folders_json,
"Ciphers": ciphers_json, "Ciphers": ciphers_json,
"Domains": { "Domains": domains_json,
"EquivalentDomains": [],
"GlobalEquivalentDomains": [],
"Object": "domains",
},
"Object": "sync" "Object": "sync"
}))) })))
} }

5
src/api/core/mod.rs
View file

@ -103,7 +103,7 @@ struct GlobalDomain {
const GLOBAL_DOMAINS: &'static str = include_str!("global_domains.json"); const GLOBAL_DOMAINS: &'static str = include_str!("global_domains.json");
#[get("/settings/domains")] #[get("/settings/domains")]
fn get_eq_domains(headers: Headers, conn: DbConn) -> JsonResult { fn get_eq_domains(headers: Headers) -> JsonResult {
let user = headers.user; let user = headers.user;
use serde_json::from_str; use serde_json::from_str;
@ -118,7 +118,8 @@ fn get_eq_domains(headers: Headers, conn: DbConn) -> JsonResult {
Ok(Json(json!({ Ok(Json(json!({
"EquivalentDomains": equivalent_domains, "EquivalentDomains": equivalent_domains,
"GlobalEquivalentDomains": globals "GlobalEquivalentDomains": globals,
"Object": "domains",
}))) })))
} }