@ -1,7 +1,7 @@
use std ::collections ::{ HashMap , HashSet } ;
use num_traits ::FromPrimitive ;
use rocket ::{ Route , serde ::json ::Json } ;
use rocket ::{ Route , http ::Status , serde ::json ::Json } ;
use serde_json ::Value ;
use crate ::{
@ -15,9 +15,10 @@ use crate::{
db ::{
DbConn ,
models ::{
Cipher , CipherId , Collection , CollectionCipher , CollectionGroup , CollectionId , CollectionUser , EventType ,
Group , GroupId , GroupUser , Invitation , Membership , MembershipId , MembershipStatus , MembershipType ,
OrgPolicy , OrgPolicyType , Organization , OrganizationApiKey , OrganizationId , User , UserId ,
Cipher , CipherId , Collection , CollectionCipher , CollectionGroup , CollectionId , CollectionUser , Device ,
EventType , Group , GroupId , GroupUser , Invitation , Membership , MembershipId , MembershipStatus ,
MembershipType , OrgPolicy , OrgPolicyType , Organization , OrganizationApiKey , OrganizationId , TwoFactor ,
TwoFactorType , User , UserId ,
} ,
} ,
mail ,
@ -25,12 +26,13 @@ use crate::{
util ::{ NumberOrString , convert_json_key_lcase_first } ,
} ;
use super ::accounts ::{ AuthenticationData , UnlockData } ;
pub fn routes ( ) -> Vec < Route > {
routes ! [
get_organization ,
create_organization ,
delete_organization ,
post_delete_organization ,
leave_organization ,
get_user_collections ,
get_org_collections ,
@ -38,13 +40,10 @@ pub fn routes() -> Vec<Route> {
get_org_collection_detail ,
get_collection_users ,
put_organization ,
post_organization ,
post_organization_collections ,
post_bulk_access_collections ,
post_organization_collection_update ,
put_organization_collection_update ,
delete_organization_collection ,
post_organization_collection_delete ,
bulk_delete_organization_collections ,
post_bulk_collections ,
get_org_details ,
@ -59,7 +58,6 @@ pub fn routes() -> Vec<Route> {
get_org_user_mini_details ,
get_user ,
edit_member ,
put_member ,
delete_member ,
bulk_delete_member ,
post_org_import ,
@ -69,7 +67,6 @@ pub fn routes() -> Vec<Route> {
get_master_password_policy ,
get_policy ,
put_policy ,
put_policy_vnext ,
get_plans ,
post_org_keys ,
get_organization_keys ,
@ -85,22 +82,16 @@ pub fn routes() -> Vec<Route> {
post_groups ,
get_group ,
put_group ,
post_group ,
get_group_details ,
delete_group ,
post_delete_group ,
bulk_delete_groups ,
get_group_members ,
put_group_members ,
post_delete_group_member ,
put_reset_password_enrollment ,
get_reset_password_details ,
put_reset_password ,
put_recover_account ,
get_org_export ,
post_api_key ,
rotate_api_key ,
get_billing_metadata ,
get_billing_warnings ,
get_auto_enroll_status ,
get_self_host_billing_metadata ,
@ -132,7 +123,6 @@ struct FullCollectionData {
name : String ,
groups : Vec < CollectionGroupData > ,
users : Vec < CollectionMembershipData > ,
id : Option < CollectionId > ,
external_id : Option < String > ,
}
@ -245,16 +235,6 @@ async fn delete_organization(
}
}
#[ post( " /organizations/<org_id>/delete " , data = " <data> " ) ]
async fn post_delete_organization (
org_id : OrganizationId ,
data : Json < PasswordOrOtpData > ,
headers : OwnerHeaders ,
conn : DbConn ,
) -> EmptyResult {
delete_organization ( org_id , data , headers , conn ) . await
}
#[ post( " /organizations/<org_id>/leave " ) ]
async fn leave_organization ( org_id : OrganizationId , headers : OrgMemberHeaders , conn : DbConn ) -> EmptyResult {
if headers . membership . status ! = MembershipStatus ::Confirmed as i32 {
@ -269,7 +249,7 @@ async fn leave_organization(org_id: OrganizationId, headers: OrgMemberHeaders, c
}
log_event (
EventType ::OrganizationUserLeft as i32 ,
EventType ::OrganizationUserLeft ,
& membership . uuid ,
& org_id ,
& headers . user . uuid ,
@ -300,16 +280,6 @@ async fn put_organization(
headers : OwnerHeaders ,
data : Json < OrganizationUpdateData > ,
conn : DbConn ,
) -> JsonResult {
post_organization ( org_id , headers , data , conn ) . await
}
#[ post( " /organizations/<org_id> " , data = " <data> " ) ]
async fn post_organization (
org_id : OrganizationId ,
headers : OwnerHeaders ,
data : Json < OrganizationUpdateData > ,
conn : DbConn ,
) -> JsonResult {
if org_id ! = headers . org_id {
err ! ( "Organization not found" , "Organization id's do not match" ) ;
@ -327,7 +297,7 @@ async fn post_organization(
org . save ( & conn ) . await ? ;
log_event (
EventType ::OrganizationUpdated as i32 ,
EventType ::OrganizationUpdated ,
org_id . as_ref ( ) ,
& org_id ,
& headers . user . uuid ,
@ -391,7 +361,7 @@ async fn get_org_collections(org_id: OrganizationId, headers: ManagerHeadersLoos
}
if ! headers . membership . has_full_access ( ) {
err_code ! ( "Resource not found." , "User does not have full access" , rocket ::http ::Status ::NotFound . code ) ;
err_code ! ( "Resource not found." , "User does not have full access" , Status ::NotFound . code ) ;
}
Ok ( Json ( json ! ( {
@ -415,8 +385,9 @@ async fn get_org_collections_details(org_id: OrganizationId, headers: ManagerHea
let col_users = CollectionUser ::find_by_organization_swap_user_uuid_with_member_uuid ( & org_id , & conn ) . await ;
// Generate a HashMap to get the correct MembershipType per user to determine the manage permission
// We use the uuid instead of the user_uuid here, since that is what is used in CollectionUser
// This lists other members for admins, so it must not depend on the membership status
let membership_type : HashMap < MembershipId , i32 > =
Membership ::find_confirmed_ by_org ( & org_id , & conn ) . await . into_iter ( ) . map ( | m | ( m . uuid , m . atype ) ) . collect ( ) ;
Membership ::find_by_org ( & org_id , & conn ) . await . into_iter ( ) . map ( | m | ( m . uuid , m . atype ) ) . collect ( ) ;
// check if current user has full access to the organization (either directly or via any group)
let has_full_access_to_org = member . has_full_access ( )
@ -514,7 +485,7 @@ async fn post_organization_collections(
collection . save ( & conn ) . await ? ;
log_event (
EventType ::CollectionCreated as i32 ,
EventType ::CollectionCreated ,
& collection . uuid ,
& org_id ,
& headers . user . uuid ,
@ -597,7 +568,7 @@ async fn post_bulk_access_collections(
collection . save ( & conn ) . await ? ;
log_event (
EventType ::CollectionUpdated as i32 ,
EventType ::CollectionUpdated ,
& collection . uuid ,
& org_id ,
& headers . user . uuid ,
@ -639,17 +610,6 @@ async fn put_organization_collection_update(
headers : ManagerHeaders ,
data : Json < FullCollectionData > ,
conn : DbConn ,
) -> JsonResult {
post_organization_collection_update ( org_id , col_id , headers , data , conn ) . await
}
#[ post( " /organizations/<org_id>/collections/<col_id> " , data = " <data> " , rank = 2) ]
async fn post_organization_collection_update (
org_id : OrganizationId ,
col_id : CollectionId ,
headers : ManagerHeaders ,
data : Json < FullCollectionData > ,
conn : DbConn ,
) -> JsonResult {
if org_id ! = headers . org_id {
err ! ( "Organization not found" , "Organization id's do not match" ) ;
@ -674,7 +634,7 @@ async fn post_organization_collection_update(
collection . save ( & conn ) . await ? ;
log_event (
EventType ::CollectionUpdated as i32 ,
EventType ::CollectionUpdated ,
& collection . uuid ,
& org_id ,
& headers . user . uuid ,
@ -723,7 +683,7 @@ async fn delete_organization_collection_impl(
err ! ( "Collection not found" , "Collection does not exist or does not belong to this organization" )
} ;
log_event (
EventType ::CollectionDeleted as i32 ,
EventType ::CollectionDeleted ,
& collection . uuid ,
org_id ,
& headers . user . uuid ,
@ -745,16 +705,6 @@ async fn delete_organization_collection(
delete_organization_collection_impl ( & org_id , & col_id , & headers , & conn ) . await
}
#[ post( " /organizations/<org_id>/collections/<col_id>/delete " ) ]
async fn post_organization_collection_delete (
org_id : OrganizationId ,
col_id : CollectionId ,
headers : ManagerHeaders ,
conn : DbConn ,
) -> EmptyResult {
delete_organization_collection_impl ( & org_id , & col_id , & headers , & conn ) . await
}
#[ derive(Deserialize, Debug) ]
#[ serde(rename_all = " camelCase " ) ]
struct BulkCollectionIds {
@ -818,11 +768,9 @@ async fn get_org_collection_detail(
// Generate a HashMap to get the correct MembershipType per user to determine the manage permission
// We use the uuid instead of the user_uuid here, since that is what is used in CollectionUser
let membership_type : HashMap < MembershipId , i32 > = Membership ::find_confirmed_by_org ( & org_id , & conn )
. await
. into_iter ( )
. map ( | m | ( m . uuid , m . atype ) )
. collect ( ) ;
// This lists other members for admins, so it must not depend on the membership status
let membership_type : HashMap < MembershipId , i32 > =
Membership ::find_by_org ( & org_id , & conn ) . await . into_iter ( ) . map ( | m | ( m . uuid , m . atype ) ) . collect ( ) ;
let users : Vec < Value > =
CollectionUser ::find_by_org_and_coll_swap_user_uuid_with_member_uuid ( & org_id , & collection . uuid , & conn )
@ -887,11 +835,11 @@ struct OrgIdData {
#[ get( " /ciphers/organization-details?<data..> " ) ]
async fn get_org_details ( data : OrgIdData , headers : ManagerHeadersLoose , conn : DbConn ) -> JsonResult {
if data . organization_id ! = headers . membership . org_uuid {
err_code ! ( "Resource not found." , "Organization id's do not match" , rocket ::http ::Status ::NotFound . code ) ;
err_code ! ( "Resource not found." , "Organization id's do not match" , Status ::NotFound . code ) ;
}
if ! headers . membership . has_full_access ( ) {
err_code ! ( "Resource not found." , "User does not have full access" , rocket ::http ::Status ::NotFound . code ) ;
err_code ! ( "Resource not found." , "User does not have full access" , Status ::NotFound . code ) ;
}
Ok ( Json ( json ! ( {
@ -955,13 +903,14 @@ async fn get_members(
}
if ! headers . membership . has_full_access ( ) {
err_code ! ( "Resource not found." , "User does not have full access" , rocket ::http ::Status ::NotFound . code ) ;
err_code ! ( "Resource not found." , "User does not have full access" , Status ::NotFound . code ) ;
}
let mut users_json = Vec ::new ( ) ;
for u in Membership ::find_by_org ( & org_id , & conn ) . await {
// The user can be a manager instead of an admin, but we've checked above that they have full access
users_json . push (
u . to_json_user_ details (
u . to_json_details_for_admin (
data . include_collections . unwrap_or ( false ) ,
data . include_groups . unwrap_or ( false ) ,
& conn ,
@ -1075,13 +1024,13 @@ async fn send_invite(
& & data . permissions . get ( "deleteAnyCollection" ) = = Some ( & json ! ( true ) )
& & data . permissions . get ( "createNewCollections" ) = = Some ( & json ! ( true ) ) ) ;
let mut user_created : bool = false ;
let mut user_created : bool ;
for email in & data . emails {
let mut member_status = MembershipStatus ::Invited as i32 ;
let user = match User ::find_by_mail ( email , & conn ) . await {
None = > {
if ! CONFIG . invitations_allowed ( ) {
err ! ( format ! ( "User does not exist: {email }" ) )
err ! ( format ! ( "User does not exist: {}" , email . escape_debug ( ) ) )
}
if ! CONFIG . is_email_domain_allowed ( email ) {
@ -1099,7 +1048,7 @@ async fn send_invite(
}
Some ( user ) = > {
if Membership ::find_by_user_and_org ( & user . uuid , & org_id , & conn ) . await . is_some ( ) {
err ! ( format ! ( "User already in organization: {email }" ) )
err ! ( format ! ( "User already in organization: {}" , email . escape_debug ( ) ) )
}
if ! CONFIG . mail_enabled ( ) {
@ -1110,6 +1059,7 @@ async fn send_invite(
member_status = MembershipStatus ::Accepted as i32 ;
}
}
user_created = false ;
user
}
} ;
@ -1148,7 +1098,7 @@ async fn send_invite(
}
log_event (
EventType ::OrganizationUserInvited as i32 ,
EventType ::OrganizationUserInvited ,
& new_member . uuid ,
& org_id ,
& headers . user . uuid ,
@ -1373,7 +1323,9 @@ async fn bulk_confirm_invite(
match data . keys {
Some ( keys ) = > {
for invite in keys {
let member_id = invite . id . unwrap ( ) ;
let Some ( member_id ) = invite . id else {
err ! ( "Member id is required" )
} ;
let user_key = invite . key . unwrap_or_default ( ) ;
let err_msg = match confirm_invite_impl ( & org_id , & member_id , & user_key , & headers , & conn , & nt ) . await {
Ok ( ( ) ) = > String ::new ( ) ,
@ -1447,7 +1399,7 @@ async fn confirm_invite_impl(
OrgPolicy ::check_user_allowed ( & member_to_confirm , "confirm" , conn ) . await ? ;
log_event (
EventType ::OrganizationUserConfirmed as i32 ,
EventType ::OrganizationUserConfirmed ,
& member_to_confirm . uuid ,
org_id ,
& headers . user . uuid ,
@ -1515,7 +1467,9 @@ async fn get_user(
// In this case, when groups are requested we also need to include collections.
// Else these will not be shown in the interface, and could lead to missing collections when saved.
let include_groups = data . include_groups . unwrap_or ( false ) ;
Ok ( Json ( user . to_json_user_details ( data . include_collections . unwrap_or ( include_groups ) , include_groups , & conn ) . await ) )
Ok ( Json (
user . to_json_details_for_admin ( data . include_collections . unwrap_or ( include_groups ) , include_groups , & conn ) . await ,
) )
}
#[ derive(Deserialize) ]
@ -1529,17 +1483,6 @@ struct EditUserData {
}
#[ put( " /organizations/<org_id>/users/<member_id> " , data = " <data> " , rank = 1) ]
async fn put_member (
org_id : OrganizationId ,
member_id : MembershipId ,
data : Json < EditUserData > ,
headers : AdminHeaders ,
conn : DbConn ,
) -> EmptyResult {
edit_member ( org_id , member_id , data , headers , conn ) . await
}
#[ post( " /organizations/<org_id>/users/<member_id> " , data = " <data> " , rank = 1) ]
async fn edit_member (
org_id : OrganizationId ,
member_id : MembershipId ,
@ -1637,7 +1580,7 @@ async fn edit_member(
}
log_event (
EventType ::OrganizationUserUpdated as i32 ,
EventType ::OrganizationUserUpdated ,
& member_to_edit . uuid ,
& org_id ,
& headers . user . uuid ,
@ -1724,7 +1667,7 @@ async fn delete_member_impl(
}
log_event (
EventType ::OrganizationUserRemoved as i32 ,
EventType ::OrganizationUserRemoved ,
& member_to_delete . uuid ,
org_id ,
& headers . user . uuid ,
@ -1793,11 +1736,22 @@ async fn bulk_public_keys(
use super ::ciphers ::CipherData ;
use super ::ciphers ::update_cipher_from_data ;
// The import endpoint only ever uses the name/id/external_id of a collection.
// Bitwarden's own server ignores `groups`/`users` here too, so do not make them
// mandatory: clients are free to leave them out.
#[ derive(Deserialize) ]
#[ serde(rename_all = " camelCase " ) ]
struct ImportCollectionData {
name : String ,
id : Option < CollectionId > ,
external_id : Option < String > ,
}
#[ derive(Deserialize) ]
#[ serde(rename_all = " camelCase " ) ]
struct ImportData {
ciphers : Vec < CipherData > ,
collections : Vec < FullCollectionData > ,
collections : Vec < Import CollectionData> ,
collection_relationships : Vec < RelationsData > ,
}
@ -1823,6 +1777,10 @@ async fn post_org_import(
if org_id ! = headers . membership . org_uuid {
err ! ( "Organization not found" , "Organization id's do not match" ) ;
}
// OrgMemberHeaders also allows invited and accepted members, which are not allowed to import
if headers . membership . status ! = MembershipStatus ::Confirmed as i32 {
err ! ( "You need to be a Member of the Organization to call this endpoint" )
}
let data : ImportData = data . into_inner ( ) ;
// Validate the import before continuing
@ -1904,7 +1862,7 @@ async fn post_org_import(
#[ serde(rename_all = " camelCase " ) ]
struct BulkCollectionsData {
organization_id : OrganizationId ,
cipher_ids : Vec < CipherId > ,
cipher_ids : HashSet < CipherId > ,
collection_ids : HashSet < CollectionId > ,
remove_collections : bool ,
}
@ -2144,7 +2102,7 @@ async fn put_policy(
}
log_event (
EventType ::OrganizationUserRemoved as i32 ,
EventType ::OrganizationUserRemoved ,
& member . uuid ,
& org_id ,
& headers . user . uuid ,
@ -2170,7 +2128,7 @@ async fn put_policy(
policy . save ( & conn ) . await ? ;
log_event (
EventType ::PolicyUpdated as i32 ,
EventType ::PolicyUpdated ,
policy . uuid . as_ref ( ) ,
& org_id ,
& headers . user . uuid ,
@ -2183,18 +2141,6 @@ async fn put_policy(
Ok ( Json ( policy . to_json ( ) ) )
}
// Deprecated with client v2026.5.0
#[ put( " /organizations/<org_id>/policies/<pol_type>/vnext " , data = " <data> " ) ]
async fn put_policy_vnext (
org_id : OrganizationId ,
pol_type : i32 ,
data : Json < PutPolicy > ,
headers : AdminHeaders ,
conn : DbConn ,
) -> JsonResult {
put_policy ( org_id , pol_type , data , headers , conn ) . await
}
#[ get( " /plans " ) ]
fn get_plans ( ) -> Json < Value > {
// Respond with a minimal json just enough to allow the creation of an new organization.
@ -2223,12 +2169,6 @@ fn get_plans() -> Json<Value> {
} ) )
}
#[ get( " /organizations/<_org_id>/billing/metadata " ) ]
fn get_billing_metadata ( _org_id : OrganizationId , _headers : OrgMemberHeaders ) -> Json < Value > {
// Prevent a 404 error, which also causes Javascript errors.
Json ( empty_data_json ( ) )
}
#[ get( " /organizations/<_org_id>/billing/vnext/warnings " ) ]
fn get_billing_warnings ( _org_id : OrganizationId , _headers : OrgMemberHeaders ) -> Json < Value > {
Json ( json ! ( {
@ -2248,14 +2188,6 @@ fn get_self_host_billing_metadata(_org_id: OrganizationId, _headers: OrgMemberHe
} ) )
}
fn empty_data_json ( ) -> Value {
json ! ( {
"object" : "list" ,
"data" : [ ] ,
"continuationToken" : null
} )
}
#[ derive(Deserialize, Debug) ]
#[ serde(rename_all = " camelCase " ) ]
struct BulkRevokeMembershipIds {
@ -2339,7 +2271,7 @@ async fn revoke_member_impl(
member . save ( conn ) . await ? ;
log_event (
EventType ::OrganizationUserRevoked as i32 ,
EventType ::OrganizationUserRevoked ,
& member . uuid ,
org_id ,
& headers . user . uuid ,
@ -2437,7 +2369,7 @@ async fn restore_member_impl(
member . save ( conn ) . await ? ;
log_event (
EventType ::OrganizationUserRestored as i32 ,
EventType ::OrganizationUserRestored ,
& member . uuid ,
org_id ,
& headers . user . uuid ,
@ -2476,7 +2408,7 @@ async fn get_groups_data(
| | Collection ::has_manageable_collection_by_user ( & org_id , & headers . membership . user_uuid , & conn ) . await
} ;
if ! allowed {
err_code ! ( "Resource not found." , "User does not have access" , rocket ::http ::Status ::NotFound . code ) ;
err_code ! ( "Resource not found." , "User does not have access" , Status ::NotFound . code ) ;
}
let groups : Vec < Value > = if CONFIG . org_groups_enabled ( ) {
@ -2574,17 +2506,6 @@ impl CollectionData {
}
}
#[ post( " /organizations/<org_id>/groups/<group_id> " , data = " <data> " ) ]
async fn post_group (
org_id : OrganizationId ,
group_id : GroupId ,
data : Json < GroupRequest > ,
headers : AdminHeaders ,
conn : DbConn ,
) -> JsonResult {
put_group ( org_id , group_id , data , headers , conn ) . await
}
#[ post( " /organizations/<org_id>/groups " , data = " <data> " ) ]
async fn post_groups (
org_id : OrganizationId ,
@ -2605,7 +2526,7 @@ async fn post_groups(
let group = group_request . to_group ( & org_id ) ;
log_event (
EventType ::GroupCreated as i32 ,
EventType ::GroupCreated ,
& group . uuid ,
& org_id ,
& headers . user . uuid ,
@ -2646,7 +2567,7 @@ async fn put_group(
GroupUser ::delete_all_by_group ( & group_id , & org_id , & conn ) . await ? ;
log_event (
EventType ::GroupUpdated as i32 ,
EventType ::GroupUpdated ,
& updated_group . uuid ,
& org_id ,
& headers . user . uuid ,
@ -2679,7 +2600,7 @@ async fn add_update_group(
user_entry . save ( conn ) . await ? ;
log_event (
EventType ::OrganizationUserUpdatedGroups as i32 ,
EventType ::OrganizationUserUpdatedGroups ,
& assigned_member ,
& org_id ,
& headers . user . uuid ,
@ -2694,7 +2615,6 @@ async fn add_update_group(
"id" : group . uuid ,
"organizationId" : group . organizations_uuid ,
"name" : group . name ,
"accessAll" : group . access_all ,
"externalId" : group . external_id ,
"object" : "group"
} ) ) )
@ -2721,16 +2641,6 @@ async fn get_group_details(
Ok ( Json ( group . to_json_details ( & conn ) . await ) )
}
#[ post( " /organizations/<org_id>/groups/<group_id>/delete " ) ]
async fn post_delete_group (
org_id : OrganizationId ,
group_id : GroupId ,
headers : AdminHeaders ,
conn : DbConn ,
) -> EmptyResult {
delete_group_impl ( & org_id , & group_id , & headers , & conn ) . await
}
#[ delete( " /organizations/<org_id>/groups/<group_id> " ) ]
async fn delete_group ( org_id : OrganizationId , group_id : GroupId , headers : AdminHeaders , conn : DbConn ) -> EmptyResult {
delete_group_impl ( & org_id , & group_id , & headers , & conn ) . await
@ -2754,7 +2664,7 @@ async fn delete_group_impl(
} ;
log_event (
EventType ::GroupDeleted as i32 ,
EventType ::GroupDeleted ,
& group . uuid ,
org_id ,
& headers . user . uuid ,
@ -2832,90 +2742,6 @@ async fn get_group_members(
Ok ( Json ( json ! ( group_members ) ) )
}
#[ put( " /organizations/<org_id>/groups/<group_id>/users " , data = " <data> " ) ]
async fn put_group_members (
org_id : OrganizationId ,
group_id : GroupId ,
headers : AdminHeaders ,
data : Json < Vec < MembershipId > > ,
conn : DbConn ,
) -> EmptyResult {
if org_id ! = headers . org_id {
err ! ( "Organization not found" , "Organization id's do not match" ) ;
}
if ! CONFIG . org_groups_enabled ( ) {
err ! ( "Group support is disabled" ) ;
}
if Group ::find_by_uuid_and_org ( & group_id , & org_id , & conn ) . await . is_none ( ) {
err ! ( "Group could not be found!" , "Group uuid is invalid or does not belong to the organization" )
}
let assigned_members = data . into_inner ( ) ;
let org_memberships = Membership ::find_by_org ( & org_id , & conn ) . await ;
let org_membership_ids : HashSet < & MembershipId > = org_memberships . iter ( ) . map ( | m | & m . uuid ) . collect ( ) ;
if let Some ( e ) = assigned_members . iter ( ) . find ( | m | ! org_membership_ids . contains ( m ) ) {
err ! ( "Invalid member" , format ! ( "Member {} does not belong to organization {}!" , e , org_id ) )
}
GroupUser ::delete_all_by_group ( & group_id , & org_id , & conn ) . await ? ;
for assigned_member in assigned_members {
let mut user_entry = GroupUser ::new ( group_id . clone ( ) , assigned_member . clone ( ) ) ;
user_entry . save ( & conn ) . await ? ;
log_event (
EventType ::OrganizationUserUpdatedGroups as i32 ,
& assigned_member ,
& org_id ,
& headers . user . uuid ,
headers . device . atype ,
& headers . ip . ip ,
& conn ,
)
. await ;
}
Ok ( ( ) )
}
#[ post( " /organizations/<org_id>/groups/<group_id>/delete-user/<member_id> " ) ]
async fn post_delete_group_member (
org_id : OrganizationId ,
group_id : GroupId ,
member_id : MembershipId ,
headers : AdminHeaders ,
conn : DbConn ,
) -> EmptyResult {
if org_id ! = headers . org_id {
err ! ( "Organization not found" , "Organization id's do not match" ) ;
}
if ! CONFIG . org_groups_enabled ( ) {
err ! ( "Group support is disabled" ) ;
}
if Membership ::find_by_uuid_and_org ( & member_id , & org_id , & conn ) . await . is_none ( ) {
err ! ( "User could not be found or does not belong to the organization." ) ;
}
if Group ::find_by_uuid_and_org ( & group_id , & org_id , & conn ) . await . is_none ( ) {
err ! ( "Group could not be found or does not belong to the organization." ) ;
}
log_event (
EventType ::OrganizationUserUpdatedGroups as i32 ,
& member_id ,
& org_id ,
& headers . user . uuid ,
headers . device . atype ,
& headers . ip . ip ,
& conn ,
)
. await ;
GroupUser ::delete_by_group_and_member ( & group_id , & member_id , & conn ) . await
}
#[ derive(Deserialize) ]
#[ serde(rename_all = " camelCase " ) ]
struct OrganizationUserResetPasswordEnrollmentRequest {
@ -2927,8 +2753,13 @@ struct OrganizationUserResetPasswordEnrollmentRequest {
#[ derive(Deserialize) ]
#[ serde(rename_all = " camelCase " ) ]
struct OrganizationUserRecoverAccountRequest {
new_master_password_hash : String ,
key : String ,
// Legacy payload
new_master_password_hash : Option < String > ,
key : Option < String > ,
// Current payload
authentication_data : Option < AuthenticationData > ,
unlock_data : Option < UnlockData > ,
#[ serde(default) ]
reset_master_password : bool ,
@ -2971,24 +2802,6 @@ async fn put_recover_account(
data : Json < OrganizationUserRecoverAccountRequest > ,
conn : DbConn ,
nt : Notify < '_ > ,
) -> EmptyResult {
let req = data . into_inner ( ) ;
if req . reset_master_password & & ! req . reset_two_factor {
recover_account ( org_id , member_id , headers , req , conn , nt ) . await
} else {
err ! ( "Unsupported operation" )
}
}
// Deprecated since `v2026.4.2`
#[ put( " /organizations/<org_id>/users/<member_id>/reset-password " , data = " <data> " ) ]
async fn put_reset_password (
org_id : OrganizationId ,
member_id : MembershipId ,
headers : AdminHeaders ,
data : Json < OrganizationUserRecoverAccountRequest > ,
conn : DbConn ,
nt : Notify < '_ > ,
) -> EmptyResult {
recover_account ( org_id , member_id , headers , data . into_inner ( ) , conn , nt ) . await
}
@ -2997,7 +2810,7 @@ async fn recover_account(
org_id : OrganizationId ,
member_id : MembershipId ,
headers : AdminHeaders ,
reset_re quest : OrganizationUserRecoverAccountRequest ,
req : OrganizationUserRecoverAccountRequest ,
conn : DbConn ,
nt : Notify < '_ > ,
) -> EmptyResult {
@ -3012,7 +2825,7 @@ async fn recover_account(
err ! ( "User to reset isn't member of required organization" )
} ;
let Some ( user ) = User ::find_by_uuid ( & member . user_uuid , & conn ) . await else {
let Some ( mut user ) = User ::find_by_uuid ( & member . user_uuid , & conn ) . await else {
err ! ( "User not found" )
} ;
@ -3025,29 +2838,75 @@ async fn recover_account(
err ! ( "Organization user must be confirmed for password reset functionality" ) ;
}
// Sending email before resetting password to ensure working email configuration and the resulting
// user notification. Also this might add some protection against security flaws and misuse
if let Err ( e ) = mail ::send_admin_reset_password ( & user . email , user . display_name ( ) , & org . name ) . await {
let fallback_2fa_email =
if req . reset_two_factor & & CONFIG . mail_enabled ( ) & & CONFIG . email_2fa_auto_fallback ( ) & & user . verified ( ) {
TwoFactor ::find_by_user_and_type ( & user . uuid , TwoFactorType ::Email , & conn ) . await . is_none ( )
} else {
false
} ;
// Check the new password before the email below, so that a rejected request doesn't tell the user
// their password was reset
let new_password = if req . reset_master_password {
let ( new_master_password_hash , new_key ) = if let ( Some ( authentication_data ) , Some ( unlock_data ) ) =
( req . authentication_data , req . unlock_data )
{
authentication_data . check ( & user , & unlock_data ) ? ;
if ! authentication_data . kdf . matches_user ( & user ) {
err ! ( "KDF settings do not match the user account" )
}
( authentication_data . master_password_authentication_hash , unlock_data . master_key_wrapped_user_key )
} else if let ( Some ( new_master_password_hash ) , Some ( new_key ) ) = ( req . new_master_password_hash , req . key ) {
( new_master_password_hash , new_key )
} else {
err_code ! ( "Unprocessable request" , "Missing fields to reset password" , Status ::UnprocessableEntity . code ) ;
} ;
Some ( ( new_master_password_hash , new_key ) )
} else {
None
} ;
// Sending email first ensure working email configuration and the resulting user notification.
// Also this might add some protection against security flaws and misuse
if let Err ( e ) = mail ::send_admin_account_recovery (
& user . email ,
user . display_name ( ) ,
& org . name ,
req . reset_master_password ,
req . reset_two_factor ,
fallback_2fa_email ,
)
. await
{
err ! ( format ! ( "Error sending user reset password email: {e:#?}" ) ) ;
}
let mut user = user ;
user . set_password ( reset_request . new_master_password_hash . as_str ( ) , Some ( reset_request . key ) , true , None , & conn )
. await ? ;
if let Some ( ( new_master_password_hash , new_key ) ) = new_password {
user . set_password ( & new_master_password_hash , Some ( new_key ) , true , None , & conn ) . await ? ;
}
if req . reset_two_factor {
TwoFactor ::delete_all_by_user ( & user . uuid , & conn ) . await ? ;
Device ::clear_twofactor_remember_by_user ( & user . uuid , & conn ) . await ? ;
if ! fallback_2fa_email | | two_factor ::email ::find_and_activate_email_2fa ( & user . uuid , & conn ) . await . is_err ( ) {
two_factor ::enforce_2fa_policy ( & user , & headers . user . uuid , headers . device . atype , & headers . ip . ip , & conn )
. await ? ;
}
}
user . save ( & conn ) . await ? ;
nt . send_logout ( & user , None , & conn ) . await ;
log_event (
EventType ::OrganizationUserAdminResetPassword as i32 ,
& member_id ,
& org_id ,
& headers . user . uuid ,
headers . device . atype ,
& headers . ip . ip ,
& conn ,
)
. await ;
if req . reset_master_password {
headers . log_event ( EventType ::OrganizationUserAdminResetPassword , & member_id , & org_id , & conn ) . await ;
}
if req . reset_two_factor {
headers . log_event ( EventType ::OrganizationUserAdminResetTwoFactor , & member_id , & org_id , & conn ) . await ;
}
Ok ( ( ) )
}
@ -3084,6 +2943,7 @@ async fn get_reset_password_details(
"kdfIterations" : user . client_kdf_iter ,
"kdfMemory" : user . client_kdf_memory ,
"kdfParallelism" : user . client_kdf_parallelism ,
"masterPasswordSalt" : user . master_password_salt ( ) ,
"resetPasswordKey" : member . reset_password_key ,
"encryptedPrivateKey" : org . private_key ,
} ) ) )
@ -3166,9 +3026,9 @@ async fn put_reset_password_enrollment(
membership . save ( & conn ) . await ? ;
let event_type = if membership . reset_password_key . is_some ( ) {
EventType ::OrganizationUserResetPasswordEnroll as i32
EventType ::OrganizationUserResetPasswordEnroll
} else {
EventType ::OrganizationUserResetPasswordWithdraw as i32
EventType ::OrganizationUserResetPasswordWithdraw
} ;
log_event ( event_type , & membership . uuid , & org_id , & headers . user . uuid , headers . device . atype , & headers . ip . ip , & conn )
@ -3199,7 +3059,7 @@ async fn api_key(
org_id : & OrganizationId ,
data : Json < PasswordOrOtpData > ,
rotate : bool ,
headers : Admin Headers,
headers : Owner Headers,
conn : DbConn ,
) -> JsonResult {
if org_id ! = & headers . org_id {
@ -3208,7 +3068,7 @@ async fn api_key(
let data : PasswordOrOtpData = data . into_inner ( ) ;
let user = headers . user ;
// Validate the admin users password/otp
// Validate the owner users password/otp
data . validate ( & user , true , & conn ) . await ? ;
let org_api_key = if let Some ( mut org_api_key ) = OrganizationApiKey ::find_by_org_uuid ( org_id , & conn ) . await {
@ -3236,7 +3096,7 @@ async fn api_key(
async fn post_api_key (
org_id : OrganizationId ,
data : Json < PasswordOrOtpData > ,
headers : Admin Headers,
headers : Owner Headers,
conn : DbConn ,
) -> JsonResult {
api_key ( & org_id , data , false , headers , conn ) . await
@ -3246,7 +3106,7 @@ async fn post_api_key(
async fn rotate_api_key (
org_id : OrganizationId ,
data : Json < PasswordOrOtpData > ,
headers : Admin Headers,
headers : Owner Headers,
conn : DbConn ,
) -> JsonResult {
api_key ( & org_id , data , true , headers , conn ) . await