mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-31 02:08:20 +02:00 
			
		
		
		
	Fix manager in web-vault v2024.6.2 for collections (#4860)
The web-vault v2024.6.2 we use needs some extra information to allow managers to actually be able to manage collections. The v2024.6.2 web-vault has somewhat of a mixture of the newer roles and older manager roles. To at least fix this for the web-vault we bundle these changes will make the manager able to manage. For future web-vaults we would need a lot more changes to be done to fix this in a better way though. Fixes #4844
This commit is contained in:
		
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							339612c917
						
					
				
				
					commit
					9e26014b4d
				
			| @@ -509,7 +509,7 @@ async fn post_organization_collection_update( | ||||
|         CollectionUser::save(&org_user.user_uuid, col_id, user.read_only, user.hide_passwords, &mut conn).await?; | ||||
|     } | ||||
|  | ||||
|     Ok(Json(collection.to_json())) | ||||
|     Ok(Json(collection.to_json_details(&headers.user.uuid, None, &mut conn).await)) | ||||
| } | ||||
|  | ||||
| #[delete("/organizations/<org_id>/collections/<col_id>/user/<org_user_id>")] | ||||
| @@ -2276,13 +2276,14 @@ async fn _restore_organization_user( | ||||
| } | ||||
|  | ||||
| #[get("/organizations/<org_id>/groups")] | ||||
| async fn get_groups(org_id: &str, _headers: ManagerHeadersLoose, mut conn: DbConn) -> JsonResult { | ||||
| async fn get_groups(org_id: &str, headers: ManagerHeadersLoose, mut conn: DbConn) -> JsonResult { | ||||
|     let groups: Vec<Value> = if CONFIG.org_groups_enabled() { | ||||
|         // Group::find_by_organization(&org_id, &mut conn).await.iter().map(Group::to_json).collect::<Value>() | ||||
|         let groups = Group::find_by_organization(org_id, &mut conn).await; | ||||
|         let mut groups_json = Vec::with_capacity(groups.len()); | ||||
|  | ||||
|         for g in groups { | ||||
|             groups_json.push(g.to_json_details(&mut conn).await) | ||||
|             groups_json.push(g.to_json_details(&headers.org_user.atype, &mut conn).await) | ||||
|         } | ||||
|         groups_json | ||||
|     } else { | ||||
| @@ -2470,7 +2471,7 @@ async fn add_update_group( | ||||
| } | ||||
|  | ||||
| #[get("/organizations/<_org_id>/groups/<group_id>/details")] | ||||
| async fn get_group_details(_org_id: &str, group_id: &str, _headers: AdminHeaders, mut conn: DbConn) -> JsonResult { | ||||
| async fn get_group_details(_org_id: &str, group_id: &str, headers: AdminHeaders, mut conn: DbConn) -> JsonResult { | ||||
|     if !CONFIG.org_groups_enabled() { | ||||
|         err!("Group support is disabled"); | ||||
|     } | ||||
| @@ -2480,7 +2481,7 @@ async fn get_group_details(_org_id: &str, group_id: &str, _headers: AdminHeaders | ||||
|         _ => err!("Group could not be found!"), | ||||
|     }; | ||||
|  | ||||
|     Ok(Json(group.to_json_details(&mut conn).await)) | ||||
|     Ok(Json(group.to_json_details(&(headers.org_user_type as i32), &mut conn).await)) | ||||
| } | ||||
|  | ||||
| #[post("/organizations/<org_id>/groups/<group_id>/delete")] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user