OpenSource/vaultwarden
OpenSource/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-03 21:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #209 from janost/resend-invitation-error-message

Browse source 
Return proper error message for org reinvite
This commit is contained in:
mprasil 2018-10-05 23:21:08 +01:00 committed by GitHub
commit 1f35ef2865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/api/core/mod.rs
View file

@ -112,6 +112,7 @@ pub fn routes() -> Vec<Route> {
put_organization_user, put_organization_user,
delete_user, delete_user,
post_delete_user, post_delete_user,
post_reinvite_user,
post_org_import, post_org_import,
clear_device_token, clear_device_token,

5
src/api/core/organizations.rs
View file

@ -592,6 +592,11 @@ fn post_delete_user(org_id: String, org_user_id: String, headers: AdminHeaders,
delete_user(org_id, org_user_id, headers, conn) delete_user(org_id, org_user_id, headers, conn)
} }
#[post("/organizations/<_org_id>/users/<_org_user_id>/reinvite")]
fn post_reinvite_user(_org_id: String, _org_user_id: String, _headers: AdminHeaders, _conn: DbConn) -> EmptyResult {
err!("This functionality is not implemented. The user needs to manually register before they can be accepted into the organization.")
}
use super::ciphers::CipherData; use super::ciphers::CipherData;
use super::ciphers::update_cipher_from_data; use super::ciphers::update_cipher_from_data;