Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename collaborator_logins to authorized_logins

Browse source 
Again, this is about reserving the concept of a "collaborator" for actual collaborators on a worktree.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2021-11-26 11:08:34 -07:00
parent cd2c3c3606
commit c8ad5b68e0
4 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/project/src/worktree.rs
View file

@ -848,13 +848,13 @@ impl LocalWorktree {
while let Some(status) = status.recv().await { while let Some(status) = status.recv().await {
if let Some(this) = this.upgrade(&cx) { if let Some(this) = this.upgrade(&cx) {
let remote_id = if let client::Status::Connected { .. } = status { let remote_id = if let client::Status::Connected { .. } = status {
let collaborator_logins = this.read_with(&cx, |this, _| { let authorized_logins = this.read_with(&cx, |this, _| {
this.as_local().unwrap().config.collaborators.clone() this.as_local().unwrap().config.collaborators.clone()
}); });
let response = rpc let response = rpc
.request(proto::OpenWorktree { .request(proto::OpenWorktree {
root_name: root_name.clone(), root_name: root_name.clone(),
collaborator_logins, authorized_logins,
}) })
.await?; .await?;
@ -3316,7 +3316,7 @@ mod tests {
open_worktree.payload, open_worktree.payload,
proto::OpenWorktree { proto::OpenWorktree {
root_name: "the-dir".to_string(), root_name: "the-dir".to_string(),
collaborator_logins: vec!["friend-1".to_string(), "friend-2".to_string()], authorized_logins: vec!["friend-1".to_string(), "friend-2".to_string()],
} }
); );

2
crates/rpc/proto/zed.proto
View file

@ -55,7 +55,7 @@ message Error {
message OpenWorktree { message OpenWorktree {
string root_name = 1; string root_name = 1;
repeated string collaborator_logins = 2; repeated string authorized_logins = 2;
} }
message OpenWorktreeResponse { message OpenWorktreeResponse {

12
crates/server/src/rpc.rs
View file

@ -216,7 +216,7 @@ impl Server {
let mut contact_user_ids = HashSet::new(); let mut contact_user_ids = HashSet::new();
contact_user_ids.insert(host_user_id); contact_user_ids.insert(host_user_id);
for github_login in request.payload.collaborator_logins { for github_login in request.payload.authorized_logins {
match self.app_state.db.create_user(&github_login, false).await { match self.app_state.db.create_user(&github_login, false).await {
Ok(contact_user_id) => { Ok(contact_user_id) => {
contact_user_ids.insert(contact_user_id); contact_user_ids.insert(contact_user_id);
@ -235,7 +235,7 @@ impl Server {
let worktree_id = self.state_mut().add_worktree(Worktree { let worktree_id = self.state_mut().add_worktree(Worktree {
host_connection_id: request.sender_id, host_connection_id: request.sender_id,
host_user_id, host_user_id,
contact_user_ids: contact_user_ids.clone(), authorized_user_ids: contact_user_ids.clone(),
root_name: request.payload.root_name, root_name: request.payload.root_name,
share: None, share: None,
}); });
@ -268,7 +268,7 @@ impl Server {
) )
.await?; .await?;
} }
self.update_contacts_for_users(&worktree.contact_user_ids) self.update_contacts_for_users(&worktree.authorized_user_ids)
.await?; .await?;
Ok(()) Ok(())
} }
@ -322,7 +322,7 @@ impl Server {
.send(conn_id, proto::UnshareWorktree { worktree_id }) .send(conn_id, proto::UnshareWorktree { worktree_id })
}) })
.await?; .await?;
self.update_contacts_for_users(&worktree.contact_ids) self.update_contacts_for_users(&worktree.authorized_user_ids)
.await?; .await?;
Ok(()) Ok(())
@ -366,7 +366,7 @@ impl Server {
peers, peers,
}; };
let connection_ids = joined.worktree.connection_ids(); let connection_ids = joined.worktree.connection_ids();
let contact_user_ids = joined.worktree.contact_user_ids.clone(); let contact_user_ids = joined.worktree.authorized_user_ids.clone();
Ok((response, connection_ids, contact_user_ids)) Ok((response, connection_ids, contact_user_ids))
}); });
@ -422,7 +422,7 @@ impl Server {
) )
}) })
.await?; .await?;
self.update_contacts_for_users(&worktree.contact_ids) self.update_contacts_for_users(&worktree.authorized_user_ids)
.await?; .await?;
} }
Ok(()) Ok(())

43
crates/server/src/rpc/store.rs
View file

