vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

client: Attach system ID to sign-in request (#56675) (cherry-pick to preview) (#56798)

Browse source 
Cherry-pick of #56675 to preview

----
This PR makes it so we send up the system ID as a query parameter
alongside the native app sign-in request.

Closes CLO-769.

Release Notes:

- N/A

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
This commit is contained in:
zed-zippy[bot] 2026-05-14 19:52:17 +00:00 committed by GitHub
parent 1d6cd3fab4
commit 74a089dc47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/client/src/client.rs
View file

@ -1396,7 +1396,7 @@ impl Client {
// any other app running on the user's device.
let (public_key, private_key) =
rpc::auth::keypair().context("failed to generate keypair for auth")?;
let public_key_string = String::try_from(public_key)
let public_key = String::try_from(public_key)
.context("failed to serialize public key for auth")?;
if let Some((login, token)) =
@ -1420,11 +1420,22 @@ impl Client {
.context("server not bound to a TCP address")?
.port();
#[derive(Serialize)]
struct NativeAppSignInQueryParams {
native_app_port: u16,
native_app_public_key: String,
system_id: Option<Arc<str>>,
}
// Open the Zed sign-in page in the user's browser, with query parameters that indicate
// that the user is signing in from a Zed app running on the same device.
let url = http.build_url(&format!(
"/native_app_signin?native_app_port={}&native_app_public_key={}",
port, public_key_string
"/native_app_signin?{}",
serde_urlencoded::to_string(&NativeAppSignInQueryParams {
native_app_port: port,
native_app_public_key: public_key,
system_id: this.telemetry.system_id(),
})?
));
open_url_tx.send(url).log_err();