Config can now be serialized / deserialized

This commit is contained in:
Daniel García
2019-02-02 01:09:21 +01:00
parent 20d8d800f3
commit 86ed75bf7c
8 changed files with 207 additions and 261 deletions

View File

@@ -24,6 +24,8 @@ pub fn routes() -> Vec<Route> {
invite_user,
delete_user,
deauth_user,
get_config,
post_config,
]
}
@@ -136,11 +138,11 @@ fn invite_user(data: JsonUpcase<InviteData>, _token: AdminToken, conn: DbConn) -
err!("Invitations are not allowed")
}
if let Some(ref mail_config) = CONFIG.mail() {
if CONFIG.mail_enabled() {
let mut user = User::new(email);
user.save(&conn)?;
let org_name = "bitwarden_rs";
mail::send_invite(&user.email, &user.uuid, None, None, &org_name, None, mail_config)
mail::send_invite(&user.email, &user.uuid, None, None, &org_name, None)
} else {
let mut invitation = Invitation::new(data.Email);
invitation.save(&conn)
@@ -169,6 +171,20 @@ fn deauth_user(uuid: String, _token: AdminToken, conn: DbConn) -> EmptyResult {
user.save(&conn)
}
#[get("/config")]
fn get_config(_token: AdminToken) -> EmptyResult {
unimplemented!("Get config")
}
#[post("/config", data = "<data>")]
fn post_config(data: JsonUpcase<Value>, _token: AdminToken) -> EmptyResult {
let data: Value = data.into_inner().data;
info!("CONFIG: {:#?}", data);
unimplemented!("Update config")
}
pub struct AdminToken {}
impl<'a, 'r> FromRequest<'a, 'r> for AdminToken {