Browse Source

Merge pull request #864 from mprasil/admin-invitation

Do not disable invitations via admin API
pull/876/head
Daniel García 5 years ago
committed by GitHub
parent
commit
c5b97f4146
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/api/admin.rs
  2. 3
      src/db/models/user.rs

4
src/api/admin.rs

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

3
src/db/models/user.rs

@ -319,8 +319,7 @@ impl Invitation {
}
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(),
None => false,
}

Loading…
Cancel
Save