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

Merge pull request #864 from mprasil/admin-invitation

Browse Source 
Do not disable invitations via admin API
This commit is contained in:
Daniel García 2020-02-16 22:12:00 +01:00 committed by GitHub
commit c5b97f4146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/admin.rs
View File

@ -153,10 +153,6 @@ fn invite_user(data: Json<InviteData>, _token: AdminToken, conn: DbConn) -> Empt
err!("User already exists") err!("User already exists")
} }
if !CONFIG.invitations_allowed() {
err!("Invitations are not allowed")
}
let mut user = User::new(email); let mut user = User::new(email);
user.save(&conn)?; user.save(&conn)?;

9
src/db/models/user.rs
View File

@ -319,10 +319,9 @@ impl Invitation {
} }
pub fn take(mail: &str, conn: &DbConn) -> bool { pub fn take(mail: &str, conn: &DbConn) -> bool {
CONFIG.invitations_allowed() match Self::find_by_mail(mail, &conn) {
&& match Self::find_by_mail(mail, &conn) { Some(invitation) => invitation.delete(&conn).is_ok(),
Some(invitation) => invitation.delete(&conn).is_ok(), None => false,
None => false, }
}
} }
} }