1
0
Fork 0

remove some unneeded mutability

Dieser Commit ist enthalten in:
Дамјан Георгиевски 2019-02-22 20:25:50 +01:00
Ursprung aeb4b4c8a5
Commit 473f8b8e31
5 geänderte Dateien mit 15 neuen und 15 gelöschten Zeilen

Datei anzeigen

@ -149,7 +149,7 @@ fn invite_user(data: Json<InviteData>, _token: AdminToken, conn: DbConn) -> Empt
let org_name = "bitwarden_rs"; let org_name = "bitwarden_rs";
mail::send_invite(&user.email, &user.uuid, None, None, &org_name, None) mail::send_invite(&user.email, &user.uuid, None, None, &org_name, None)
} else { } else {
let mut invitation = Invitation::new(data.email); let invitation = Invitation::new(data.email);
invitation.save(&conn) invitation.save(&conn)
} }
} }

Datei anzeigen

@ -76,9 +76,9 @@ struct NewCollectionData {
fn create_organization(headers: Headers, data: JsonUpcase<OrgData>, conn: DbConn) -> JsonResult { fn create_organization(headers: Headers, data: JsonUpcase<OrgData>, conn: DbConn) -> JsonResult {
let data: OrgData = data.into_inner().data; let data: OrgData = data.into_inner().data;
let mut org = Organization::new(data.Name, data.BillingEmail); let org = Organization::new(data.Name, data.BillingEmail);
let mut user_org = UserOrganization::new(headers.user.uuid.clone(), org.uuid.clone()); let mut user_org = UserOrganization::new(headers.user.uuid.clone(), org.uuid.clone());
let mut collection = Collection::new(org.uuid.clone(), data.CollectionName); let collection = Collection::new(org.uuid.clone(), data.CollectionName);
user_org.key = data.Key; user_org.key = data.Key;
user_org.access_all = true; user_org.access_all = true;
@ -221,7 +221,7 @@ fn post_organization_collections(
None => err!("Can't find organization details"), None => err!("Can't find organization details"),
}; };
let mut collection = Collection::new(org.uuid.clone(), data.Name); let collection = Collection::new(org.uuid.clone(), data.Name);
collection.save(&conn)?; collection.save(&conn)?;
Ok(Json(collection.to_json())) Ok(Json(collection.to_json()))
@ -484,7 +484,7 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
} }
if !CONFIG.mail_enabled() { if !CONFIG.mail_enabled() {
let mut invitation = Invitation::new(email.clone()); let invitation = Invitation::new(email.clone());
invitation.save(&conn)?; invitation.save(&conn)?;
} }
@ -581,7 +581,7 @@ fn reinvite_user(org_id: String, user_org: String, headers: AdminHeaders, conn:
Some(headers.user.email), Some(headers.user.email),
)?; )?;
} else { } else {
let mut invitation = Invitation::new(user.email.clone()); let invitation = Invitation::new(user.email.clone());
invitation.save(&conn)?; invitation.save(&conn)?;
} }
@ -851,7 +851,7 @@ fn post_org_import(
.Collections .Collections
.into_iter() .into_iter()
.map(|coll| { .map(|coll| {
let mut collection = Collection::new(org_id.clone(), coll.Name); let collection = Collection::new(org_id.clone(), coll.Name);
if collection.save(&conn).is_err() { if collection.save(&conn).is_err() {
err!("Failed to create Collection"); err!("Failed to create Collection");
} }

Datei anzeigen

@ -43,11 +43,11 @@ use crate::error::MapResult;
/// Database methods /// Database methods
impl Collection { impl Collection {
pub fn save(&mut self, conn: &DbConn) -> EmptyResult { pub fn save(&self, conn: &DbConn) -> EmptyResult {
self.update_users_revision(conn); self.update_users_revision(conn);
diesel::replace_into(collections::table) diesel::replace_into(collections::table)
.values(&*self) .values(self)
.execute(&**conn) .execute(&**conn)
.map_res("Error saving collection") .map_res("Error saving collection")
} }

Datei anzeigen

@ -213,7 +213,7 @@ use crate::error::MapResult;
/// Database methods /// Database methods
impl Organization { impl Organization {
pub fn save(&mut self, conn: &DbConn) -> EmptyResult { pub fn save(&self, conn: &DbConn) -> EmptyResult {
UserOrganization::find_by_org(&self.uuid, conn) UserOrganization::find_by_org(&self.uuid, conn)
.iter() .iter()
.for_each(|user_org| { .for_each(|user_org| {
@ -221,7 +221,7 @@ impl Organization {
}); });
diesel::replace_into(organizations::table) diesel::replace_into(organizations::table)
.values(&*self) .values(self)
.execute(&**conn) .execute(&**conn)
.map_res("Error saving organization") .map_res("Error saving organization")
} }
@ -323,11 +323,11 @@ impl UserOrganization {
}) })
} }
pub fn save(&mut self, conn: &DbConn) -> EmptyResult { pub fn save(&self, conn: &DbConn) -> EmptyResult {
User::update_uuid_revision(&self.user_uuid, conn); User::update_uuid_revision(&self.user_uuid, conn);
diesel::replace_into(users_organizations::table) diesel::replace_into(users_organizations::table)
.values(&*self) .values(self)
.execute(&**conn) .execute(&**conn)
.map_res("Error adding user to organization") .map_res("Error adding user to organization")
} }

Datei anzeigen

@ -225,13 +225,13 @@ impl Invitation {
Self { email } Self { email }
} }
pub fn save(&mut self, conn: &DbConn) -> EmptyResult { pub fn save(&self, conn: &DbConn) -> EmptyResult {
if self.email.trim().is_empty() { if self.email.trim().is_empty() {
err!("Invitation email can't be empty") err!("Invitation email can't be empty")
} }
diesel::replace_into(invitations::table) diesel::replace_into(invitations::table)
.values(&*self) .values(self)
.execute(&**conn) .execute(&**conn)
.map_res("Error saving invitation") .map_res("Error saving invitation")
} }