@ -22,7 +22,7 @@ struct ConnectionState {
pub struct Worktree { pub struct Worktree {
pub host_connection_id: ConnectionId, pub host_connection_id: ConnectionId,
pub host_user_id: UserId, pub host_user_id: UserId,
pub contact_user_ids: Vec<UserId>, pub authorized_user_ids: Vec<UserId>,
pub root_name: String, pub root_name: String,
pub share: Option<WorktreeShare>, pub share: Option<WorktreeShare>,
} }
@ -54,12 +54,12 @@ pub struct JoinedWorktree<'a> {
pub struct UnsharedWorktree { pub struct UnsharedWorktree {
pub connection_ids: Vec<ConnectionId>, pub connection_ids: Vec<ConnectionId>,
pub contact_ids: Vec<UserId>, pub authorized_user_ids: Vec<UserId>,
} }
pub struct LeftWorktree { pub struct LeftWorktree {
pub connection_ids: Vec<ConnectionId>, pub connection_ids: Vec<ConnectionId>,
pub contact_ids: Vec<UserId>, pub authorized_user_ids: Vec<UserId>,
} }
impl Store { impl Store {
@ -108,13 +108,13 @@ impl Store {
if let Ok(worktree) = self.remove_worktree(worktree_id, connection_id) { if let Ok(worktree) = self.remove_worktree(worktree_id, connection_id) {
result result
.contact_ids .contact_ids
.extend(worktree.contact_user_ids.iter().copied()); .extend(worktree.authorized_user_ids.iter().copied());
result.hosted_worktrees.insert(worktree_id, worktree); result.hosted_worktrees.insert(worktree_id, worktree);
} else if let Some(worktree) = self.leave_worktree(connection_id, worktree_id) { } else if let Some(worktree) = self.leave_worktree(connection_id, worktree_id) {
result result
.guest_worktree_ids .guest_worktree_ids
.insert(worktree_id, worktree.connection_ids); .insert(worktree_id, worktree.connection_ids);
result.contact_ids.extend(worktree.contact_ids); result.contact_ids.extend(worktree.authorized_user_ids);
} }
} }
@ -211,9 +211,9 @@ impl Store {
pub fn add_worktree(&mut self, worktree: Worktree) -> u64 { pub fn add_worktree(&mut self, worktree: Worktree) -> u64 {
let worktree_id = self.next_worktree_id; let worktree_id = self.next_worktree_id;
for contact_user_id in &worktree.contact_user_ids { for authorized_user_id in &worktree.authorized_user_ids {
self.visible_worktrees_by_user_id self.visible_worktrees_by_user_id
.entry(*contact_user_id) .entry(*authorized_user_id)
.or_default() .or_default()
.insert(worktree_id); .insert(worktree_id);
} }
@ -255,9 +255,10 @@ impl Store {
} }
} }
for contact_user_id in &worktree.contact_user_ids { for authorized_user_id in &worktree.authorized_user_ids {
if let Some(visible_worktrees) = if let Some(visible_worktrees) = self
self.visible_worktrees_by_user_id.get_mut(&contact_user_id) .visible_worktrees_by_user_id
.get_mut(&authorized_user_id)
{ {
visible_worktrees.remove(&worktree_id); visible_worktrees.remove(&worktree_id);
} }
@ -282,7 +283,7 @@ impl Store {
active_replica_ids: Default::default(), active_replica_ids: Default::default(),
entries, entries,
}); });
return Some(worktree.contact_user_ids.clone()); return Some(worktree.authorized_user_ids.clone());
} }
} }
None None
@ -304,7 +305,7 @@ impl Store {
} }
let connection_ids = worktree.connection_ids(); let connection_ids = worktree.connection_ids();
let contact_ids = worktree.contact_user_ids.clone(); let authorized_user_ids = worktree.authorized_user_ids.clone();
if let Some(share) = worktree.share.take() { if let Some(share) = worktree.share.take() {
for connection_id in share.guests.into_keys() { for connection_id in share.guests.into_keys() {
if let Some(connection) = self.connections.get_mut(&connection_id) { if let Some(connection) = self.connections.get_mut(&connection_id) {
@ -317,7 +318,7 @@ impl Store {
Ok(UnsharedWorktree { Ok(UnsharedWorktree {
connection_ids, connection_ids,
contact_ids, authorized_user_ids,
}) })
} else { } else {
Err(anyhow!("worktree is not shared"))? Err(anyhow!("worktree is not shared"))?
@ -338,7 +339,7 @@ impl Store {
.worktrees .worktrees
.get_mut(&worktree_id) .get_mut(&worktree_id)
.and_then(|worktree| { .and_then(|worktree| {
if worktree.contact_user_ids.contains(&user_id) { if worktree.authorized_user_ids.contains(&user_id) {
Some(worktree) Some(worktree)
} else { } else {
None None
@ -380,14 +381,14 @@ impl Store {
} }
let connection_ids = worktree.connection_ids(); let connection_ids = worktree.connection_ids();
let contact_ids = worktree.contact_user_ids.clone(); let authorized_user_ids = worktree.authorized_user_ids.clone();
#[cfg(test)] #[cfg(test)]
self.check_invariants(); self.check_invariants();
Some(LeftWorktree { Some(LeftWorktree {
connection_ids, connection_ids,
contact_ids, authorized_user_ids,
}) })
} }
@ -529,9 +530,11 @@ impl Store {
let host_connection = self.connections.get(&worktree.host_connection_id).unwrap(); let host_connection = self.connections.get(&worktree.host_connection_id).unwrap();
assert!(host_connection.worktrees.contains(worktree_id)); assert!(host_connection.worktrees.contains(worktree_id));
for contact_id in &worktree.contact_user_ids { for authorized_user_ids in &worktree.authorized_user_ids {
let visible_worktree_ids = let visible_worktree_ids = self
self.visible_worktrees_by_user_id.get(contact_id).unwrap(); .visible_worktrees_by_user_id
.get(authorized_user_ids)
.unwrap();
assert!(visible_worktree_ids.contains(worktree_id)); assert!(visible_worktree_ids.contains(worktree_id));
} }
@ -555,7 +558,7 @@ impl Store {
for (user_id, visible_worktree_ids) in &self.visible_worktrees_by_user_id { for (user_id, visible_worktree_ids) in &self.visible_worktrees_by_user_id {
for worktree_id in visible_worktree_ids { for worktree_id in visible_worktree_ids {
let worktree = self.worktrees.get(worktree_id).unwrap(); let worktree = self.worktrees.get(worktree_id).unwrap();
assert!(worktree.contact_user_ids.contains(user_id)); assert!(worktree.authorized_user_ids.contains(user_id));
} }
} }