From d369923a01317aeb299a5386e8e6cf3e54d35c35 Mon Sep 17 00:00:00 2001 From: Haam Date: Sat, 14 Nov 2026 15:14:06 +0900 Subject: [PATCH] fix(app): accept shared instance invite before installing --- .../src/api/instance/shared/install.rs | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/app-lib/src/api/instance/shared/install.rs b/packages/app-lib/src/api/instance/shared/install.rs index 52892c32532..a00e8f195ee 100644 --- a/packages/app-lib/src/api/instance/shared/install.rs +++ b/packages/app-lib/src/api/instance/shared/install.rs @@ -199,16 +199,23 @@ pub async fn accept_shared_instance_invite_for_install( invite_id: &str, ) -> crate::Result<()> { let state = State::get().await?; - match get_remote_instance_access(shared_instance_id, &state).await? { - SharedInstanceRemoteResponse::Available(_) => Ok(()), - SharedInstanceRemoteResponse::Unavailable( - SharedInstanceUnavailableReason::AccessRevoked, - ) => { - accept_shared_instance_invite(shared_instance_id, invite_id, &state) - .await - } - SharedInstanceRemoteResponse::Unavailable(reason) => { - Err(shared_instance_unavailable_error(reason)) + // Accepting first is safe: the service answers "already has access" for + // callers that are already members, which is treated as success. Read access + // does not imply membership (pending invites and observers can read an + // instance), so gating on it skipped the accept call and left the install + // hitting membership-only endpoints such as the version listing. + match accept_shared_instance_invite(shared_instance_id, invite_id, &state) + .await + { + Ok(()) => Ok(()), + Err(accept_error) => { + match get_remote_instance_access(shared_instance_id, &state).await { + Ok(SharedInstanceRemoteResponse::Available(_)) => Ok(()), + Ok(SharedInstanceRemoteResponse::Unavailable(reason)) => { + Err(shared_instance_unavailable_error(reason)) + } + Err(_) => Err(accept_error), + } } } }