1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-26 05:50:29 +01:00

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

Return proper error message for org reinvite
Dieser Commit ist enthalten in:
mprasil 2018-10-05 23:21:08 +01:00 committet von GitHub
Commit 1f35ef2865
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
2 geänderte Dateien mit 6 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -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,

Datei anzeigen

@ -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;