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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
9 deletions
-
src/api/admin.rs
-
src/db/models/user.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)?; |
|
|
|
|
|
|
|
|
|
@ -319,10 +319,9 @@ impl Invitation { |
|
|
|
} |
|
|
|
|
|
|
|
pub fn take(mail: &str, conn: &DbConn) -> bool { |
|
|
|
CONFIG.invitations_allowed() |
|
|
|
&& match Self::find_by_mail(mail, &conn) { |
|
|
|
Some(invitation) => invitation.delete(&conn).is_ok(), |
|
|
|
None => false, |
|
|
|
} |
|
|
|
match Self::find_by_mail(mail, &conn) { |
|
|
|
Some(invitation) => invitation.delete(&conn).is_ok(), |
|
|
|
None => false, |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|